Skip to content

Commit 8433735

Browse files
zeitlingerMateusz Rzeszutektrask
authored
replace "1" with the appropriate units (open-telemetry#8668)
Co-authored-by: Mateusz Rzeszutek <[email protected]> Co-authored-by: Trask Stalnaker <[email protected]>
1 parent 4f12fba commit 8433735

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

‎instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static String description(Meter.Id id) {
4747

4848
static String baseUnit(Meter.Id id) {
4949
String baseUnit = id.getBaseUnit();
50-
return baseUnit == null ? "1" : baseUnit;
50+
return baseUnit == null ? "" : baseUnit;
5151
}
5252

5353
static String statisticInstrumentName(

‎instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryFunctionTimer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ final class OpenTelemetryFunctionTimer<T> extends AbstractMeter
4444
otelMeter
4545
.counterBuilder(name + ".count")
4646
.setDescription(Bridging.description(id))
47-
.setUnit("1")
47+
.setUnit("{invocation}")
4848
.buildWithCallback(new LongMeasurementRecorder<>(obj, countFunction, attributes));
4949

5050
this.observableTotalTime =

‎instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerMillisecondsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void testFunctionTimerWithBaseUnitMilliseconds() {
5656
metric ->
5757
assertThat(metric)
5858
.hasDescription("This is a test function timer")
59-
.hasUnit("1")
59+
.hasUnit("{invocation}")
6060
.hasLongSumSatisfying(
6161
sum ->
6262
sum.isMonotonic()

‎instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void testFunctionTimer() {
5959
metric ->
6060
assertThat(metric)
6161
.hasDescription("This is a test function timer")
62-
.hasUnit("1")
62+
.hasUnit("{invocation}")
6363
.hasLongSumSatisfying(
6464
sum ->
6565
sum.isMonotonic()

‎instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void testFunctionTimer() {
140140
metric ->
141141
assertThat(metric)
142142
.hasDescription("This is a test function timer")
143-
.hasUnit("1")
143+
.hasUnit("{invocation}")
144144
.hasLongSumSatisfying(
145145
sum ->
146146
sum.isMonotonic()

‎instrumentation/runtime-metrics/runtime-metrics-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Classes.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ClassLoadingM
4848
meter
4949
.counterBuilder("process.runtime.jvm.classes.loaded")
5050
.setDescription("Number of classes loaded since JVM start")
51-
.setUnit("1")
51+
.setUnit("{class}")
5252
.buildWithCallback(
5353
observableMeasurement ->
5454
observableMeasurement.record(classBean.getTotalLoadedClassCount())));
@@ -57,15 +57,15 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ClassLoadingM
5757
meter
5858
.counterBuilder("process.runtime.jvm.classes.unloaded")
5959
.setDescription("Number of classes unloaded since JVM start")
60-
.setUnit("1")
60+
.setUnit("{class}")
6161
.buildWithCallback(
6262
observableMeasurement ->
6363
observableMeasurement.record(classBean.getUnloadedClassCount())));
6464
observables.add(
6565
meter
6666
.upDownCounterBuilder("process.runtime.jvm.classes.current_loaded")
6767
.setDescription("Number of classes currently loaded")
68-
.setUnit("1")
68+
.setUnit("{class}")
6969
.buildWithCallback(
7070
observableMeasurement ->
7171
observableMeasurement.record(classBean.getLoadedClassCount())));

‎instrumentation/runtime-metrics/runtime-metrics-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Threads.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ List<AutoCloseable> registerObservers(OpenTelemetry openTelemetry, ThreadMXBean
5151
meter
5252
.upDownCounterBuilder("process.runtime.jvm.threads.count")
5353
.setDescription("Number of executing threads")
54-
.setUnit("1")
54+
.setUnit("{thread}")
5555
.buildWithCallback(
5656
observableMeasurement -> {
5757
observableMeasurement.record(

‎instrumentation/runtime-metrics/runtime-metrics-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ClassesTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void registerObservers() {
4444
assertThat(metricData)
4545
.hasInstrumentationScope(EXPECTED_SCOPE)
4646
.hasDescription("Number of classes loaded since JVM start")
47-
.hasUnit("1")
47+
.hasUnit("{class}")
4848
.hasLongSumSatisfying(
4949
sum ->
5050
sum.isMonotonic()
@@ -60,7 +60,7 @@ void registerObservers() {
6060
assertThat(metricData)
6161
.hasInstrumentationScope(EXPECTED_SCOPE)
6262
.hasDescription("Number of classes unloaded since JVM start")
63-
.hasUnit("1")
63+
.hasUnit("{class}")
6464
.hasLongSumSatisfying(
6565
sum ->
6666
sum.isMonotonic()
@@ -76,7 +76,7 @@ void registerObservers() {
7676
assertThat(metricData)
7777
.hasInstrumentationScope(EXPECTED_SCOPE)
7878
.hasDescription("Number of classes currently loaded")
79-
.hasUnit("1")
79+
.hasUnit("{class}")
8080
.hasLongSumSatisfying(
8181
sum ->
8282
sum.isNotMonotonic()

‎instrumentation/runtime-metrics/runtime-metrics-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ThreadsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void registerObservers() {
4444
assertThat(metricData)
4545
.hasInstrumentationScope(EXPECTED_SCOPE)
4646
.hasDescription("Number of executing threads")
47-
.hasUnit("1")
47+
.hasUnit("{thread}")
4848
.hasLongSumSatisfying(
4949
sum ->
5050
sum.isNotMonotonic()

0 commit comments

Comments
 (0)