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 ae53af9187 Support log trace coverage IN filters
ae53af9187 is described below
commit ae53af918790de8767f95d25f78313129ded720c
Author: Logic <[email protected]>
AuthorDate: Tue Jun 9 21:19:55 2026 +0800
Support log trace coverage IN filters
---
.../logs/service/impl/LogQueryServiceImpl.java | 17 ++---
.../logs/controller/LogQueryControllerTest.java | 72 ++++++++++++++++++++++
2 files changed, 82 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 35a473d536..f91688518b 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
@@ -248,8 +248,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 traceCoverageStatsWithFilters(start, end, traceId, spanId,
severityNumber, severityText, search,
serviceName, serviceNamespace, environment, resourceFilters,
attributeFilters, hideInternal, hideNoise);
}
@@ -262,8 +262,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 traceCoverageStatsWithFilters(start, end, traceId, spanId,
severityNumber, severityText, search,
context.serviceName(), context.serviceNamespace(),
context.environment(), resourceFilters, attributeFilters,
hideInternal, hideNoise);
@@ -275,9 +275,12 @@ public class LogQueryServiceImpl implements
LogQueryService {
Map<String,
String> resourceFilters,
Map<String,
String> attributeFilters,
boolean
hideInternal, boolean hideNoise) {
- Map<String, Long> aggregate = readTraceCoverage(start, end, traceId,
spanId, severityNumber,
- severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
- hideInternal, hideNoise);
+ Map<String, Long> aggregate = null;
+ if (!hasComplexAttributeFilters(resourceFilters, attributeFilters)) {
+ aggregate = readTraceCoverage(start, end, traceId, spanId,
severityNumber,
+ severityText, search, serviceName, serviceNamespace,
environment, resourceFilters, attributeFilters,
+ hideInternal, hideNoise);
+ }
if (aggregate != null) {
Map<String, Object> result = new HashMap<>();
result.put("traceCoverage", aggregate);
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 ad49d03e37..d6a6296267 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
@@ -1409,6 +1409,78 @@ class LogQueryControllerTest {
any(), any(), any(), any());
}
+ @Test
+ void testTraceCoverageStatsAppliesInAndNotInFiltersWithRowFallback()
throws Exception {
+ LogEntry tracedLog = LogEntry.builder()
+ .timeUnixNano(1734005477630000000L)
+ .severityText("INFO")
+ .body("traced checkout coverage")
+ .traceId("trace-checkout")
+ .spanId("span-checkout")
+ .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 untracedLog = LogEntry.builder()
+ .timeUnixNano(1734005477640000000L)
+ .severityText("ERROR")
+ .body("untraced checkout coverage")
+ .traceId("")
+ .spanId("")
+ .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 coverage")
+ .traceId("trace-canary")
+ .spanId("span-canary")
+ .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 coverage")
+ .traceId("trace-cart")
+ .spanId("span-cart")
+ .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(tracedLog,
untracedLog, canaryLog, cartLog));
+
+
mockMvc.perform(MockMvcRequestBuilders.get("/api/logs/stats/trace-coverage")
+ .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.traceCoverage.withTrace").value(1))
+
.andExpect(jsonPath("$.data.traceCoverage.withoutTrace").value(1))
+ .andExpect(jsonPath("$.data.traceCoverage.withSpan").value(1))
+
.andExpect(jsonPath("$.data.traceCoverage.withBothTraceAndSpan").value(1));
+
+ verify(historyDataReader).queryLogsByMultipleConditions(any(), any(),
any(),
+ any(), any(), any(), any());
+ verify(historyDataReader, never()).countLogTraceCoverage(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());
+ }
+
@Test
void testTrendStats() throws Exception {
// Create logs with timestamps that fall into different hours
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
