suggestion

amarziali · amarziali · commit 3d5fc139a472 · 2026-06-12T01:36:31.000+02:00
diff --git a/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java b/dd-java-agent/instrumentation/reactive-streams-1.0/src/main/java/datadog/trace/instrumentation/reactivestreams/ReactiveStreamsContextPropagation.java
@@ -32,7 +32,7 @@ public static ContextScope captureOnSubscribe(
     final Context subscriberContext = subscriberContexts.putIfAbsent(subscriber, context);
     // A context captured on the publisher (cross-thread propagation) must win even when the
     // current thread already carries a non-root active context.
-    return attachIfRequired(subscriberContext, activeContext, true);
+    return attachIfRequired(subscriberContext, activeContext);
   }
 
   public static ContextScope activateOnSignal(
@@ -41,22 +41,18 @@ public static ContextScope activateOnSignal(
     if (activeContext != Context.root()) {
       return null;
     }
-    return attachIfRequired(subscriberContexts.get(subscriber), activeContext, false);
+    return attachIfRequired(subscriberContexts.get(subscriber), activeContext);
   }
 
   public static ContextScope activateOnComplete(
       final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {
-    return attachIfRequired(subscriberContexts.get(subscriber), Context.current(), true);
+    return attachIfRequired(subscriberContexts.get(subscriber), Context.current());
   }
 
-  private static ContextScope attachIfRequired(
-      final Context context, final Context activeContext, final boolean allowReplacingActive) {
+  private static ContextScope attachIfRequired(final Context context, final Context activeContext) {
     if (context == null || context == activeContext || context == Context.root()) {
       return null;
     }
-    if (!allowReplacingActive && activeContext != Context.root()) {
-      return null;
-    }
     return context.attach();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public static ContextScope captureOnSubscribe(`
`32`	`32`	`final Context subscriberContext = subscriberContexts.putIfAbsent(subscriber, context);`
`33`	`33`	`// A context captured on the publisher (cross-thread propagation) must win even when the`
`34`	`34`	`// current thread already carries a non-root active context.`
`35`		`- return attachIfRequired(subscriberContext, activeContext, true);`
	`35`	`+ return attachIfRequired(subscriberContext, activeContext);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public static ContextScope activateOnSignal(`
`@@ -41,22 +41,18 @@ public static ContextScope activateOnSignal(`
`41`	`41`	`if (activeContext != Context.root()) {`
`42`	`42`	`return null;`
`43`	`43`	`}`
`44`		`- return attachIfRequired(subscriberContexts.get(subscriber), activeContext, false);`
	`44`	`+ return attachIfRequired(subscriberContexts.get(subscriber), activeContext);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public static ContextScope activateOnComplete(`
`48`	`48`	`final Subscriber<?> subscriber, final ContextStore<Subscriber, Context> subscriberContexts) {`
`49`		`- return attachIfRequired(subscriberContexts.get(subscriber), Context.current(), true);`
	`49`	`+ return attachIfRequired(subscriberContexts.get(subscriber), Context.current());`
`50`	`50`	`}`
`51`	`51`
`52`		`- private static ContextScope attachIfRequired(`
`53`		`- final Context context, final Context activeContext, final boolean allowReplacingActive) {`
	`52`	`+ private static ContextScope attachIfRequired(final Context context, final Context activeContext) {`
`54`	`53`	`if (context == null \|\| context == activeContext \|\| context == Context.root()) {`
`55`	`54`	`return null;`
`56`	`55`	`}`
`57`		`- if (!allowReplacingActive && activeContext != Context.root()) {`
`58`		`- return null;`
`59`		`- }`
`60`	`56`	`return context.attach();`
`61`	`57`	`}`
`62`	`58`	`}`