refactor: OpenTelemetry instance as Supplier (#5674)

Author: paullatzelsperger

core/common/boot/src/main/java/org/eclipse/edc/boot/system/ExtensionLoader.java

@@ -31,6 +31,7 @@
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -50,11 +51,11 @@ public ExtensionLoader(ServiceLocator serviceLocator) {
         return new Telemetry(selectOpenTelemetryImpl(openTelemetries));
     }
 
-    static @NotNull OpenTelemetry selectOpenTelemetryImpl(List<OpenTelemetry> openTelemetries) {
+    static @NotNull Supplier<OpenTelemetry> selectOpenTelemetryImpl(List<OpenTelemetry> openTelemetries) {
         if (openTelemetries.size() > 1) {
             throw new IllegalStateException(String.format("Found %s OpenTelemetry implementations. Please provide only one OpenTelemetry service provider.", openTelemetries.size()));
         }
-        return openTelemetries.isEmpty() ? GlobalOpenTelemetry.get() : openTelemetries.get(0);
+        return openTelemetries.isEmpty() ? GlobalOpenTelemetry::get : () -> openTelemetries.get(0);
     }
 
     /**

core/common/boot/src/test/java/org/eclipse/edc/boot/system/ExtensionLoaderTest.java

@@ -125,7 +125,7 @@ void shouldLoadMonitor_consoleMonitorDefaultLogLevelWhenWrongArgs(String program
     void selectOpenTelemetryImpl_whenNoOpenTelemetry() {
         var openTelemetry = ExtensionLoader.selectOpenTelemetryImpl(emptyList());
 
-        assertThat(openTelemetry).isEqualTo(GlobalOpenTelemetry.get());
+        assertThat(openTelemetry.get()).isEqualTo(GlobalOpenTelemetry.get());
     }
 
     @Test
@@ -134,7 +134,7 @@ void selectOpenTelemetryImpl_whenSingleOpenTelemetry() {
 
         var openTelemetry = ExtensionLoader.selectOpenTelemetryImpl(List.of(customOpenTelemetry));
 
-        assertThat(openTelemetry).isSameAs(customOpenTelemetry);
+        assertThat(openTelemetry.get()).isSameAs(customOpenTelemetry);
     }
 
     @Test

spi/common/boot-spi/src/main/java/org/eclipse/edc/spi/telemetry/Telemetry.java

@@ -30,13 +30,13 @@
  */
 public class Telemetry {
 
-    private final OpenTelemetry openTelemetry;
+    private final Supplier<OpenTelemetry> openTelemetry;
 
     public Telemetry() {
-        this.openTelemetry = OpenTelemetry.noop();
+        this.openTelemetry = OpenTelemetry::noop;
     }
 
-    public Telemetry(OpenTelemetry openTelemetry) {
+    public Telemetry(Supplier<OpenTelemetry> openTelemetry) {
         this.openTelemetry = openTelemetry;
     }
 
@@ -47,7 +47,7 @@ public Telemetry(OpenTelemetry openTelemetry) {
      */
     public Map<String, String> getCurrentTraceContext() {
         Map<String, String> traceContext = new HashMap<>();
-        openTelemetry.getPropagators().getTextMapPropagator()
+        openTelemetry.get().getPropagators().getTextMapPropagator()
                 .inject(Context.current(), traceContext, Map::put);
         return traceContext;
     }
@@ -105,7 +105,7 @@ public <T> Supplier<T> contextPropagationMiddleware(Supplier<T> delegate, TraceC
     }
 
     private Scope propagateTraceContext(TraceCarrier carrier) {
-        Context extractedContext = openTelemetry.getPropagators().getTextMapPropagator()
+        Context extractedContext = openTelemetry.get().getPropagators().getTextMapPropagator()
                 .extract(Context.current(), carrier, new TraceCarrierTextMapGetter());
         return extractedContext.makeCurrent();
     }