Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

575 log SearchRequest content in debug logs #606

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

575 log SearchRequest content in debug logs #606

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
591d447
dump SearchRequest content to debug log
alexdunnjpl Jan 23, 2025
1643163
extract SearchRequest log dump to method
alexdunnjpl Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions service/src/main/java/gov/nasa/pds/api/registry/search/RegistrySearchRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package gov.nasa.pds.api.registry.search;

import java.io.IOException;
import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import gov.nasa.pds.api.registry.model.identifiers.PdsLidVid;
import gov.nasa.pds.api.registry.model.identifiers.PdsProductClasses;
import org.antlr.v4.runtime.BailErrorStrategy;
Expand All @@ -15,6 +19,7 @@
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.apache.commons.lang3.StringUtils;
import org.opensearch.client.json.jackson.JacksonJsonpGenerator;
import org.opensearch.client.opensearch._types.FieldSort;
import org.opensearch.client.opensearch._types.FieldValue;
import org.opensearch.client.opensearch._types.SortOptions;
Expand Down Expand Up @@ -141,10 +146,32 @@ public RegistrySearchRequestBuilder applyMultipleProductsDefaults(
}

public SearchRequest build() {
this.query(this.queryBuilder.build().toQuery());
BoolQuery bQuery = this.queryBuilder.build();
this.query(bQuery.toQuery());
this.trackTotalHits(t -> t.enabled(true));

return super.build();
SearchRequest searchRequest = super.build();

try {
String requestJson = serializeSearchRequest(searchRequest);
log.debug("Generated OpenSearch SearchRequest with query:\n" + requestJson);
} catch (Exception e) {
log.error("Failed to generate json serialization of SearchRequest: " + e);
}

return searchRequest;
}

public String serializeSearchRequest(SearchRequest searchRequest) throws IOException {
StringWriter writer = new StringWriter();
JsonFactory jsonFactory = new JsonFactory();
JsonGenerator jsonGenerator = jsonFactory.createGenerator(writer);
jsonGenerator.useDefaultPrettyPrinter();

JacksonJsonpGenerator jacksonJsonpGenerator = new JacksonJsonpGenerator(jsonGenerator);
searchRequest.serialize(jacksonJsonpGenerator, null);
jsonGenerator.close();
return writer.toString();
}

/**
Expand Down
Loading