Create spring-boot-tracing module

Author: wilkinsona

settings.gradle

@@ -150,6 +150,7 @@ include "spring-boot-project:spring-boot-tools:spring-boot-maven-plugin"
 include "spring-boot-project:spring-boot-tools:spring-boot-properties-migrator"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support"
 include "spring-boot-project:spring-boot-tools:spring-boot-test-support-docker"
+include "spring-boot-project:spring-boot-tracing"
 include "spring-boot-project:spring-boot-tx"
 include "spring-boot-project:spring-boot-undertow"
 include "spring-boot-project:spring-boot-validation"

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -58,14 +58,7 @@ dependencies {
 	optional("io.lettuce:lettuce-core")
 	optional("io.micrometer:micrometer-jakarta9")
 	optional("io.micrometer:micrometer-observation")
-	optional("io.micrometer:micrometer-tracing")
-	optional("io.micrometer:micrometer-tracing-bridge-brave")
-	optional("io.micrometer:micrometer-tracing-bridge-otel")
-	optional("io.zipkin.reporter2:zipkin-reporter-brave")
-	optional("io.opentelemetry:opentelemetry-exporter-zipkin")
-	optional("io.opentelemetry:opentelemetry-exporter-otlp")
 	optional("io.projectreactor.netty:reactor-netty-http")
-	optional("io.prometheus:prometheus-metrics-tracer-common")
 	optional("jakarta.persistence:jakarta.persistence-api")
 	optional("jakarta.servlet:jakarta.servlet-api")
 	optional("org.apache.activemq:activemq-broker")
@@ -106,10 +99,7 @@ dependencies {
 	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-web-server")))
 	testImplementation("com.squareup.okhttp3:mockwebserver")
 	testImplementation("io.micrometer:micrometer-observation-test")
-	testImplementation("io.micrometer:micrometer-registry-prometheus")
-	testImplementation("io.opentelemetry:opentelemetry-exporter-common")
 	testImplementation("io.projectreactor:reactor-test")
-	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
 	testImplementation("jakarta.xml.bind:jakarta.xml.bind-api")
 	testImplementation("org.apache.activemq:artemis-jakarta-client")
 	testImplementation("org.apache.activemq:artemis-jakarta-server")
@@ -124,7 +114,6 @@ dependencies {
 	testImplementation("org.springframework.security:spring-security-test")
 	testImplementation("org.yaml:snakeyaml")
 
-	testRuntimeOnly("io.grpc:grpc-api:1.72.0")
 	testRuntimeOnly("jakarta.management.j2ee:jakarta.management.j2ee-api")
 	testRuntimeOnly("jakarta.transaction:jakarta.transaction-api")
 	testRuntimeOnly("org.opensaml:opensaml-core:4.0.1")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfiguration.java

@@ -7,43 +7,13 @@
       "description": "Whether to enable SSL certificate health check.",
       "defaultValue": true
     },
-    {
-      "name": "management.otlp.tracing.export.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether auto-configuration of tracing is enabled to export OTLP traces."
-    },
     {
       "name": "management.promethus.metrics.export.pushgateway.base-url",
       "type": "java.lang.String",
       "deprecation": {
         "level": "error",
         "replacement": "management.prometheus.metrics.export.pushgateway.address"
       }
-    },
-    {
-      "name": "management.tracing.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether auto-configuration of tracing is enabled to export and propagate traces.",
-      "defaultValue": true
-    },
-    {
-      "name": "management.tracing.propagation.consume",
-      "defaultValue": [
-        "W3C",
-        "B3",
-        "B3_MULTI"
-      ]
-    },
-    {
-      "name": "management.tracing.propagation.produce",
-      "defaultValue": [
-        "W3C"
-      ]
-    },
-    {
-      "name": "management.zipkin.tracing.export.enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether auto-configuration of tracing is enabled to export Zipkin traces."
     }
   ]
 }

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpAutoConfiguration.java

@@ -1,9 +1,2 @@
 org.springframework.boot.actuate.autoconfigure.security.reactive.ReactiveManagementWebSecurityAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.NoopTracerAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.prometheus.PrometheusExemplarsAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinTracingAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -19,8 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.BraveAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration;
 import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
 import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
@@ -57,18 +55,17 @@ void healthEndpointReactiveWebExtensionIsAutoConfigured() {
 	private WebApplicationContextRunner servletWebRunner() {
 		return new WebApplicationContextRunner()
 			.withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class))
-			.withPropertyValues("management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false");
+			.withPropertyValues("management.defaults.metrics.export.enabled=false");
 	}
 
 	private ReactiveWebApplicationContextRunner reactiveWebRunner() {
 		return new ReactiveWebApplicationContextRunner()
 			.withConfiguration(UserConfigurations.of(WebEndpointTestApplication.class))
-			.withPropertyValues("management.tracing.enabled=false", "management.defaults.metrics.export.enabled=false");
+			.withPropertyValues("management.defaults.metrics.export.enabled=false");
 	}
 
 	@EnableAutoConfiguration(exclude = { CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class,
-			RepositoryRestMvcAutoConfiguration.class, BraveAutoConfiguration.class,
-			OpenTelemetryTracingAutoConfiguration.class })
+			RepositoryRestMvcAutoConfiguration.class })
 	@SpringBootConfiguration
 	static class WebEndpointTestApplication {
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

@@ -2127,6 +2127,7 @@ bom {
 				"spring-boot-testcontainers-all",
 				"spring-boot-thymeleaf",
 				"spring-boot-tomcat",
+				"spring-boot-tracing",
 				"spring-boot-tx",
 				"spring-boot-undertow",
 				"spring-boot-validation",

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring.factories

@@ -55,6 +55,7 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-opentelemetry"))
 	optional(project(":spring-boot-project:spring-boot-pulsar"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
+	optional(project(":spring-boot-project:spring-boot-tracing"))
 	optional(project(":spring-boot-project:spring-boot-zipkin"))
 	optional("com.hazelcast:hazelcast")
 	optional("org.mongodb:mongodb-driver-core")

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -16,10 +16,10 @@
 
 package org.springframework.boot.docker.compose.service.connection.otlp;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails;
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.Transport;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.testsupport.container.TestImage;
+import org.springframework.boot.tracing.autoconfigure.otlp.OtlpTracingConnectionDetails;
+import org.springframework.boot.tracing.autoconfigure.otlp.Transport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.replacements

@@ -16,10 +16,10 @@
 
 package org.springframework.boot.docker.compose.service.connection.otlp;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails;
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.Transport;
 import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest;
 import org.springframework.boot.testsupport.container.TestImage;
+import org.springframework.boot.tracing.autoconfigure.otlp.OtlpTracingConnectionDetails;
+import org.springframework.boot.tracing.autoconfigure.otlp.Transport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

@@ -16,11 +16,11 @@
 
 package org.springframework.boot.docker.compose.service.connection.otlp;
 
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails;
-import org.springframework.boot.actuate.autoconfigure.tracing.otlp.Transport;
 import org.springframework.boot.docker.compose.core.RunningService;
 import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory;
 import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionSource;
+import org.springframework.boot.tracing.autoconfigure.otlp.OtlpTracingConnectionDetails;
+import org.springframework.boot.tracing.autoconfigure.otlp.Transport;
 
 /**
  * {@link DockerComposeConnectionDetailsFactory} to create
@@ -41,7 +41,7 @@ class OpenTelemetryTracingDockerComposeConnectionDetailsFactory
 
 	OpenTelemetryTracingDockerComposeConnectionDetailsFactory() {
 		super(OPENTELEMETRY_IMAGE_NAMES,
-				"org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfiguration");
+				"org.springframework.boot.tracing.autoconfigure.otlp.OtlpTracingAutoConfiguration");
 	}
 
 	@Override

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/zipkin/ZipkinAutoConfigurationIntegrationTests.java

@@ -135,6 +135,7 @@ dependencies {
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-thymeleaf", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "autoConfigurationMetadata"))
+	autoConfiguration(project(path: ":spring-boot-project:spring-boot-tracing", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-tx", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "autoConfigurationMetadata"))
 	autoConfiguration(project(path: ":spring-boot-project:spring-boot-validation", configuration: "autoConfigurationMetadata"))
@@ -222,6 +223,7 @@ dependencies {
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-testcontainers", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-thymeleaf", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-tomcat", configuration: "configurationPropertiesMetadata"))
+	configurationProperties(project(path: ":spring-boot-project:spring-boot-tracing", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-tx", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-undertow", configuration: "configurationPropertiesMetadata"))
 	configurationProperties(project(path: ":spring-boot-project:spring-boot-web-server", configuration: "configurationPropertiesMetadata"))

spring-boot-project/spring-boot-dependencies/build.gradle

@@ -138,7 +138,7 @@ Tracing with OpenTelemetry and reporting using OTLP requires the following depen
 
 Use the `management.otlp.tracing.*` configuration properties to configure reporting using OTLP.
 
-NOTE: If you need to apply advanced customizations to OTLP span exporters, consider registering javadoc:org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpHttpSpanExporterBuilderCustomizer[] or javadoc:org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpGrpcSpanExporterBuilderCustomizer[] beans.
+NOTE: If you need to apply advanced customizations to OTLP span exporters, consider registering javadoc:org.springframework.boot.tracing.autoconfigure.otlp.OtlpHttpSpanExporterBuilderCustomizer[] or javadoc:org.springframework.boot.tracing.autoconfigure.otlp.OtlpGrpcSpanExporterBuilderCustomizer[] beans.
 These will be invoked before the creation of the `OtlpHttpSpanExporter` or `OtlpGrpcSpanExporter`.
 The customizers take precedence over anything applied by the auto-configuration.
 

spring-boot-project/spring-boot-docker-compose-all/build.gradle

@@ -116,7 +116,7 @@ The following service connections are currently supported:
 | javadoc:org.springframework.boot.metrics.autoconfigure.export.otlp.OtlpMetricsConnectionDetails[]
 | Containers named "otel/opentelemetry-collector-contrib", "grafana/otel-lgtm"
 
-| javadoc:org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingConnectionDetails[]
+| javadoc:org.springframework.boot.tracing.autoconfigure.otlp.OtlpTracingConnectionDetails[]
 | Containers named "otel/opentelemetry-collector-contrib", "grafana/otel-lgtm"
 
 | javadoc:org.springframework.boot.autoconfigure.pulsar.PulsarConnectionDetails[]
@@ -131,7 +131,7 @@ The following service connections are currently supported:
 | javadoc:org.springframework.boot.data.redis.autoconfigure.RedisConnectionDetails[]
 | Containers named "redis", "bitnami/redis", "redis/redis-stack" or "redis/redis-stack-server"
 
-| javadoc:org.springframework.boot.actuate.autoconfigure.tracing.zipkin.ZipkinConnectionDetails[]
+| javadoc:org.springframework.boot.tracing.autoconfigure.zipkin.ZipkinConnectionDetails[]
 | Containers named "openzipkin/zipkin".
 |===