Merge 443f631 into 6df3ba5

Author: adinauer

sentry-opentelemetry/sentry-opentelemetry-bootstrap/src/main/java/io/sentry/opentelemetry/SentryContextStorageProvider.java

@@ -1,11 +1,34 @@
 package io.sentry.opentelemetry;
 
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Iterator;
+import java.util.ServiceLoader;
+
 import io.opentelemetry.context.ContextStorage;
 import io.opentelemetry.context.ContextStorageProvider;
 
 public final class SentryContextStorageProvider implements ContextStorageProvider {
   @Override
   public ContextStorage get() {
-    return new SentryContextStorage(new SentryOtelThreadLocalStorage());
+    return new SentryContextStorage(findStorageToWrap());
+  }
+
+  private @NotNull ContextStorage findStorageToWrap() {
+    try {
+      ServiceLoader<ContextStorageProvider> serviceLoader = ServiceLoader.load(ContextStorageProvider.class);
+      Iterator<ContextStorageProvider> iterator = serviceLoader.iterator();
+      while (iterator.hasNext()) {
+        ContextStorageProvider contextStorageProvider = iterator.next();
+        if (!(contextStorageProvider instanceof SentryContextStorageProvider)) {
+          return contextStorageProvider.get();
+        }
+      }
+    } catch (Throwable t) {
+      // ignore and use fallback
+    }
+
+    // using default / fallback storage
+    return new SentryOtelThreadLocalStorage();
   }
 }