From a3a1febb38b2867b257c77bd96fa41c8983fcfcf Mon Sep 17 00:00:00 2001
From: Stuart McCulloch <stuart.mcculloch@datadoghq.com>
Date: Fri, 9 May 2025 11:43:22 +0100
Subject: [PATCH] Notify listeners when the scope top changes after switching
 scope stacks

---
 .../trace/core/scopemanager/ContinuableScopeManager.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
index 82208e13e41..5f75a9bd644 100644
--- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
+++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java
@@ -384,7 +384,13 @@ private class ContinuableScopeState implements ScopeState {
 
     @Override
     public void activate() {
+      ContinuableScope oldScope = tlsScopeStack.get().top;
       tlsScopeStack.set(localScopeStack);
+      ContinuableScope newScope = localScopeStack.top;
+      if (oldScope != newScope && newScope != null) {
+        newScope.beforeActivated();
+        newScope.afterActivated();
+      }
     }
 
     @Override