fixes #7427: Patch LazyStorage to pass its ClassLoader to ServiceLoader (#7424)

indigophox · web-flow · commit 9329f8675e0f · 2025-06-24T14:43:46.000-05:00
diff --git a/context/src/main/java/io/opentelemetry/context/LazyStorage.java b/context/src/main/java/io/opentelemetry/context/LazyStorage.java
@@ -104,7 +104,8 @@ static ContextStorage createStorage(AtomicReference<Throwable> deferredStorageFa
     }
 
     List<ContextStorageProvider> providers = new ArrayList<>();
-    for (ContextStorageProvider provider : ServiceLoader.load(ContextStorageProvider.class)) {
+    for (ContextStorageProvider provider :
+        ServiceLoader.load(ContextStorageProvider.class, LazyStorage.class.getClassLoader())) {
       if (provider
           .getClass()
           .getName()

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ static ContextStorage createStorage(AtomicReference<Throwable> deferredStorageFa`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`List<ContextStorageProvider> providers = new ArrayList<>();`
`107`		`- for (ContextStorageProvider provider : ServiceLoader.load(ContextStorageProvider.class)) {`
	`107`	`+ for (ContextStorageProvider provider :`
	`108`	`+ ServiceLoader.load(ContextStorageProvider.class, LazyStorage.class.getClassLoader())) {`
`108`	`109`	`if (provider`
`109`	`110`	`.getClass()`
`110`	`111`	`.getName()`