HDDS-9438. Improve ProtocolMessageMetrics #9600
Merged
+70
−90
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
szetszwo
reviewed
Jan 7, 2026
Comment on lines
103
to
112
| MetricsRecordBuilder builder = | ||
| collector.addRecord(name); | ||
| builder.add( | ||
| new MetricsTag(Interns.info("type", "Message type"), key.toString())); | ||
| builder.addCounter(new MetricName("counter", "Number of distinct calls"), | ||
| value.longValue()); | ||
| new MetricsTag(TYPE_TAG_INFO, key.toString())); | ||
| builder.addCounter(COUNTER_INFO, | ||
| stat.counter()); | ||
| builder.addCounter( | ||
| new MetricName("time", "Sum of the duration of the calls"), | ||
| elapsedTimes.get(key).longValue()); | ||
| TIME_INFO, | ||
| stat.time()); | ||
| builder.endRecord(); |
Contributor
There was a problem hiding this comment.
Let's combine the short lines:
collector.addRecord(name)
.add(new MetricsTag(TYPE_TAG_INFO, key.toString()))
.addCounter(COUNTER_INFO, stat.counter())
.addCounter(TIME_INFO, stat.time())
.endRecord();
Comment on lines
115
to
116
| MetricsRecordBuilder builder = collector.addRecord(name); | ||
| builder.addCounter(new MetricName("concurrency", | ||
| "Number of requests processed concurrently"), concurrency.get()); | ||
| builder.addCounter(CONCURRENCY_INFO, concurrency.get()); |
Contributor
There was a problem hiding this comment.
Similarly,
collector.addRecord(name)
.addCounter(CONCURRENCY_INFO, concurrency.get());BTW, do we need .endRecord();?
| * Metrics to count all the subtypes of a specific message. | ||
| */ | ||
| public class ProtocolMessageMetrics<KEY> implements MetricsSource { | ||
| public class ProtocolMessageMetrics<KEY extends Enum<KEY>> implements MetricsSource { |
Contributor
There was a problem hiding this comment.
👍 the generic type should extend Enum.
Comment on lines
48
to
59
| private static final MetricsInfo TYPE_TAG_INFO = | ||
| Interns.info("type", "Message type"); | ||
|
|
||
| private static final MetricsInfo COUNTER_INFO = | ||
| Interns.info("counter", "Number of distinct calls"); | ||
|
|
||
| private static final MetricsInfo TIME_INFO = | ||
| Interns.info("time", "Sum of the duration of the calls"); | ||
|
|
||
| private static final MetricsInfo CONCURRENCY_INFO = | ||
| Interns.info("concurrency", | ||
| "Number of requests processed concurrently"); |
Contributor
There was a problem hiding this comment.
The line width is 120 characters. Let's avoid the short lines.
private static final MetricsInfo TYPE_TAG_INFO = Interns.info("type", "Message type");
private static final MetricsInfo COUNTER_INFO = Interns.info("counter", "Number of distinct calls");
private static final MetricsInfo TIME_INFO = Interns.info("time", "Sum of the duration of the calls");
private static final MetricsInfo CONCURRENCY_INFO = Interns.info("concurrency",
"Number of requests processed concurrently");
Comment on lines
61
to
76
| public static <KEY extends Enum<KEY>> ProtocolMessageMetrics<KEY> create(String name, | ||
| String description, KEY[] types) { | ||
| return new ProtocolMessageMetrics<KEY>(name, description, types); | ||
| return new ProtocolMessageMetrics<>(name, description, types); | ||
| } | ||
|
|
||
| public ProtocolMessageMetrics(String name, String description, | ||
| KEY[] values) { | ||
| this.name = name; | ||
| this.description = description; | ||
| final Class<KEY> enumClass = values[0].getDeclaringClass(); | ||
| final EnumMap<KEY, Stats> map = new EnumMap<>(enumClass); | ||
| for (KEY value : values) { | ||
| counters.put(value, new AtomicLong(0)); | ||
| elapsedTimes.put(value, new AtomicLong(0)); | ||
| map.put(value, new Stats()); | ||
| } | ||
| this.stats = Collections.unmodifiableMap(map); | ||
| } |
Contributor
There was a problem hiding this comment.
- Pass the class instead of values.
- Change the constructor to private.
public static <KEY extends Enum<KEY>> ProtocolMessageMetrics<KEY> create(String name,
String description, Class<KEY> enumClass) {
return new ProtocolMessageMetrics<>(name, description, enumClass);
}
private ProtocolMessageMetrics(String name, String description, Class<KEY> enumClass) {
this.name = name;
this.description = description;
final EnumMap<KEY, Stats> map = new EnumMap<>(enumClass);
for (KEY value : enumClass.getEnumConstants()) {
map.put(value, new Stats());
}
this.stats = Collections.unmodifiableMap(map);
}
szetszwo
approved these changes
Jan 8, 2026
Contributor
szetszwo
left a comment
szetszwo
left a comment
There was a problem hiding this comment.
+1 the change looks good.
Contributor
Author
|
Thanks @szetszwo for the reviews. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request?
ProtocolMessageMetricsto use a single unmodifiableEnumMapfor per-message metrics.MetricsInfo) and removed dynamic creation of metric definitions.KEY extends Enum<KEY>) required by the new implementation.What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-9438
How was this patch tested?
All CI checks passed.
https://github.com/Russole/ozone/actions/runs/20752706566