Merge pull request #42404 from geoand/otel-polish

Apply minor polish to OpenTelemetry code
quarkusio · Aug 8, 2024 · bd14127 · bd14127
2 parents 1703ccb + cc6c210
commit bd14127
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/...etry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/MDCEnabledContextStorage.java b/...etry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/MDCEnabledContextStorage.java
@@ -21,13 +21,16 @@ public Scope attach(Context toAttach) {
 
         Scope scope = DEFAULT_CONTEXT_STORAGE.attach(toAttach);
 
-        return () -> {
-            if (beforeAttach == null) {
-                OpenTelemetryUtil.clearMDCData(null);
-            } else {
-                OpenTelemetryUtil.setMDCData(beforeAttach, null);
+        return new Scope() {
+            @Override
+            public void close() {
+                if (beforeAttach == null) {
+                    OpenTelemetryUtil.clearMDCData(null);
+                } else {
+                    OpenTelemetryUtil.setMDCData(beforeAttach, null);
+                }
+                scope.close();
             }
-            scope.close();
         };
     }
 

diff --git a/...lemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java b/...lemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/OpenTelemetryRecorder.java
@@ -59,20 +59,20 @@ public OpenTelemetry apply(SyntheticCreationalContext<OpenTelemetry> context) {
                         });
 
                 final Map<String, String> oTelConfigs = getOtelConfigs();
-
+                OtelConfigsSupplier propertiesSupplier = new OtelConfigsSupplier(oTelConfigs);
                 if (oTelRuntimeConfig.sdkDisabled()) {
                     return AutoConfiguredOpenTelemetrySdk.builder()
                             .setResultAsGlobal()
                             .disableShutdownHook()
-                            .addPropertiesSupplier(() -> oTelConfigs)
+                            .addPropertiesSupplier(propertiesSupplier)
                             .build()
                             .getOpenTelemetrySdk();
                 }
 
                 var builder = AutoConfiguredOpenTelemetrySdk.builder()
                         .setResultAsGlobal()
                         .disableShutdownHook()
-                        .addPropertiesSupplier(() -> oTelConfigs)
+                        .addPropertiesSupplier(propertiesSupplier)
                         .setServiceClassLoader(Thread.currentThread().getContextClassLoader());
                 for (var customizer : builderCustomizers) {
                     customizer.customize(builder);
@@ -156,4 +156,17 @@ public String convert(final String value) throws IllegalArgumentException, NullP
             }
         }
     }
+
+    private static class OtelConfigsSupplier implements Supplier<Map<String, String>> {
+        private final Map<String, String> oTelConfigs;
+
+        public OtelConfigsSupplier(Map<String, String> oTelConfigs) {
+            this.oTelConfigs = oTelConfigs;
+        }
+
+        @Override
+        public Map<String, String> get() {
+            return oTelConfigs;
+        }
+    }
 }
diff --git a/.../quarkus/opentelemetry/runtime/propagation/OpenTelemetryMpContextPropagationProvider.java b/.../quarkus/opentelemetry/runtime/propagation/OpenTelemetryMpContextPropagationProvider.java
@@ -16,7 +16,7 @@ public ThreadContextSnapshot currentContext(Map<String, String> props) {
 
         io.opentelemetry.context.Context context = QuarkusContextStorage.INSTANCE.current();
 
-        // Use anonymous classes instad of lambdas for the native image
+        // Use anonymous classes instead of lambdas for the native image
         return new ThreadContextSnapshot() {
 
             @Override
@@ -47,14 +47,14 @@ public void endContext() throws IllegalStateException {
 
     @Override
     public ThreadContextSnapshot clearedContext(Map<String, String> props) {
-        // Use anonymous classes instad of lambdas for the native image
+        // Use anonymous classes instead of lambdas for the native image
         return new ThreadContextSnapshot() {
             @Override
             public ThreadContextController begin() {
                 return new ThreadContextController() {
                     @Override
                     public void endContext() throws IllegalStateException {
-                        // nothring to do
+                        // nothing to do
                     }
                 };
             }