(micrometer) don't add . to empty unit with prometheus naming convent…

…ions (#8872)
open-telemetry · Jul 11, 2023 · b3932c7 · b3932c7
1 parent acbab58
commit b3932c7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...java/io/opentelemetry/instrumentation/micrometer/v1_5/PrometheusModeNamingConvention.java b/...java/io/opentelemetry/instrumentation/micrometer/v1_5/PrometheusModeNamingConvention.java
@@ -20,7 +20,7 @@ public String name(String name, Meter.Type type, @Nullable String baseUnit) {
     if (type == Meter.Type.COUNTER
         || type == Meter.Type.DISTRIBUTION_SUMMARY
         || type == Meter.Type.GAUGE) {
-      if (baseUnit != null && !name.endsWith("." + baseUnit)) {
+      if (baseUnit != null && !baseUnit.equals("") && !name.endsWith("." + baseUnit)) {
         name = name + "." + baseUnit;
       }
     }

diff --git a/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java b/...ain/java/io/opentelemetry/instrumentation/micrometer/v1_5/AbstractPrometheusModeTest.java
@@ -34,7 +34,7 @@ void testCounter() {
         Counter.builder("testPrometheusCounter")
             .description("This is a test counter")
             .tags("tag", "value")
-            .baseUnit("items")
+            .baseUnit("")
             .register(Metrics.globalRegistry);
 
     // when
@@ -44,13 +44,13 @@ void testCounter() {
     testing()
         .waitAndAssertMetrics(
             INSTRUMENTATION_NAME,
-            "testPrometheusCounter.items",
+            "testPrometheusCounter",
             metrics ->
                 metrics.anySatisfy(
                     metric ->
                         assertThat(metric)
                             .hasDescription("This is a test counter")
-                            .hasUnit("items")
+                            .hasUnit("")
                             .hasDoubleSumSatisfying(
                                 sum ->
                                     sum.isMonotonic()