removes queue-wrapping from acp (#3498)

Signed-off-by: OlegDokuka <odokuka@vmware.com>
reactor · Jun 13, 2023 · f6e7748 · f6e7748
1 parent 81c9852
commit f6e7748
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/reactor-core/src/main/java/reactor/core/publisher/Hooks.java b/reactor-core/src/main/java/reactor/core/publisher/Hooks.java
@@ -542,7 +542,6 @@ public static void disableContextLossTracking() {
 	 */
 	public static void enableAutomaticContextPropagation() {
 		if (ContextPropagationSupport.isContextPropagationOnClasspath) {
-			Hooks.addQueueWrapper(CONTEXT_IN_THREAD_LOCALS_KEY, ContextPropagation.ContextQueue::new);
 			Schedulers.onScheduleHook(CONTEXT_IN_THREAD_LOCALS_KEY,
 					ContextPropagation.scopePassingOnScheduleHook());
 			ContextPropagationSupport.propagateContextToThreadLocals = true;

diff --git a/...src/withContextPropagation102Test/java/reactor/core/publisher/ContextPropagationTest.java b/...src/withContextPropagation102Test/java/reactor/core/publisher/ContextPropagationTest.java
@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -164,6 +165,7 @@ void threadLocalsPresentAfterDelay() {
 	}
 
 	@Test
+	@Disabled("queue wrapping is removed starting from 3.5.7")
 	void threadLocalsRestoredAfterPollution() {
 		// this test validates Queue wrapping takes place
 		Hooks.enableAutomaticContextPropagation();
@@ -285,6 +287,7 @@ void prefetchingShouldMaintainThreadLocals() {
 	}
 
 	@Test
+	@Disabled("queue wrapping is removed starting from 3.5.7")
 	void queueWrapperWorksWithQueues() {
 		Hooks.enableAutomaticContextPropagation();
 		Queue<Object> queue = Queues.small()

diff --git a/reactor-core/src/withMicrometerTest/java/reactor/core/publisher/ContextPropagationTest.java b/reactor-core/src/withMicrometerTest/java/reactor/core/publisher/ContextPropagationTest.java
@@ -41,6 +41,7 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.provider.EnumSource;
@@ -165,6 +166,7 @@ void threadLocalsPresentAfterDelay() {
 	}
 
 	@Test
+	@Disabled("queue wrapping is removed starting from 3.5.7")
 	void threadLocalsRestoredAfterPollution() {
 		// this test validates Queue wrapping takes place
 		Hooks.enableAutomaticContextPropagation();
@@ -285,6 +287,7 @@ void prefetchingShouldMaintainThreadLocals() {
 	}
 
 	@Test
+	@Disabled("queue wrapping is removed starting from 3.5.7")
 	void queueWrapperWorksWithQueues() {
 		Hooks.enableAutomaticContextPropagation();
 		Queue<Object> queue = Queues.small()