Skip to content

fix: Peon metrics emit same value #19484

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

Open
GWphua wants to merge 2 commits into
base: master
Choose a base branch
from
+13 −27
Open

fix: Peon metrics emit same value #19484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8903465
Fix metrics
GWphua May 19, 2026
101c823
Peon metrics image test
GWphua May 20, 2026
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
25 changes: 5 additions & 20 deletions .../src/main/java/org/apache/druid/segment/realtime/appenderator/SinkQuerySegmentWalker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import org.apache.druid.client.CachingQueryRunner;
import org.apache.druid.client.cache.Cache;
Expand Down Expand Up @@ -90,7 +89,6 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.ObjLongConsumer;
import java.util.stream.Collectors;

/**
Expand All @@ -107,13 +105,6 @@ public class SinkQuerySegmentWalker implements QuerySegmentWalker
DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME
);

private static final Map<String, ObjLongConsumer<? super QueryMetrics<?>>> METRICS_TO_REPORT =
ImmutableMap.of(
DefaultQueryMetrics.QUERY_SEGMENT_TIME, QueryMetrics::reportSegmentTime,
DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME, QueryMetrics::reportSegmentAndCacheTime,
DefaultQueryMetrics.QUERY_WAIT_TIME, QueryMetrics::reportWaitTime
);

private final String dataSource;

// Maintain a timeline of ids and Sinks for all the segments including the base and upgraded versions
Expand Down Expand Up @@ -539,17 +530,11 @@ public void after(boolean isDone, Throwable thrown)
for (Map.Entry<String, SegmentMetrics> segmentAndMetrics : segmentMetricsAccumulator.entrySet()) {
queryMetrics.segment(segmentAndMetrics.getKey());

for (Map.Entry<String, ObjLongConsumer<? super QueryMetrics<?>>> reportMetric : METRICS_TO_REPORT.entrySet()) {
final String metricName = reportMetric.getKey();
switch (metricName) {
case DefaultQueryMetrics.QUERY_SEGMENT_TIME:
reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getSegmentTime());
case DefaultQueryMetrics.QUERY_WAIT_TIME:
reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getWaitTime());
case DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME:
reportMetric.getValue().accept(queryMetrics, segmentAndMetrics.getValue().getSegmentAndCacheTime());
}
}
final SegmentMetrics segmentMetrics = segmentAndMetrics.getValue();

queryMetrics.reportSegmentTime(segmentMetrics.getSegmentTime());
queryMetrics.reportWaitTime(segmentMetrics.getWaitTime());
queryMetrics.reportSegmentAndCacheTime(segmentMetrics.getSegmentAndCacheTime());

try {
queryMetrics.emit(emitter);
Expand Down
15 changes: 8 additions & 7 deletions .../src/test/java/org/apache/druid/segment/realtime/appenderator/StreamAppenderatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import org.apache.druid.java.util.common.granularity.Granularities;
import org.apache.druid.java.util.metrics.StubServiceEmitter;
import org.apache.druid.metadata.PendingSegmentRecord;
import org.apache.druid.query.DefaultQueryMetrics;
import org.apache.druid.query.Druids;
import org.apache.druid.query.Order;
import org.apache.druid.query.QueryPlus;
Expand Down Expand Up @@ -2296,14 +2297,14 @@ public void testQueryBySegments() throws Exception
private void verifySinkMetrics(StubServiceEmitter emitter, Set<String> segmentIds)
{
int segments = segmentIds.size();
emitter.verifyEmitted("query/cpu/time", 1);
Assert.assertEquals(segments, emitter.getMetricEvents("query/segment/time").size());
Assert.assertEquals(segments, emitter.getMetricEvents("query/segmentAndCache/time").size());
Assert.assertEquals(segments, emitter.getMetricEvents("query/wait/time").size());
emitter.verifyEmitted(DefaultQueryMetrics.QUERY_CPU_TIME, 1);
Assert.assertEquals(segments, emitter.getMetricEvents(DefaultQueryMetrics.QUERY_SEGMENT_TIME).size());
Assert.assertEquals(segments, emitter.getMetricEvents(DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME).size());
Assert.assertEquals(segments, emitter.getMetricEvents(DefaultQueryMetrics.QUERY_WAIT_TIME).size());
for (String id : segmentIds) {
Assert.assertTrue(emitter.getMetricEvents("query/segment/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
Assert.assertTrue(emitter.getMetricEvents("query/segmentAndCache/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
Assert.assertTrue(emitter.getMetricEvents("query/wait/time").stream().anyMatch(value -> value.getUserDims().containsValue(id)));
Assert.assertTrue(emitter.getMetricEvents(DefaultQueryMetrics.QUERY_SEGMENT_TIME).stream().anyMatch(value -> value.getUserDims().containsValue(id)));
Assert.assertTrue(emitter.getMetricEvents(DefaultQueryMetrics.QUERY_SEGMENT_AND_CACHE_TIME).stream().anyMatch(value -> value.getUserDims().containsValue(id)));
Assert.assertTrue(emitter.getMetricEvents(DefaultQueryMetrics.QUERY_WAIT_TIME).stream().anyMatch(value -> value.getUserDims().containsValue(id)));
}
}

Expand Down
Loading