Skip to content

Commit d2ef974

Browse files
committed
Add tier dimension to segment/max bytes metric
1 parent dcd3d87 commit d2ef974

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

server/src/main/java/org/apache/druid/server/metrics/HistoricalMetricsMonitor.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ public HistoricalMetricsMonitor(
5757
@Override
5858
public boolean doMonitor(ServiceEmitter emitter)
5959
{
60-
emitter.emit(new ServiceMetricEvent.Builder().setMetric("segment/max", serverConfig.getMaxSize()));
60+
emitter.emit(
61+
new ServiceMetricEvent.Builder()
62+
.setDimension("tier", serverConfig.getTier())
63+
.setDimension("priority", String.valueOf(serverConfig.getPriority()))
64+
.setMetric("segment/max", serverConfig.getMaxSize())
65+
);
6166

6267
final Object2LongOpenHashMap<String> pendingDeleteSizes = new Object2LongOpenHashMap<>();
6368

server/src/test/java/org/apache/druid/server/metrics/HistoricalMetricsMonitorTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public void testSimple()
7070
final int priority = 111;
7171
final String tier = "tier";
7272

73+
EasyMock.expect(druidServerConfig.getTier()).andReturn(tier).once();
74+
EasyMock.expect(druidServerConfig.getPriority()).andReturn(priority).once();
7375
EasyMock.expect(druidServerConfig.getMaxSize()).andReturn(maxSize).once();
7476
EasyMock.expect(segmentLoadDropMgr.getSegmentsToDelete()).andReturn(ImmutableList.of(dataSegment)).once();
7577
EasyMock.expect(druidServerConfig.getTier()).andReturn(tier).once();
@@ -92,7 +94,7 @@ public void testSimple()
9294
monitor.doMonitor(serviceEmitter);
9395
EasyMock.verify(druidServerConfig, segmentManager, segmentLoadDropMgr);
9496

95-
serviceEmitter.verifyValue("segment/max", maxSize);
97+
serviceEmitter.verifyValue("segment/max", Map.of("tier", tier, "priority", String.valueOf(priority)), maxSize);
9698
serviceEmitter.verifyValue(
9799
"segment/pendingDelete",
98100
Map.of("tier", tier, "dataSource", dataSource, "priority", String.valueOf(priority)),

0 commit comments

Comments
 (0)