From 3ea9ba5d0ab4f9db4f83196f8fc8d7a8880d81ca Mon Sep 17 00:00:00 2001
From: "Paul Nienaber (xWF)" <nienaber@google.com>
Date: Mon, 16 Jun 2025 21:52:26 +0000
Subject: [PATCH] Patch LazyStorage to pass its ClassLoader to ServiceLoader

---
 .../src/main/java/io/opentelemetry/context/LazyStorage.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/context/src/main/java/io/opentelemetry/context/LazyStorage.java b/context/src/main/java/io/opentelemetry/context/LazyStorage.java
index 1727ee06fed..5cce59d253b 100644
--- 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()