test

Author: fandreuz

sdk-extensions/autoconfigure/src/main/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilder.java

@@ -577,12 +577,23 @@ private void maybeRegisterShutdownHook(OpenTelemetrySdk openTelemetrySdk) {
     Runtime.getRuntime().addShutdownHook(shutdownHook(openTelemetrySdk));
   }
 
-  @SuppressWarnings("SynchronizationOnLocalVariableOrMethodParameter")
   private <T> T maybeRunWithGlobalOpenTelemetryLock(Supplier<T> supplier) {
     if (setResultAsGlobal) {
       return supplier.get();
     }
 
+    Object mutex = getGlobalOpenTelemetryLock();
+    if (mutex == null) {
+      return supplier.get();
+    }
+    synchronized (mutex) {
+      return supplier.get();
+    }
+  }
+
+  // Visible for testing
+  @Nullable
+  static Object getGlobalOpenTelemetryLock() {
     Object mutex = null;
     try {
       Field mutexField = GlobalOpenTelemetry.class.getDeclaredField("mutex");
@@ -596,13 +607,7 @@ private <T> T maybeRunWithGlobalOpenTelemetryLock(Supplier<T> supplier) {
     } catch (Exception exception) {
       logger.log(Level.WARNING, "Could not acquire Global OpenTelemetry mutex", exception);
     }
-
-    if (mutex == null) {
-      return supplier.get();
-    }
-    synchronized (mutex) {
-      return supplier.get();
-    }
+    return mutex;
   }
 
   private void maybeSetAsGlobal(

sdk-extensions/autoconfigure/src/test/java/io/opentelemetry/sdk/autoconfigure/AutoConfiguredOpenTelemetrySdkBuilderTest.java

@@ -0,0 +1,18 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.sdk.autoconfigure;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class AutoConfiguredOpenTelemetrySdkBuilderTest {
+
+  @Test
+  void getGlobalOpenTelemetryLock_findsLock() {
+    assertThat(AutoConfiguredOpenTelemetrySdkBuilder.getGlobalOpenTelemetryLock()).isNotNull();
+  }
+}