replace "1" with the appropriate units (#8668)

Co-authored-by: Mateusz Rzeszutek <[email protected]> Co-authored-by: Trask Stalnaker <[email protected]>
open-telemetry · Jun 14, 2023 · 8433735 · 8433735
1 parent 4f12fba
commit 8433735
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/...-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java b/...-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java
@@ -47,7 +47,7 @@ static String description(Meter.Id id) {
 
   static String baseUnit(Meter.Id id) {
     String baseUnit = id.getBaseUnit();
-    return baseUnit == null ? "1" : baseUnit;
+    return baseUnit == null ? "" : baseUnit;
   }
 
   static String statisticInstrumentName(

diff --git a/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryFunctionTimer.java b/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryFunctionTimer.java
@@ -44,7 +44,7 @@ final class OpenTelemetryFunctionTimer<T> extends AbstractMeter
         otelMeter
             .counterBuilder(name + ".count")
             .setDescription(Bridging.description(id))
-            .setUnit("1")
+            .setUnit("{invocation}")
             .buildWithCallback(new LongMeasurementRecorder<>(obj, countFunction, attributes));
 
     this.observableTotalTime =

diff --git a/.../opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerMillisecondsTest.java b/.../opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerMillisecondsTest.java
@@ -56,7 +56,7 @@ void testFunctionTimerWithBaseUnitMilliseconds() {
                     metric ->
                         assertThat(metric)
                             .hasDescription("This is a test function timer")
-                            .hasUnit("1")
+                            .hasUnit("{invocation}")
                             .hasLongSumSatisfying(
                                 sum ->
                                     sum.isMonotonic()

diff --git a/...main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerTest.java b/...main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerTest.java
@@ -59,7 +59,7 @@ void testFunctionTimer() {
                     metric ->
                         assertThat(metric)
                             .hasDescription("This is a test function timer")
-                            .hasUnit("1")
+                            .hasUnit("{invocation}")
                             .hasLongSumSatisfying(
                                 sum ->
                                     sum.isMonotonic()

diff --git a/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java b/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java
@@ -140,7 +140,7 @@ void testFunctionTimer() {
                     metric ->
                         assertThat(metric)
                             .hasDescription("This is a test function timer")
-                            .hasUnit("1")
+                            .hasUnit("{invocation}")
                             .hasLongSumSatisfying(
                                 sum ->
                                     sum.isMonotonic()

diff --git a/.../library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Classes.java b/.../library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Classes.java
@@ -48,7 +48,7 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ClassLoadingM
         meter
             .counterBuilder("process.runtime.jvm.classes.loaded")
             .setDescription("Number of classes loaded since JVM start")
-            .setUnit("1")
+            .setUnit("{class}")
             .buildWithCallback(
                 observableMeasurement ->
                     observableMeasurement.record(classBean.getTotalLoadedClassCount())));
@@ -57,15 +57,15 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ClassLoadingM
         meter
             .counterBuilder("process.runtime.jvm.classes.unloaded")
             .setDescription("Number of classes unloaded since JVM start")
-            .setUnit("1")
+            .setUnit("{class}")
             .buildWithCallback(
                 observableMeasurement ->
                     observableMeasurement.record(classBean.getUnloadedClassCount())));
     observables.add(
         meter
             .upDownCounterBuilder("process.runtime.jvm.classes.current_loaded")
             .setDescription("Number of classes currently loaded")
-            .setUnit("1")
+            .setUnit("{class}")
             .buildWithCallback(
                 observableMeasurement ->
                     observableMeasurement.record(classBean.getLoadedClassCount())));

diff --git a/.../library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Threads.java b/.../library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Threads.java
@@ -51,7 +51,7 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ThreadMXBean
         meter
             .upDownCounterBuilder("process.runtime.jvm.threads.count")
             .setDescription("Number of executing threads")
-            .setUnit("1")
+            .setUnit("{thread}")
             .buildWithCallback(
                 observableMeasurement -> {
                   observableMeasurement.record(

diff --git a/...rary/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ClassesTest.java b/...rary/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ClassesTest.java
@@ -44,7 +44,7 @@ void registerObservers() {
                     assertThat(metricData)
                         .hasInstrumentationScope(EXPECTED_SCOPE)
                         .hasDescription("Number of classes loaded since JVM start")
-                        .hasUnit("1")
+                        .hasUnit("{class}")
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -60,7 +60,7 @@ void registerObservers() {
                     assertThat(metricData)
                         .hasInstrumentationScope(EXPECTED_SCOPE)
                         .hasDescription("Number of classes unloaded since JVM start")
-                        .hasUnit("1")
+                        .hasUnit("{class}")
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isMonotonic()
@@ -76,7 +76,7 @@ void registerObservers() {
                     assertThat(metricData)
                         .hasInstrumentationScope(EXPECTED_SCOPE)
                         .hasDescription("Number of classes currently loaded")
-                        .hasUnit("1")
+                        .hasUnit("{class}")
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()

diff --git a/...rary/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ThreadsTest.java b/...rary/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ThreadsTest.java
@@ -44,7 +44,7 @@ void registerObservers() {
                     assertThat(metricData)
                         .hasInstrumentationScope(EXPECTED_SCOPE)
                         .hasDescription("Number of executing threads")
-                        .hasUnit("1")
+                        .hasUnit("{thread}")
                         .hasLongSumSatisfying(
                             sum ->
                                 sum.isNotMonotonic()