Merge #2562 into 2.0.0-M3

reactor-netty5-core/build.gradle

@@ -145,7 +145,6 @@ dependencies {
 	testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junitPlatformLauncherVersion"
 	testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
 	testRuntimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-	testRuntimeOnly "io.micrometer:micrometer-tracing:$micrometerTracingVersion"
 
 	// https://github.com/netty/netty/pull/11487
 	// https://github.com/netty/netty/issues/10317

reactor-netty5-core/src/test/java/reactor/netty5/tcp/TcpMetricsTests.java

@@ -16,6 +16,7 @@
 package reactor.netty5.tcp;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static org.assertj.core.api.Assertions.fail;
 import static reactor.netty5.Metrics.CONNECTIONS_TOTAL;
 import static reactor.netty5.Metrics.CONNECT_TIME;
@@ -222,6 +223,12 @@ void testContextAwareRecorder() throws Exception {
 		assertThat(recorder.onDataSentContextView).isTrue();
 	}
 
+	@Test
+	void smokeTestNoContextPropagation() {
+		assertThatExceptionOfType(ClassNotFoundException.class)
+				.isThrownBy(() -> Class.forName("io.micrometer.context.ContextRegistry"));
+	}
+
 	private void checkExpectationsPositive() {
 		InetSocketAddress ca = (InetSocketAddress) connection.channel().localAddress();
 		String clientAddress = ca.getHostString() + ":" + ca.getPort();

reactor-netty5-http/build.gradle

@@ -136,7 +136,9 @@ dependencies {
 	testImplementation "io.projectreactor.tools:blockhound-junit-platform:$blockHoundVersion"
 	testImplementation "io.micrometer:micrometer-core:$micrometerVersion"
 	testImplementation "io.micrometer:micrometer-test:$micrometerVersion"
-	testImplementation "io.micrometer:micrometer-tracing-integration-test:$micrometerTracingVersion"
+	testImplementation("io.micrometer:micrometer-tracing-integration-test:$micrometerTracingVersion") {
+		exclude module: "context-propagation"
+	}
 	testImplementation "io.netty.contrib:netty-codec-extras:$nettyContribVersion"
 	testImplementation "org.reflections:reflections:$reflectionsVersion"
 

reactor-netty5-http/src/noMicrometerTest/java/reactor/netty5/http/client/HttpClientNoMicrometerTest.java

@@ -37,6 +37,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 /**
  * @author Simon Baslé
@@ -57,6 +58,12 @@ void smokeTestNoMicrometer() {
 		assertThat(Metrics.isMicrometerAvailable()).as("isMicrometerAvailable").isFalse();
 	}
 
+	@Test
+	void smokeTestNoContextPropagation() {
+		assertThatExceptionOfType(ClassNotFoundException.class)
+				.isThrownBy(() -> Class.forName("io.micrometer.context.ContextRegistry"));
+	}
+
 	@Test
 	void clientCreatedWithMetricsDoesntLoadGaugeHttp1() {
 		ConnectionProvider provider =

reactor-netty5-http/src/test/java/reactor/netty5/http/HttpMetricsHandlerTests.java

@@ -86,6 +86,7 @@
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 import static reactor.netty5.Metrics.CONNECTIONS_ACTIVE;
 import static reactor.netty5.Metrics.CONNECTIONS_TOTAL;
 import static reactor.netty5.Metrics.CONNECT_TIME;
@@ -778,6 +779,12 @@ void testBadRequest(HttpProtocol[] serverProtocols, HttpProtocol[] clientProtoco
 		checkExpectationsBadRequest(sa.getHostString() + ":" + sa.getPort(), serverCtx != null);
 	}
 
+	@Test
+	void smokeTestNoContextPropagation() {
+		assertThatExceptionOfType(ClassNotFoundException.class)
+				.isThrownBy(() -> Class.forName("io.micrometer.context.ContextRegistry"));
+	}
+
 	private void checkServerConnectionsMicrometer(HttpServerRequest request) {
 		String address = formatSocketAddress(request.hostAddress());
 		boolean isHttp2 = request.requestHeaders().contains(HttpConversionUtil.ExtensionHeaderNames.SCHEME.text());