Skip to content

Commit ffd3ad4

Browse files
committed
align naming with opentelemetry semantic conventions
1 parent 208482b commit ffd3ad4

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

prometheus-metrics-instrumentation-jvm/src/main/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetrics.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
public class JvmGarbageCollectorMetrics {
4444

4545
private static final String JVM_GC_COLLECTION_SECONDS = "jvm_gc_collection_seconds";
46-
private static final String JVM_GC_DURATION_SECONDS = "jvm_gc_duration_seconds";
46+
private static final String JVM_GC_DURATION = "jvm_gc_duration";
4747

4848
private final PrometheusProperties config;
4949
private final List<GarbageCollectorMXBean> garbageCollectorBeans;
@@ -81,10 +81,9 @@ private void registerGCDurationHistogram(PrometheusRegistry registry) {
8181

8282
Histogram gcDurationHistogram =
8383
Histogram.builder(config)
84-
.name(JVM_GC_DURATION_SECONDS)
85-
.help("JVM GC pause duration histogram.")
86-
.unit(Unit.SECONDS)
87-
.labelNames("name", "action", "cause")
84+
.name(JVM_GC_DURATION)
85+
.help("Duration of JVM garbage collection actions.")
86+
.labelNames("jvm_gc_action", "jvm_gc_name", "jvm_gc_cause")
8887
.classicUpperBounds(buckets)
8988
.register(registry);
9089

@@ -107,7 +106,7 @@ private void registerGCDurationHistogram(PrometheusRegistry registry) {
107106
(CompositeData) notification.getUserData());
108107

109108
gcDurationHistogram
110-
.labelValues(info.getGcName(), info.getGcAction(), info.getGcCause())
109+
.labelValues(info.getGcAction(), info.getGcName(), info.getGcCause())
111110
.observe(Unit.millisToSeconds(info.getGcInfo().getDuration()));
112111
},
113112
null,

prometheus-metrics-instrumentation-jvm/src/test/java/io/prometheus/metrics/instrumentation/jvm/JvmGarbageCollectorMetricsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void testGoodCase() throws IOException {
5959
public void testIgnoredMetricNotScraped() {
6060
MetricNameFilter filter =
6161
MetricNameFilter.builder()
62-
.nameMustNotBeEqualTo("jvm_gc_collection_seconds", "jvm_gc_duration_seconds")
62+
.nameMustNotBeEqualTo("jvm_gc_collection_seconds", "jvm_gc_duration")
6363
.build();
6464

6565
PrometheusRegistry registry = new PrometheusRegistry();

0 commit comments

Comments
 (0)