From 23f83c88f8badee218b761511bd929288b782d8f Mon Sep 17 00:00:00 2001
From: Andrea Marziali <andrea.marziali@datadoghq.com>
Date: Wed, 30 Sep 2026 12:40:45 +0200
Subject: [PATCH] Fix Spring Rabbit listener scope close order

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

diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
index debe2785adc..8b110e2953b 100644
--- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
+++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java
@@ -68,13 +68,14 @@ public static ContextScope activate(@Advice.Argument(1) Object data) {
         if (null != state) {
           ContextContinuation continuation = state.getAndResetContinuation();
           if (null != continuation) {
+            AgentSpan span;
             try (ContextScope scope = continuation.resume()) {
-              AgentSpan span = startSpan("rabbitmq-amqp", AMQP_CONSUME);
+              span = startSpan("rabbitmq-amqp", AMQP_CONSUME);
               span.setMeasured(true);
               DECORATE.afterStart(span);
               DECORATE.onConsume(span, message.getMessageProperties().getConsumerQueue());
-              return activateSpan(span);
             }
+            return activateSpan(span);
           }
         }
       }