code review comments

open-telemetry · Mar 22, 2022 · c547325 · c547325
1 parent 3da2b69
commit c547325
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/...eter1-shim/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryMeterRegistry.java b/...eter1-shim/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryMeterRegistry.java
@@ -55,14 +55,12 @@ public static OpenTelemetryMeterRegistryBuilder builder(OpenTelemetry openTeleme
   OpenTelemetryMeterRegistry(
       Clock clock,
       TimeUnit baseTimeUnit,
-      boolean prometheusMode,
+      NamingConvention namingConvention,
       io.opentelemetry.api.metrics.Meter otelMeter) {
     super(clock);
     this.baseTimeUnit = baseTimeUnit;
     this.otelMeter = otelMeter;
 
-    NamingConvention namingConvention =
-        prometheusMode ? PrometheusModeNamingConvention.INSTANCE : NamingConvention.identity;
     this.config()
         .namingConvention(namingConvention)
         .onMeterRemoved(OpenTelemetryMeterRegistry::onMeterRemoved);

diff --git a/...him/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryMeterRegistryBuilder.java b/...him/src/main/java/io/opentelemetry/micrometer1shim/OpenTelemetryMeterRegistryBuilder.java
@@ -7,6 +7,7 @@
 
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.config.NamingConvention;
 import io.opentelemetry.api.OpenTelemetry;
 import java.util.concurrent.TimeUnit;
 
@@ -54,11 +55,15 @@ public OpenTelemetryMeterRegistryBuilder setPrometheusMode(boolean prometheusMod
    * OpenTelemetryMeterRegistryBuilder}.
    */
   public MeterRegistry build() {
+    // prometheus mode overrides any unit settings with SECONDS
+    TimeUnit baseTimeUnit = prometheusMode ? TimeUnit.SECONDS : this.baseTimeUnit;
+    NamingConvention namingConvention =
+        prometheusMode ? PrometheusModeNamingConvention.INSTANCE : NamingConvention.identity;
+
     return new OpenTelemetryMeterRegistry(
         clock,
-        // prometheus mode overrides any unit settings with SECONDS
-        prometheusMode ? TimeUnit.SECONDS : baseTimeUnit,
-        prometheusMode,
+        baseTimeUnit,
+        namingConvention,
         openTelemetry.getMeterProvider().get(INSTRUMENTATION_NAME));
   }
 }