From faed5924e8de09433b8c20042bda8bc765a719f7 Mon Sep 17 00:00:00 2001
From: Lauri Tulmin <ltulmin@splunk.com>
Date: Thu, 27 Nov 2025 11:32:35 +0200
Subject: [PATCH] Add explicit context propagation for servlet async runnables

---
 .../instrumentation/servlet/AsyncRunnableWrapper.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AsyncRunnableWrapper.java b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AsyncRunnableWrapper.java
index 31aafe5a6214..1a6c93b4dafb 100644
--- a/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AsyncRunnableWrapper.java
+++ b/instrumentation/servlet/servlet-common/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/servlet/AsyncRunnableWrapper.java
@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.servlet;
 
 import io.opentelemetry.context.Context;
+import io.opentelemetry.context.Scope;
 
 public class AsyncRunnableWrapper<REQUEST> implements Runnable {
   private final ServletHelper<REQUEST, ?> helper;
@@ -27,7 +28,7 @@ public static <REQUEST> Runnable wrap(ServletHelper<REQUEST, ?> helper, Runnable
 
   @Override
   public void run() {
-    try {
+    try (Scope ignored = context.makeCurrent()) {
       runnable.run();
     } catch (Throwable throwable) {
       helper.recordAsyncException(context, throwable);