open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
This commit is contained in:
Gregor Zeitlinger 2023-06-14 02:36:33 +02:00 committed by GitHub
parent 4f12fba9c3
commit 84337357df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/Bridging.java
View File

@ -47,7 +47,7 @@ final class Bridging {
static String baseUnit(Meter.Id id) { static String baseUnit(Meter.Id id) {
String baseUnit = id.getBaseUnit(); String baseUnit = id.getBaseUnit();
return baseUnit == null ? "1" : baseUnit; return baseUnit == null ? "" : baseUnit;
} }
static String statisticInstrumentName( static String statisticInstrumentName(

2
instrumentation/micrometer/micrometer-1.5/library/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/OpenTelemetryFunctionTimer.java
View File

@ -44,7 +44,7 @@ final class OpenTelemetryFunctionTimer<T> extends AbstractMeter
otelMeter otelMeter
.counterBuilder(name + ".count") .counterBuilder(name + ".count")
.setDescription(Bridging.description(id)) .setDescription(Bridging.description(id))
.setUnit("1") .setUnit("{invocation}")
.buildWithCallback(new LongMeasurementRecorder<>(obj, countFunction, attributes)); .buildWithCallback(new LongMeasurementRecorder<>(obj, countFunction, attributes));
this.observableTotalTime = this.observableTotalTime =

2
instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerMillisecondsTest.java
View File

@ -56,7 +56,7 @@ public abstract class AbstractFunctionTimerMillisecondsTest {
metric -> metric ->
assertThat(metric) assertThat(metric)
.hasDescription("This is a test function timer") .hasDescription("This is a test function timer")
.hasUnit("1") .hasUnit("{invocation}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isMonotonic() sum.isMonotonic()

2
instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractFunctionTimerTest.java
View File

@ -59,7 +59,7 @@ public abstract class AbstractFunctionTimerTest {
metric -> metric ->
assertThat(metric) assertThat(metric)
.hasDescription("This is a test function timer") .hasDescription("This is a test function timer")
.hasUnit("1") .hasUnit("{invocation}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isMonotonic() sum.isMonotonic()

2
instrumentation/micrometer/micrometer-1.5/testing/src/main/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java
View File

@ -140,7 +140,7 @@ public abstract class AbstractPrometheusModeTest {
metric -> metric ->
assertThat(metric) assertThat(metric)
.hasDescription("This is a test function timer") .hasDescription("This is a test function timer")
.hasUnit("1") .hasUnit("{invocation}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isMonotonic() sum.isMonotonic()

6
instrumentation/runtime-metrics/runtime-metrics-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Classes.java
View File

@ -48,7 +48,7 @@ public final class Classes {
meter meter
.counterBuilder("process.runtime.jvm.classes.loaded") .counterBuilder("process.runtime.jvm.classes.loaded")
.setDescription("Number of classes loaded since JVM start") .setDescription("Number of classes loaded since JVM start")
.setUnit("1") .setUnit("{class}")
.buildWithCallback( .buildWithCallback(
observableMeasurement -> observableMeasurement ->
observableMeasurement.record(classBean.getTotalLoadedClassCount()))); observableMeasurement.record(classBean.getTotalLoadedClassCount())));
@ -57,7 +57,7 @@ public final class Classes {
meter meter
.counterBuilder("process.runtime.jvm.classes.unloaded") .counterBuilder("process.runtime.jvm.classes.unloaded")
.setDescription("Number of classes unloaded since JVM start") .setDescription("Number of classes unloaded since JVM start")
.setUnit("1") .setUnit("{class}")
.buildWithCallback( .buildWithCallback(
observableMeasurement -> observableMeasurement ->
observableMeasurement.record(classBean.getUnloadedClassCount()))); observableMeasurement.record(classBean.getUnloadedClassCount())));
@ -65,7 +65,7 @@ public final class Classes {
meter meter
.upDownCounterBuilder("process.runtime.jvm.classes.current_loaded") .upDownCounterBuilder("process.runtime.jvm.classes.current_loaded")
.setDescription("Number of classes currently loaded") .setDescription("Number of classes currently loaded")
.setUnit("1") .setUnit("{class}")
.buildWithCallback( .buildWithCallback(
observableMeasurement -> observableMeasurement ->
observableMeasurement.record(classBean.getLoadedClassCount()))); observableMeasurement.record(classBean.getLoadedClassCount())));

2
instrumentation/runtime-metrics/runtime-metrics-java8/library/src/main/java/io/opentelemetry/instrumentation/runtimemetrics/java8/Threads.java
View File

@ -51,7 +51,7 @@ public final class Threads {
meter meter
.upDownCounterBuilder("process.runtime.jvm.threads.count") .upDownCounterBuilder("process.runtime.jvm.threads.count")
.setDescription("Number of executing threads") .setDescription("Number of executing threads")
.setUnit("1") .setUnit("{thread}")
.buildWithCallback( .buildWithCallback(
observableMeasurement -> { observableMeasurement -> {
observableMeasurement.record( observableMeasurement.record(

6
instrumentation/runtime-metrics/runtime-metrics-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ClassesTest.java
View File

@ -44,7 +44,7 @@ class ClassesTest {
assertThat(metricData) assertThat(metricData)
.hasInstrumentationScope(EXPECTED_SCOPE) .hasInstrumentationScope(EXPECTED_SCOPE)
.hasDescription("Number of classes loaded since JVM start") .hasDescription("Number of classes loaded since JVM start")
.hasUnit("1") .hasUnit("{class}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isMonotonic() sum.isMonotonic()
@ -60,7 +60,7 @@ class ClassesTest {
assertThat(metricData) assertThat(metricData)
.hasInstrumentationScope(EXPECTED_SCOPE) .hasInstrumentationScope(EXPECTED_SCOPE)
.hasDescription("Number of classes unloaded since JVM start") .hasDescription("Number of classes unloaded since JVM start")
.hasUnit("1") .hasUnit("{class}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isMonotonic() sum.isMonotonic()
@ -76,7 +76,7 @@ class ClassesTest {
assertThat(metricData) assertThat(metricData)
.hasInstrumentationScope(EXPECTED_SCOPE) .hasInstrumentationScope(EXPECTED_SCOPE)
.hasDescription("Number of classes currently loaded") .hasDescription("Number of classes currently loaded")
.hasUnit("1") .hasUnit("{class}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isNotMonotonic() sum.isNotMonotonic()

2
instrumentation/runtime-metrics/runtime-metrics-java8/library/src/test/java/io/opentelemetry/instrumentation/runtimemetrics/java8/ThreadsTest.java
View File

@ -44,7 +44,7 @@ class ThreadsTest {
assertThat(metricData) assertThat(metricData)
.hasInstrumentationScope(EXPECTED_SCOPE) .hasInstrumentationScope(EXPECTED_SCOPE)
.hasDescription("Number of executing threads") .hasDescription("Number of executing threads")
.hasUnit("1") .hasUnit("{thread}")
.hasLongSumSatisfying( .hasLongSumSatisfying(
sum -> sum ->
sum.isNotMonotonic() sum.isNotMonotonic()