Skip to content

Commit 4cad5f2

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

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ 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+
.setMetric("segment/max", serverConfig.getMaxSize())
64+
);
6165

6266
final Object2LongOpenHashMap<String> pendingDeleteSizes = new Object2LongOpenHashMap<>();
6367

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ public void testSimple()
7171
final String tier = "tier";
7272

7373
EasyMock.expect(druidServerConfig.getMaxSize()).andReturn(maxSize).once();
74+
EasyMock.expect(druidServerConfig.getTier()).andReturn(tier).once();
7475
EasyMock.expect(segmentLoadDropMgr.getSegmentsToDelete()).andReturn(ImmutableList.of(dataSegment)).once();
7576
EasyMock.expect(druidServerConfig.getTier()).andReturn(tier).once();
7677
EasyMock.expect(druidServerConfig.getPriority()).andReturn(priority).once();
@@ -92,7 +93,7 @@ public void testSimple()
9293
monitor.doMonitor(serviceEmitter);
9394
EasyMock.verify(druidServerConfig, segmentManager, segmentLoadDropMgr);
9495

95-
serviceEmitter.verifyValue("segment/max", maxSize);
96+
serviceEmitter.verifyValue("segment/max", Map.of("tier", tier), maxSize);
9697
serviceEmitter.verifyValue(
9798
"segment/pendingDelete",
9899
Map.of("tier", tier, "dataSource", dataSource, "priority", String.valueOf(priority)),

0 commit comments

Comments
 (0)