Skip to content

[4.6.x] fix: ensure payload filter returns all request results #13921

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

Merged
merged 1 commit into from
Nov 4, 2025
Merged

[4.6.x] fix: ensure payload filter returns all request results #13921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 6 additions & 9 deletions ...icsearch/src/main/java/io/gravitee/repository/elasticsearch/log/ElasticLogRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ public class ElasticLogRepository extends AbstractElasticsearchRepository implem
@Autowired
protected RepositoryConfiguration configuration;

private static final int MAX_RESULT_WINDOW = 10000;

@Override
public TabularResponse query(final QueryContext queryContext, final TabularQuery query) throws AnalyticsException {
final Long from = query.timeRange().range().from();
Expand All @@ -89,8 +91,8 @@ public TabularResponse query(final QueryContext queryContext, final TabularQuery
} else {
final TabularQuery logQuery = tabular()
.timeRange(query.timeRange().range(), query.timeRange().interval())
.page(query.page())
.size(query.size())
.page(1)
.size(MAX_RESULT_WINDOW)
.query(logQueryString)
.build();
final String sQuery = this.createElasticsearchJsonQuery(logQuery);
Expand All @@ -114,7 +116,7 @@ public TabularResponse query(final QueryContext queryContext, final TabularQuery
final String requestQuery = isEmpty(queryString) ? logIdsQuery : format("(%s) AND (%s)", queryString, logIdsQuery);
final TabularQueryBuilder requestQueryBuilder = tabular()
.timeRange(query.timeRange().range(), query.timeRange().interval())
.page(1)
.page(query.page())
.size(query.size())
.sort(query.sort())
.query(requestQuery);
Expand All @@ -129,12 +131,7 @@ public TabularResponse query(final QueryContext queryContext, final TabularQuery
}

SearchResponse searchResponseRequest = result.blockingGet();
return this.toTabularResponse(
searchResponseRequest,
searchResponseRequest.getSearchHits().getTotal().getValue() == query.size() || query.page() > 1
? searchResponseLog.getSearchHits().getTotal().getValue()
: searchResponseRequest.getSearchHits().getTotal().getValue()
);
return this.toTabularResponse(searchResponseRequest, searchResponseRequest.getSearchHits().getTotal().getValue());
}
} catch (final Exception eex) {
logger.error("Impossible to perform log request", eex);
Expand Down
217 changes: 217 additions & 0 deletions ...rc/test/java/io/gravitee/repository/elasticsearch/log/ElasticsearchLogRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,221 @@ public void testTabular_withoutQuery() throws Exception {
assertThat(response).isNotNull();
assertThat(response.getLogs().size()).isEqualTo(response.getSize());
}

@Test
public void testTabular_withCombinedFilters_statusAndBody() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(10)
.build()
);

assertThat(response).isNotNull();
assertThat(response.getSize()).isLessThanOrEqualTo(6);
assertThat(response.getLogs()).hasSizeLessThanOrEqualTo((int) response.getSize());
}

@Test
public void testTabular_withCombinedFilters_pagination_page1() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(3)
.build()
);

assertThat(response).isNotNull();
long totalSize = response.getSize();
assertThat(response.getLogs()).hasSizeLessThanOrEqualTo(3);
assertThat(totalSize).isGreaterThanOrEqualTo(response.getLogs().size());
}

@Test
public void testTabular_withCombinedFilters_pagination_page2() throws Exception {
TabularResponse responsePage1 = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(3)
.build()
);

TabularResponse responsePage2 = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(2)
.size(3)
.build()
);

assertThat(responsePage2).isNotNull();
assertThat(responsePage2.getSize()).isEqualTo(responsePage1.getSize());
int expectedPage2Size = (int) Math.max(0, responsePage1.getSize() - 3);
assertThat(responsePage2.getLogs()).hasSizeLessThanOrEqualTo(expectedPage2Size);
}

@Test
public void testTabular_withCombinedFilters_differentPageSizes() throws Exception {
TabularResponse responseSize10 = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(10)
.build()
);

TabularResponse responseSize15 = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(15)
.build()
);

TabularResponse responseSize100 = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(100)
.build()
);
assertThat(responseSize10.getSize()).isEqualTo(responseSize15.getSize()).isEqualTo(responseSize100.getSize());
}

@Test
public void testTabular_bodyFilterOnly_pagination_consistent() throws Exception {
String bodyQuery = "client-response.body:*not valid or is expired*";

TabularResponse response1 = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query(bodyQuery).page(1).size(10).build()
);

TabularResponse response2 = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query(bodyQuery).page(1).size(15).build()
);

// Total should be consistent
assertThat(response1.getSize()).isEqualTo(response2.getSize());
assertThat(response1.getSize()).isEqualTo(6);
}

@Test
public void testTabular_emptyResults_withCombinedFilters() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:999 AND client-response.body:*nonexistent-text-12345*")
.page(1)
.size(10)
.build()
);

assertThat(response).isNotNull();
assertThat(response.getSize()).isZero();
assertThat(response.getLogs()).isEmpty();
}

@Test
public void testTabular_statusFilterOnly() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("status:200").page(1).size(10).build()
);

assertThat(response).isNotNull();
assertThat(response.getSize()).isGreaterThan(0);
assertThat(response.getLogs()).isNotEmpty();
}

@Test
public void testTabular_multipleStatusFilters_withBody() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular()
.timeRange(lastDays(60), hours(1))
.query("status:200 AND client-response.body:*not valid or is expired*")
.page(1)
.size(10)
.build()
);

assertThat(response).isNotNull();
assertThat(response.getLogs()).hasSizeLessThanOrEqualTo((int) response.getSize());
}

@Test
public void testTabular_paginationBeyondResults() throws Exception {
TabularResponse responsePage1 = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("client-response.body:*not valid or is expired*").page(1).size(10).build()
);

// Request page 10 when we only have 6 results
TabularResponse responsePage10 = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("client-response.body:*not valid or is expired*").page(10).size(10).build()
);

assertThat(responsePage10).isNotNull();
assertThat(responsePage10.getSize()).isEqualTo(responsePage1.getSize()); // Total should be same
assertThat(responsePage10.getLogs()).isEmpty(); // No results on page 10
}

@Test
public void testTabular_largePaginationSize() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("client-response.body:*not valid or is expired*").page(1).size(1000).build()
);

assertThat(response).isNotNull();
assertThat(response.getSize()).isEqualTo(6);
assertThat(response.getLogs()).hasSize(6); // Should return all available results
}

@Test
public void testTabular_caseInsensitiveBodySearch() throws Exception {
TabularResponse responseLower = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("client-response.body:*not valid*").page(1).size(10).build()
);

TabularResponse responseUpper = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("client-response.body:*NOT VALID*").page(1).size(10).build()
);
assertThat(responseLower).isNotNull();
assertThat(responseUpper).isNotNull();
}

@Test
public void testTabular_complexQuery_multipleConditions() throws Exception {
TabularResponse response = logRepository.query(
queryContext,
tabular().timeRange(lastDays(60), hours(1)).query("status:200 AND client-response.body:*valid*").page(1).size(10).build()
);

assertThat(response).isNotNull();
assertThat(response.getLogs()).hasSizeLessThanOrEqualTo((int) response.getSize());
}
}
2 changes: 1 addition & 1 deletion ...pim-rest-api-service/src/main/java/io/gravitee/rest/api/service/impl/LogsServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public SearchLogResponse<ApiRequestItem> findByApi(final ExecutionContext execut
logResponse.setLogs(response.getLogs().stream().map(this::toApiRequestItem).collect(Collectors.toList()));

// Add metadata (only if they are results)
if (response.getSize() > 0) {
if (response.getLogs() != null && !response.getLogs().isEmpty()) {
Map<String, Map<String, String>> metadata = new HashMap<>();

logResponse
Expand Down