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 5c95a18f69 Support log overview IN filters
5c95a18f69 is described below
commit 5c95a18f6995c349c1101a264fb11d4cb171694e
Author: Logic <[email protected]>
AuthorDate: Tue Jun 9 21:03:17 2026 +0800
Support log overview IN filters
---
.../logs/service/impl/LogQueryServiceImpl.java | 20 ++++---
.../logs/controller/LogQueryControllerTest.java | 66 ++++++++++++++++++++++
2 files changed, 77 insertions(+), 9 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 e17cb3c2fa..495d85f0c5 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
@@ -174,8 +174,8 @@ public class LogQueryServiceImpl implements LogQueryService
{
String serviceName, String
serviceNamespace, String environment,
String resourceFilter, String
attributeFilter,
boolean hideInternal, boolean
hideNoise) {
- 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 overviewStatsWithFilters(start, end, traceId, spanId,
severityNumber, severityText, search,
serviceName, serviceNamespace, environment, resourceFilters,
attributeFilters, hideInternal, hideNoise);
}
@@ -188,8 +188,8 @@ public class LogQueryServiceImpl implements LogQueryService
{
boolean hideInternal, boolean
hideNoise) {
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 overviewStatsWithFilters(start, end, traceId, spanId,
severityNumber, severityText, search,
context.serviceName(), context.serviceNamespace(),
context.environment(), resourceFilters, attributeFilters,
hideInternal, hideNoise);
@@ -201,11 +201,13 @@ public class LogQueryServiceImpl implements
LogQueryService {
Map<String, String>
resourceFilters,
Map<String, String>
attributeFilters,
boolean hideInternal,
boolean hideNoise) {
- Map<String, Long> aggregate = readSeverityBuckets(start, end, traceId,
spanId, severityNumber,
- severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
- hideInternal, hideNoise);
- if (aggregate != null) {
- return new HashMap<>(aggregate);
+ if (!hasComplexAttributeFilters(resourceFilters, attributeFilters)) {
+ Map<String, Long> aggregate = readSeverityBuckets(start, end,
traceId, spanId, severityNumber,
+ severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
+ hideInternal, hideNoise);
+ if (aggregate != null) {
+ return new HashMap<>(aggregate);
+ }
}
List<LogEntry> logs = getFilteredLogs(start, end, traceId, spanId,
severityNumber, severityText, search,
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 b346ed91df..3a168f4758 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
@@ -402,6 +402,72 @@ class LogQueryControllerTest {
eq(expectedResourceFilters), eq(expectedAttributeFilters));
}
+ @Test
+ void testOverviewStatsAppliesInAndNotInFiltersWithRowFallback() throws
Exception {
+ LogEntry infoLog = LogEntry.builder()
+ .timeUnixNano(1734005477630000000L)
+ .severityNumber(9)
+ .severityText("INFO")
+ .body("stable checkout info")
+ .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 errorLog = LogEntry.builder()
+ .timeUnixNano(1734005477640000000L)
+ .severityNumber(17)
+ .severityText("ERROR")
+ .body("stable checkout error")
+ .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)
+ .severityNumber(17)
+ .severityText("ERROR")
+ .body("canary checkout error")
+ .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)
+ .severityNumber(13)
+ .severityText("WARN")
+ .body("cart checkout warn")
+ .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(infoLog,
errorLog, canaryLog, cartLog));
+
+ mockMvc.perform(MockMvcRequestBuilders.get("/api/logs/stats/overview")
+ .param("resourceFilter", "service.version IN ('1.2.3',
'1.2.4') "
+ + "and host.name NOT IN ('checkout-canary')")
+ .param("attributeFilter", "http.route IN
('/checkout')"))
+ .andExpect(status().isOk())
+ .andExpect(jsonPath("$.code").value((int)
CommonConstants.SUCCESS_CODE))
+ .andExpect(jsonPath("$.data.totalCount").value(2))
+ .andExpect(jsonPath("$.data.infoCount").value(1))
+ .andExpect(jsonPath("$.data.errorCount").value(1))
+ .andExpect(jsonPath("$.data.warnCount").value(0));
+
+ verify(historyDataReader).queryLogsByMultipleConditions(any(), any(),
any(),
+ any(), any(), any(), any());
+ verify(historyDataReader, never()).countLogsBySeverityBuckets(any(),
any(), any(), any(),
+ any(), any(), any(), anySet(), eq(false));
+ }
+
@Test
void testLogContextPrefersEntityIdentityOverConflictingRouteContext()
throws Exception {
ObservabilityWorkspaceQueryGateway workspaceQueryGateway =
org.mockito.Mockito.mock(ObservabilityWorkspaceQueryGateway.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
