This is an automated email from the ASF dual-hosted git repository.
zqr10159 pushed a commit to branch 2.0.0
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/2.0.0 by this push:
new cba4b12f5b Support log group-by IN filters
cba4b12f5b is described below
commit cba4b12f5b9f5816911e54f79b730e444692bf2b
Author: Logic <[email protected]>
AuthorDate: Tue Jun 9 21:16:46 2026 +0800
Support log group-by IN filters
---
.../logs/service/impl/LogQueryServiceImpl.java | 17 +++---
.../logs/controller/LogQueryControllerTest.java | 68 ++++++++++++++++++++++
2 files changed, 78 insertions(+), 7 deletions(-)
diff --git
a/hertzbeat-observability/src/main/java/org/apache/hertzbeat/observability/logs/service/impl/LogQueryServiceImpl.java
b/hertzbeat-observability/src/main/java/org/apache/hertzbeat/observability/logs/service/impl/LogQueryServiceImpl.java
index 4bac5a6a2d..35a473d536 100644
---
a/hertzbeat-observability/src/main/java/org/apache/hertzbeat/observability/logs/service/impl/LogQueryServiceImpl.java
+++
b/hertzbeat-observability/src/main/java/org/apache/hertzbeat/observability/logs/service/impl/LogQueryServiceImpl.java
@@ -392,8 +392,8 @@ public class LogQueryServiceImpl implements LogQueryService
{
if (!StringUtils.hasText(normalizedGroupBy)) {
return groupByResult("", Map.of(), resolvedLimit, orderBy,
resolvedMinCount);
}
- Map<String, String> resourceFilters =
parseLogAttributeFilter(resourceFilter);
- Map<String, String> attributeFilters =
parseLogAttributeFilter(attributeFilter);
+ Map<String, String> resourceFilters =
parseLogAttributeFilter(resourceFilter, true);
+ Map<String, String> attributeFilters =
parseLogAttributeFilter(attributeFilter, true);
return groupByStats(start, end, traceId, spanId, severityNumber,
severityText, search,
serviceName, serviceNamespace, environment, resourceFilters,
attributeFilters, normalizedGroupBy,
resolvedLimit, orderBy, resolvedMinCount, hideInternal,
hideNoise);
@@ -414,8 +414,8 @@ public class LogQueryServiceImpl implements LogQueryService
{
}
LogServiceContext context =
resolveEntityFirstLogServiceContext(entityId, serviceName, serviceNamespace,
environment);
Map<String, String> resourceFilters = removeEntityScopeResourceFilters(
- context, parseLogAttributeFilter(resourceFilter));
- Map<String, String> attributeFilters =
parseLogAttributeFilter(attributeFilter);
+ context, parseLogAttributeFilter(resourceFilter, true));
+ Map<String, String> attributeFilters =
parseLogAttributeFilter(attributeFilter, true);
return groupByStats(start, end, traceId, spanId, severityNumber,
severityText, search,
context.serviceName(), context.serviceNamespace(),
context.environment(), resourceFilters, attributeFilters,
normalizedGroupBy, resolvedLimit, orderBy, resolvedMinCount,
hideInternal, hideNoise);
@@ -427,9 +427,12 @@ public class LogQueryServiceImpl implements
LogQueryService {
Map<String, String>
resourceFilters, Map<String, String> attributeFilters,
String normalizedGroupBy, int
resolvedLimit, String orderBy,
long resolvedMinCount, boolean
hideInternal, boolean hideNoise) {
- Map<String, Long> aggregate = readGroupStats(start, end, traceId,
spanId, severityNumber,
- severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
- normalizedGroupBy, hideInternal, hideNoise);
+ Map<String, Long> aggregate = null;
+ if (!hasComplexAttributeFilters(resourceFilters, attributeFilters)) {
+ aggregate = readGroupStats(start, end, traceId, spanId,
severityNumber,
+ severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
+ normalizedGroupBy, hideInternal, hideNoise);
+ }
if (aggregate != null) {
return groupByResult(normalizedGroupBy, aggregate, resolvedLimit,
orderBy, resolvedMinCount);
}
diff --git
a/hertzbeat-observability/src/test/java/org/apache/hertzbeat/observability/logs/controller/LogQueryControllerTest.java
b/hertzbeat-observability/src/test/java/org/apache/hertzbeat/observability/logs/controller/LogQueryControllerTest.java
index 6c83fabc10..ad49d03e37 100644
---
a/hertzbeat-observability/src/test/java/org/apache/hertzbeat/observability/logs/controller/LogQueryControllerTest.java
+++
b/hertzbeat-observability/src/test/java/org/apache/hertzbeat/observability/logs/controller/LogQueryControllerTest.java
@@ -1583,4 +1583,72 @@ class LogQueryControllerTest {
any(), any(), any(), any());
}
+ @Test
+ void testGroupByStatsAppliesInAndNotInFiltersWithRowFallback() throws
Exception {
+ LogEntry stableLog = LogEntry.builder()
+ .timeUnixNano(1734005477630000000L)
+ .severityText("INFO")
+ .body("stable checkout group")
+ .resource(new HashMap<>(Map.of(
+ "service.name", "checkout",
+ "service.version", "1.2.3",
+ "host.name", "checkout-1")))
+ .attributes(new HashMap<>(Map.of("http.route", "/checkout")))
+ .build();
+ LogEntry secondStableLog = LogEntry.builder()
+ .timeUnixNano(1734005477640000000L)
+ .severityText("ERROR")
+ .body("second checkout group")
+ .resource(new HashMap<>(Map.of(
+ "service.name", "checkout",
+ "service.version", "1.2.4",
+ "host.name", "checkout-2")))
+ .attributes(new HashMap<>(Map.of("http.route", "/checkout")))
+ .build();
+ LogEntry canaryLog = LogEntry.builder()
+ .timeUnixNano(1734005477650000000L)
+ .severityText("WARN")
+ .body("canary checkout group")
+ .resource(new HashMap<>(Map.of(
+ "service.name", "checkout",
+ "service.version", "1.2.3",
+ "host.name", "checkout-canary")))
+ .attributes(new HashMap<>(Map.of("http.route", "/checkout")))
+ .build();
+ LogEntry cartLog = LogEntry.builder()
+ .timeUnixNano(1734005477660000000L)
+ .severityText("INFO")
+ .body("cart checkout group")
+ .resource(new HashMap<>(Map.of(
+ "service.name", "checkout",
+ "service.version", "1.2.4",
+ "host.name", "checkout-3")))
+ .attributes(new HashMap<>(Map.of("http.route", "/cart")))
+ .build();
+ when(historyDataReader.queryLogsByMultipleConditions(any(), any(),
any(),
+ any(), any(), any(), any())).thenReturn(List.of(stableLog,
secondStableLog, canaryLog, cartLog));
+
+ mockMvc.perform(MockMvcRequestBuilders.get("/api/logs/stats/group-by")
+ .param("resourceFilter", "service.version IN ('1.2.3',
'1.2.4') "
+ + "and host.name NOT IN ('checkout-canary')")
+ .param("attributeFilter", "http.route IN
('/checkout')")
+ .param("groupBy", "resource:service.version")
+ .param("orderBy", "count-asc"))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value((int)
CommonConstants.SUCCESS_CODE))
+
.andExpect(jsonPath("$.data.groupBy").value("resource:service.version"))
+ .andExpect(jsonPath("$.data.groups.length()").value(2))
+ .andExpect(jsonPath("$.data.groups[0].value").value("1.2.3"))
+ .andExpect(jsonPath("$.data.groups[0].count").value(1))
+ .andExpect(jsonPath("$.data.groups[1].value").value("1.2.4"))
+ .andExpect(jsonPath("$.data.groups[1].count").value(1));
+
+ verify(historyDataReader).queryLogsByMultipleConditions(any(), any(),
any(),
+ any(), any(), any(), any());
+ verify(historyDataReader, never()).countLogsByGroup(any(), any(),
any(), any(), any(), any(), any(),
+ anySet(), eq(false), any(), any(), any(), any(),
+ org.mockito.ArgumentMatchers.<Map<String, String>>any(),
+ org.mockito.ArgumentMatchers.<Map<String, String>>any(),
eq("resource:service.version"));
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
