Skip to content

Commit 7c2ebc9

Browse files
jeqojeqo
committed
refactor: remove duplicated metrics already existing at RSM level
1 parent 016672c commit 7c2ebc9

File tree

4 files changed

+0
-188
lines changed

4 files changed

+0
-188
lines changed

‎core/src/main/java/io/aiven/kafka/tieredstorage/RemoteStorageManager.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,6 @@ public Optional<CustomMetadata> copyLogSegmentData(final RemoteLogSegmentMetadat
194194

195195
log.info("Copying log segment data, metadata: {}", remoteLogSegmentMetadata);
196196

197-
metrics.recordSegmentCopy(remoteLogSegmentMetadata.remoteLogSegmentId().topicIdPartition().topicPartition(),
198-
remoteLogSegmentMetadata.segmentSizeInBytes());
199-
200197
final var customMetadataBuilder =
201198
new SegmentCustomMetadataBuilder(customMetadataFields, objectKey, remoteLogSegmentMetadata);
202199

@@ -242,8 +239,6 @@ public Optional<CustomMetadata> copyLogSegmentData(final RemoteLogSegmentMetadat
242239
uploadIndexFile(remoteLogSegmentMetadata, leaderEpoch, LEADER_EPOCH, encryptionMetadata,
243240
customMetadataBuilder);
244241
} catch (final Exception e) {
245-
metrics.recordSegmentCopyError(remoteLogSegmentMetadata.remoteLogSegmentId()
246-
.topicIdPartition().topicPartition());
247242
throw new RemoteStorageException(e);
248243
}
249244

‎core/src/main/java/io/aiven/kafka/tieredstorage/metrics/Metrics.java‎

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737

3838
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.OBJECT_UPLOAD;
3939
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.OBJECT_UPLOAD_BYTES;
40-
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_COPY;
41-
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_COPY_BYTES;
42-
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_COPY_ERRORS;
4340
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_COPY_TIME;
4441
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_DELETE;
4542
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_DELETE_BYTES;
4643
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_DELETE_ERRORS;
4744
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_DELETE_TIME;
48-
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_FETCH;
4945
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.SEGMENT_FETCH_REQUESTED_BYTES;
5046
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.objectTypeTags;
5147
import static io.aiven.kafka.tieredstorage.metrics.MetricsRegistry.sensorName;
@@ -79,51 +75,6 @@ public Metrics(final Time time, final MetricConfig metricConfig) {
7975
metricsRegistry = new MetricsRegistry();
8076
}
8177

82-
public void recordSegmentCopy(final TopicPartition topicPartition, final long bytes) {
83-
recordSegmentCopyRequests(topicPartition);
84-
recordSegmentCopyBytes(topicPartition, bytes);
85-
}
86-
87-
private void recordSegmentCopyBytes(final TopicPartition topicPartition, final long bytes) {
88-
new SensorProvider(metrics, sensorName(SEGMENT_COPY_BYTES))
89-
.with(metricsRegistry.segmentCopyBytesRate, new Rate())
90-
.with(metricsRegistry.segmentCopyBytesTotal, new CumulativeSum())
91-
.get()
92-
.record(bytes);
93-
new SensorProvider(metrics, sensorNameByTopic(topicPartition, SEGMENT_COPY_BYTES),
94-
() -> topicTags(topicPartition))
95-
.with(metricsRegistry.segmentCopyBytesRateByTopic, new Rate())
96-
.with(metricsRegistry.segmentCopyBytesTotalByTopic, new CumulativeSum())
97-
.get()
98-
.record(bytes);
99-
new SensorProvider(metrics, sensorNameByTopicPartition(topicPartition, SEGMENT_COPY_BYTES),
100-
() -> topicPartitionTags(topicPartition), Sensor.RecordingLevel.DEBUG)
101-
.with(metricsRegistry.segmentCopyBytesRateByTopicPartition, new Rate())
102-
.with(metricsRegistry.segmentCopyBytesTotalByTopicPartition, new CumulativeSum())
103-
.get()
104-
.record(bytes);
105-
}
106-
107-
private void recordSegmentCopyRequests(final TopicPartition topicPartition) {
108-
new SensorProvider(metrics, sensorName(SEGMENT_COPY))
109-
.with(metricsRegistry.segmentCopyRequestsRate, new Rate())
110-
.with(metricsRegistry.segmentCopyRequestsTotal, new CumulativeCount())
111-
.get()
112-
.record();
113-
new SensorProvider(metrics, sensorNameByTopic(topicPartition, SEGMENT_COPY),
114-
() -> topicTags(topicPartition))
115-
.with(metricsRegistry.segmentCopyRequestsRateByTopic, new Rate())
116-
.with(metricsRegistry.segmentCopyRequestsTotalByTopic, new CumulativeCount())
117-
.get()
118-
.record();
119-
new SensorProvider(metrics, sensorNameByTopicPartition(topicPartition, SEGMENT_COPY),
120-
() -> topicPartitionTags(topicPartition), Sensor.RecordingLevel.DEBUG)
121-
.with(metricsRegistry.segmentCopyRequestsRateByTopicPartition, new Rate())
122-
.with(metricsRegistry.segmentCopyRequestsTotalByTopicPartition, new CumulativeCount())
123-
.get()
124-
.record();
125-
}
126-
12778
public void recordSegmentCopyTime(final TopicPartition topicPartition, final long startMs, final long endMs) {
12879
final var time = endMs - startMs;
12980
new SensorProvider(metrics, sensorName(SEGMENT_COPY_TIME))
@@ -145,26 +96,6 @@ public void recordSegmentCopyTime(final TopicPartition topicPartition, final lon
14596
.record(time);
14697
}
14798

148-
public void recordSegmentCopyError(final TopicPartition topicPartition) {
149-
new SensorProvider(metrics, sensorName(SEGMENT_COPY_ERRORS))
150-
.with(metricsRegistry.segmentCopyErrorsRate, new Rate())
151-
.with(metricsRegistry.segmentCopyErrorsTotal, new CumulativeCount())
152-
.get()
153-
.record();
154-
new SensorProvider(metrics, sensorNameByTopic(topicPartition, SEGMENT_COPY_ERRORS),
155-
() -> topicTags(topicPartition))
156-
.with(metricsRegistry.segmentCopyErrorsRateByTopic, new Rate())
157-
.with(metricsRegistry.segmentCopyErrorsTotalByTopic, new CumulativeCount())
158-
.get()
159-
.record();
160-
new SensorProvider(metrics, sensorNameByTopicPartition(topicPartition, SEGMENT_COPY_ERRORS),
161-
() -> topicPartitionTags(topicPartition), Sensor.RecordingLevel.DEBUG)
162-
.with(metricsRegistry.segmentCopyErrorsRateByTopicPartition, new Rate())
163-
.with(metricsRegistry.segmentCopyErrorsTotalByTopicPartition, new CumulativeCount())
164-
.get()
165-
.record();
166-
}
167-
16899
public void recordSegmentDelete(final TopicPartition topicPartition, final long bytes) {
169100
recordSegmentDeleteRequests(topicPartition);
170101
recordSegmentDeleteBytes(topicPartition, bytes);
@@ -256,7 +187,6 @@ public void recordSegmentDeleteError(final TopicPartition topicPartition) {
256187
}
257188

258189
public void recordSegmentFetch(final TopicPartition topicPartition, final long bytes) {
259-
recordSegmentFetchRequests(topicPartition);
260190
recordSegmentFetchRequestedBytes(topicPartition, bytes);
261191
}
262192

@@ -280,26 +210,6 @@ private void recordSegmentFetchRequestedBytes(final TopicPartition topicPartitio
280210
.record(bytes);
281211
}
282212

283-
private void recordSegmentFetchRequests(final TopicPartition topicPartition) {
284-
new SensorProvider(metrics, sensorName(SEGMENT_FETCH))
285-
.with(metricsRegistry.segmentFetchRequestsRate, new Rate())
286-
.with(metricsRegistry.segmentFetchRequestsTotal, new CumulativeCount())
287-
.get()
288-
.record();
289-
new SensorProvider(metrics, sensorNameByTopic(topicPartition, SEGMENT_FETCH),
290-
() -> topicTags(topicPartition))
291-
.with(metricsRegistry.segmentFetchRequestsRateByTopic, new Rate())
292-
.with(metricsRegistry.segmentFetchRequestsTotalByTopic, new CumulativeCount())
293-
.get()
294-
.record();
295-
new SensorProvider(metrics, sensorNameByTopicPartition(topicPartition, SEGMENT_FETCH),
296-
() -> topicPartitionTags(topicPartition), Sensor.RecordingLevel.DEBUG)
297-
.with(metricsRegistry.segmentFetchRequestsRateByTopicPartition, new Rate())
298-
.with(metricsRegistry.segmentFetchRequestsTotalByTopicPartition, new CumulativeCount())
299-
.get()
300-
.record();
301-
}
302-
303213
public void recordObjectUpload(final TopicPartition topicPartition, final ObjectKey.Suffix suffix,
304214
final long bytes) {
305215
recordObjectUploadRequests(topicPartition, suffix);

‎core/src/main/java/io/aiven/kafka/tieredstorage/metrics/MetricsRegistry.java‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,6 @@ public class MetricsRegistry {
3838

3939
// Segment copy metric names
4040
static final String SEGMENT_COPY = "segment-copy";
41-
static final String SEGMENT_COPY_RATE = SEGMENT_COPY + "-rate";
42-
final MetricNameTemplate segmentCopyRequestsRate = new MetricNameTemplate(SEGMENT_COPY_RATE, METRIC_GROUP, "");
43-
final MetricNameTemplate segmentCopyRequestsRateByTopic =
44-
new MetricNameTemplate(SEGMENT_COPY_RATE, METRIC_GROUP, "", TOPIC_TAG_NAMES);
45-
final MetricNameTemplate segmentCopyRequestsRateByTopicPartition =
46-
new MetricNameTemplate(SEGMENT_COPY_RATE, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
47-
static final String SEGMENT_COPY_TOTAL = SEGMENT_COPY + "-total";
48-
final MetricNameTemplate segmentCopyRequestsTotal = new MetricNameTemplate(SEGMENT_COPY_TOTAL, METRIC_GROUP, "");
49-
final MetricNameTemplate segmentCopyRequestsTotalByTopic =
50-
new MetricNameTemplate(SEGMENT_COPY_TOTAL, METRIC_GROUP, "", TOPIC_TAG_NAMES);
51-
final MetricNameTemplate segmentCopyRequestsTotalByTopicPartition =
52-
new MetricNameTemplate(SEGMENT_COPY_TOTAL, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
53-
static final String SEGMENT_COPY_BYTES = SEGMENT_COPY + "-bytes";
54-
static final String SEGMENT_COPY_BYTES_RATE = SEGMENT_COPY_BYTES + "-rate";
55-
final MetricNameTemplate segmentCopyBytesRate = new MetricNameTemplate(SEGMENT_COPY_BYTES_RATE, METRIC_GROUP, "");
56-
final MetricNameTemplate segmentCopyBytesRateByTopic =
57-
new MetricNameTemplate(SEGMENT_COPY_BYTES_RATE, METRIC_GROUP, "", TOPIC_TAG_NAMES);
58-
final MetricNameTemplate segmentCopyBytesRateByTopicPartition =
59-
new MetricNameTemplate(SEGMENT_COPY_BYTES_RATE, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
60-
public static final String SEGMENT_COPY_BYTES_TOTAL = SEGMENT_COPY_BYTES + "-total";
61-
final MetricNameTemplate segmentCopyBytesTotal = new MetricNameTemplate(SEGMENT_COPY_BYTES_TOTAL, METRIC_GROUP, "");
62-
final MetricNameTemplate segmentCopyBytesTotalByTopic =
63-
new MetricNameTemplate(SEGMENT_COPY_BYTES_TOTAL, METRIC_GROUP, "", TOPIC_TAG_NAMES);
64-
final MetricNameTemplate segmentCopyBytesTotalByTopicPartition =
65-
new MetricNameTemplate(SEGMENT_COPY_BYTES_TOTAL, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
6641
static final String SEGMENT_COPY_TIME = SEGMENT_COPY + "-time";
6742
static final String SEGMENT_COPY_TIME_AVG = SEGMENT_COPY_TIME + "-avg";
6843
final MetricNameTemplate segmentCopyTimeAvg = new MetricNameTemplate(SEGMENT_COPY_TIME_AVG, METRIC_GROUP, "");
@@ -76,20 +51,6 @@ public class MetricsRegistry {
7651
new MetricNameTemplate(SEGMENT_COPY_TIME_MAX, METRIC_GROUP, "", TOPIC_TAG_NAMES);
7752
final MetricNameTemplate segmentCopyTimeMaxByTopicPartition =
7853
new MetricNameTemplate(SEGMENT_COPY_TIME_MAX, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
79-
static final String SEGMENT_COPY_ERRORS = SEGMENT_COPY + "-errors";
80-
static final String SEGMENT_COPY_ERRORS_RATE = SEGMENT_COPY_ERRORS + "-rate";
81-
final MetricNameTemplate segmentCopyErrorsRate = new MetricNameTemplate(SEGMENT_COPY_ERRORS_RATE, METRIC_GROUP, "");
82-
final MetricNameTemplate segmentCopyErrorsRateByTopic =
83-
new MetricNameTemplate(SEGMENT_COPY_ERRORS_RATE, METRIC_GROUP, "", TOPIC_TAG_NAMES);
84-
final MetricNameTemplate segmentCopyErrorsRateByTopicPartition =
85-
new MetricNameTemplate(SEGMENT_COPY_ERRORS_RATE, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
86-
static final String SEGMENT_COPY_ERRORS_TOTAL = SEGMENT_COPY_ERRORS + "-total";
87-
final MetricNameTemplate segmentCopyErrorsTotal =
88-
new MetricNameTemplate(SEGMENT_COPY_ERRORS_TOTAL, METRIC_GROUP, "");
89-
final MetricNameTemplate segmentCopyErrorsTotalByTopic =
90-
new MetricNameTemplate(SEGMENT_COPY_ERRORS_TOTAL, METRIC_GROUP, "", TOPIC_TAG_NAMES);
91-
final MetricNameTemplate segmentCopyErrorsTotalByTopicPartition =
92-
new MetricNameTemplate(SEGMENT_COPY_ERRORS_TOTAL, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
9354

9455
// Segment delete metric names
9556
static final String SEGMENT_DELETE = "segment-delete";
@@ -156,18 +117,6 @@ public class MetricsRegistry {
156117

157118
// Segment fetch metric names
158119
static final String SEGMENT_FETCH = "segment-fetch";
159-
static final String SEGMENT_FETCH_RATE = SEGMENT_FETCH + "-rate";
160-
final MetricNameTemplate segmentFetchRequestsRate = new MetricNameTemplate(SEGMENT_FETCH_RATE, METRIC_GROUP, "");
161-
final MetricNameTemplate segmentFetchRequestsRateByTopic =
162-
new MetricNameTemplate(SEGMENT_FETCH_RATE, METRIC_GROUP, "", TOPIC_TAG_NAMES);
163-
final MetricNameTemplate segmentFetchRequestsRateByTopicPartition =
164-
new MetricNameTemplate(SEGMENT_FETCH_RATE, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
165-
static final String SEGMENT_FETCH_TOTAL = SEGMENT_FETCH + "-total";
166-
final MetricNameTemplate segmentFetchRequestsTotal = new MetricNameTemplate(SEGMENT_FETCH_TOTAL, METRIC_GROUP, "");
167-
final MetricNameTemplate segmentFetchRequestsTotalByTopic =
168-
new MetricNameTemplate(SEGMENT_FETCH_TOTAL, METRIC_GROUP, "", TOPIC_TAG_NAMES);
169-
final MetricNameTemplate segmentFetchRequestsTotalByTopicPartition =
170-
new MetricNameTemplate(SEGMENT_FETCH_TOTAL, METRIC_GROUP, "", TOPIC_PARTITION_TAG_NAMES);
171120
static final String SEGMENT_FETCH_REQUESTED_BYTES = SEGMENT_FETCH + "-requested-bytes";
172121
static final String SEGMENT_FETCH_REQUESTED_BYTES_RATE = SEGMENT_FETCH_REQUESTED_BYTES + "-rate";
173122
final MetricNameTemplate segmentFetchRequestedBytesRate =

‎core/src/test/java/io/aiven/kafka/tieredstorage/RemoteStorageManagerMetricsTest.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,6 @@ void metricsShouldBeReported(final String tags) throws RemoteStorageException, J
128128
final ObjectName metricName = ObjectName.getInstance(objectName);
129129

130130
// upload related metrics
131-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-total"))
132-
.isEqualTo(3.0);
133-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-rate"))
134-
.isEqualTo(3.0 / METRIC_TIME_WINDOW_SEC);
135-
136-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-bytes-rate"))
137-
.isEqualTo(30.0 / METRIC_TIME_WINDOW_SEC);
138-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-bytes-total"))
139-
.isEqualTo(30.0);
140-
141131
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-time-avg"))
142132
.isEqualTo(0.0);
143133
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-copy-time-max"))
@@ -195,11 +185,6 @@ void metricsShouldBeReported(final String tags) throws RemoteStorageException, J
195185

196186
rsm.fetchLogSegment(REMOTE_LOG_SEGMENT_METADATA, 0);
197187

198-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-fetch-rate"))
199-
.isEqualTo(2.0 / METRIC_TIME_WINDOW_SEC);
200-
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-fetch-total"))
201-
.isEqualTo(2.0);
202-
203188
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-fetch-requested-bytes-rate"))
204189
.isEqualTo(20.0 / METRIC_TIME_WINDOW_SEC);
205190
assertThat(MBEAN_SERVER.getAttribute(metricName, "segment-fetch-requested-bytes-total"))
@@ -265,33 +250,6 @@ void metricsErrorsShouldBeReported(final String tags) throws JMException {
265250
final ObjectName rsmMetricsName = ObjectName.getInstance(
266251
"aiven.kafka.server.tieredstorage:type=remote-storage-manager-metrics" + tags);
267252

268-
// checking that upload fails with expected exceptions
269-
assertThatThrownBy(() -> rsm.copyLogSegmentData(REMOTE_LOG_SEGMENT_METADATA, logSegmentData))
270-
.isInstanceOf(RemoteStorageException.class)
271-
.hasRootCause(testException);
272-
assertThatThrownBy(() -> rsm.copyLogSegmentData(REMOTE_LOG_SEGMENT_METADATA, logSegmentData))
273-
.isInstanceOf(RemoteStorageException.class)
274-
.hasRootCause(testException);
275-
assertThatThrownBy(() -> rsm.copyLogSegmentData(REMOTE_LOG_SEGMENT_METADATA, logSegmentData))
276-
.isInstanceOf(RemoteStorageException.class)
277-
.hasRootCause(testException);
278-
279-
// verifying uploading failure metrics
280-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-rate"))
281-
.isEqualTo(3.0 / METRIC_TIME_WINDOW_SEC);
282-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-total"))
283-
.isEqualTo(3.0);
284-
285-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-bytes-rate"))
286-
.isEqualTo(1.0);
287-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-bytes-total"))
288-
.isEqualTo(30.0);
289-
290-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-errors-rate"))
291-
.isEqualTo(3.0 / METRIC_TIME_WINDOW_SEC);
292-
assertThat(MBEAN_SERVER.getAttribute(rsmMetricsName, "segment-copy-errors-total"))
293-
.isEqualTo(3.0);
294-
295253
// checking that deletion fails with expected exceptions
296254
assertThatThrownBy(() -> rsm.deleteLogSegmentData(REMOTE_LOG_SEGMENT_METADATA))
297255
.isInstanceOf(RemoteStorageException.class)

0 commit comments

Comments
 (0)