Remove lambdas from OTel code

quarkusio · Aug 8, 2024 · bbd821a · bbd821a
1 parent 53f837b
commit bbd821a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 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;
+        }
+    }
 }