Fixed docs & Benchmarks

Author: marcingrzejszczak

benchmarks/pom.xml

@@ -23,7 +23,7 @@
 	<description>Benchmarks (JMH)</description>
 	<groupId>org.springframework.cloud</groupId>
 	<version>3.0.0-SNAPSHOT</version>
-	<artifactId>benchmarks</artifactId>
+	<artifactId>otel-benchmarks</artifactId>
 
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -41,6 +41,7 @@
 		<okhttp.version>4.9.0</okhttp.version>
 		<microbenchmark-runner.version>0.2.0.RELEASE</microbenchmark-runner.version>
 		<jmh.version>1.21</jmh.version>
+		<spring-cloud-sleuth.version>3.0.0-SNAPSHOT</spring-cloud-sleuth.version>
 		<spring-cloud-stream.version>3.1.0-SNAPSHOT</spring-cloud-stream.version>
 	</properties>
 
@@ -49,6 +50,13 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-sleuth-dependencies</artifactId>
+				<version>${spring-cloud-sleuth.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-sleuth-otel-dependencies</artifactId>
 				<version>${project.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
@@ -67,6 +75,12 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-cloud-starter-sleuth</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.cloud</groupId>
+					<artifactId>spring-cloud-sleuth-brave</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -143,10 +157,6 @@
 			<version>${okhttp.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.zipkin.brave</groupId>
-			<artifactId>brave-instrumentation-httpclient</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/SampleTests.java

@@ -21,23 +21,6 @@
 
 public enum TracerImplementation {
 
-	otel(BraveAutoConfiguration.class.getCanonicalName()), brave(OtelAutoConfiguration.class.getCanonicalName());
-
-	private String key = "spring.autoconfigure.exclude";
-
-	private String value;
-
-	TracerImplementation(String value) {
-		this.value = value;
-	}
-
-	public String property() {
-		return "--" + this.key + "=" + this.value;
-	}
-
-	@Override
-	public String toString() {
-		return this.name();
-	}
+	otel;
 
 }

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/TracerImplementation.java

@@ -106,7 +106,7 @@ public static class BenchmarkContext {
 		public void setup() {
 			SpringApplication application = new SpringApplication(TestConfiguration.class);
 			application.setWebApplicationType(WebApplicationType.NONE);
-			this.withSleuth = application.run("--spring.jmx.enabled=false", this.tracerImplementation.property(),
+			this.withSleuth = application.run("--spring.jmx.enabled=false",
 					"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
 			this.tracer = this.withSleuth.getBean(Tracer.class);
 			this.parent = this.tracer.nextSpan().name("name").start();

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/bridge/BridgeTests.java

@@ -72,7 +72,6 @@ public static class BenchmarkContext {
 		@Setup
 		public void setup() {
 			this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
-					this.tracerImplementation.property(),
 					"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
 			this.sleuth = this.withSleuth.getBean(SleuthBenchmarkingSpringApp.class);
 		}

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/AnnotationBenchmarksTests.java

@@ -76,7 +76,6 @@ public static class BenchmarkContext {
 		@Setup
 		public void setup() {
 			this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
-					this.tracerImplementation.property(),
 					"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
 			this.withoutSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run(
 					"--spring.jmx.enabled=false", "--spring.application.name=withoutSleuth",

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/AsyncBenchmarksTests.java

@@ -139,7 +139,6 @@ public static class BenchmarkContext {
 		@Setup
 		public void setup() {
 			this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
-					this.tracerImplementation.property(),
 					"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
 			this.tracingFilter = this.withSleuth.getBean(TracingFilter.class);
 			this.mockMvcForTracedController = MockMvcBuilders

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/HttpFilterBenchmarksTests.java

@@ -88,7 +88,6 @@ public static class BenchmarkContext {
 		@Setup
 		public void setup() {
 			this.withSleuth = new SpringApplication(SleuthBenchmarkingSpringApp.class).run("--spring.jmx.enabled=false",
-					this.tracerImplementation.property(),
 					"--spring.application.name=withSleuth_" + this.tracerImplementation.name());
 			this.mockMvc = MockMvcBuilders.standaloneSetup(this.withSleuth.getBean(SleuthBenchmarkingSpringApp.class))
 					.build();

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/RestTemplateBenchmarkTests.java

@@ -48,29 +48,27 @@ public void withAnnotations(ApplicationState state) throws Exception {
 
 	@Benchmark
 	public void withoutAnnotations(ApplicationState state) throws Exception {
-		state.setExtraArgs("--spring.sleuth.annotation.enabled=false", state.tracerImplementation.property());
+		state.setExtraArgs("--spring.sleuth.annotation.enabled=false");
 		state.run();
 	}
 
 	@Benchmark
 	public void withoutAsync(ApplicationState state) throws Exception {
-		state.setExtraArgs("--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false",
-				state.tracerImplementation.property());
+		state.setExtraArgs("--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false");
 		state.run();
 	}
 
 	@Benchmark
 	public void withoutScheduled(ApplicationState state) throws Exception {
 		state.setExtraArgs("--spring.sleuth.scheduled.enabled=false", "--spring.sleuth.async.enabled=false",
-				"--spring.sleuth.annotation.enabled=false", state.tracerImplementation.property());
+				"--spring.sleuth.annotation.enabled=false");
 		state.run();
 	}
 
 	@Benchmark
 	public void withoutWeb(ApplicationState state) throws Exception {
 		state.setExtraArgs("--spring.sleuth.web.enabled=false", "--spring.sleuth.scheduled.enabled=false",
-				"--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false",
-				state.tracerImplementation.property());
+				"--spring.sleuth.async.enabled=false", "--spring.sleuth.annotation.enabled=false");
 		state.run();
 	}
 

benchmarks/src/test/java/org/springframework/cloud/sleuth/benchmarks/jmh/mvc/StartupBenchmarkTests.java

@@ -24,7 +24,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
-import brave.Tracing;
 import jmh.mbr.junit5.Microbenchmark;
 import org.junit.platform.commons.annotation.Testable;
 import org.openjdk.jmh.annotations.Benchmark;
@@ -107,7 +106,7 @@ protected ConfigurableApplicationContext initContext() {
 
 		protected String[] runArgs() {
 			List<String> strings = new ArrayList<>();
-			strings.addAll(Arrays.asList("--spring.jmx.enabled=false", this.tracerImplementation.property(),
+			strings.addAll(Arrays.asList("--spring.jmx.enabled=false",
 					"--spring.application.name=defaultTraceContextForStream" + instrumentation.name() + "_"
 							+ tracerImplementation.name()));
 			strings.addAll(instrumentation.entires.stream().map(s -> "--" + s).collect(Collectors.toList()));
@@ -141,10 +140,6 @@ private void assertThatOutputMessageGotReceived() {
 
 		@TearDown
 		public void clean() throws Exception {
-			Tracing current = Tracing.current();
-			if (current != null) {
-				current.close();
-			}
 			try {
 				this.applicationContext.close();
 			}