From d205b731bf2facc72373b06a4111cac85a1bbaf0 Mon Sep 17 00:00:00 2001
From: Andrea Marziali <andrea.marziali@datadoghq.com>
Date: Wed, 30 Sep 2026 13:41:51 +0200
Subject: [PATCH] Fix Axis2 resumed message scope close order

---
 .../instrumentation/axis2/AxisEngineInstrumentation.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
index d04e7059aec..7cdc38159e4 100644
--- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
+++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java
@@ -88,12 +88,13 @@ public static ContextScope beginResumingMessage(
       if (continuation instanceof ContextContinuation) {
         message.removeSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY);
         // resuming is a distinct operation, so create a new span under the original request
+        AgentSpan span;
         try (ContextScope parentScope = ((ContextContinuation) continuation).resume()) {
-          AgentSpan span = startSpan("axis2", AXIS2_MESSAGE);
+          span = startSpan("axis2", AXIS2_MESSAGE);
           DECORATE.afterStart(span);
           DECORATE.onMessage(span, message);
-          return activateSpan(span);
         }
+        return activateSpan(span);
       }
       return null;
     }