Upgrade to Micrometer Tracing 1.2.0-SNAPSHOT

Author: jonatan-ivanov

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

@@ -68,6 +68,7 @@ dependencies {
 	optional("io.micrometer:micrometer-registry-signalfx")
 	optional("io.micrometer:micrometer-registry-statsd")
 	optional("io.micrometer:micrometer-registry-wavefront")
+	optional("io.zipkin.reporter2:zipkin-reporter-brave")
 	optional("io.zipkin.reporter2:zipkin-sender-urlconnection")
 	optional("io.opentelemetry:opentelemetry-exporter-zipkin")
 	optional("io.opentelemetry:opentelemetry-exporter-otlp")

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

@@ -71,8 +71,8 @@ OpenTelemetrySdk openTelemetry(ObjectProvider<SdkTracerProvider> tracerProvider,
 	Resource openTelemetryResource(Environment environment, OpenTelemetryProperties properties) {
 		String applicationName = environment.getProperty("spring.application.name", DEFAULT_APPLICATION_NAME);
 		return Resource.getDefault()
-			.merge(Resource.create(Attributes
-				.of(io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME, applicationName)))
+			.merge(Resource
+				.create(Attributes.of(io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME, applicationName)))
 			.merge(toResource(properties));
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/opentelemetry/OpenTelemetryAutoConfigurationTests.java

@@ -85,8 +85,8 @@ void backsOffOnUserSuppliedBeans() {
 	void shouldApplySpringApplicationNameToResource() {
 		this.runner.withPropertyValues("spring.application.name=my-application").run((context) -> {
 			Resource resource = context.getBean(Resource.class);
-			assertThat(resource.getAttributes().asMap()).contains(entry(
-					io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME, "my-application"));
+			assertThat(resource.getAttributes().asMap())
+				.contains(entry(io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME, "my-application"));
 		});
 	}
 
@@ -95,8 +95,8 @@ void shouldApplySpringApplicationNameToResource() {
 	void shouldFallbackToDefaultApplicationNameIfSpringApplicationNameIsNotSet() {
 		this.runner.run((context) -> {
 			Resource resource = context.getBean(Resource.class);
-			assertThat(resource.getAttributes().asMap()).contains(
-					entry(io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME, "application"));
+			assertThat(resource.getAttributes().asMap())
+				.contains(entry(io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME, "application"));
 		});
 	}
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryAutoConfigurationTests.java

@@ -182,9 +182,8 @@ void shouldSetupDefaultResourceAttributes() {
 				exporter.await(Duration.ofSeconds(10));
 				SpanData spanData = exporter.getExportedSpans().get(0);
 				Map<AttributeKey<?>, Object> expectedAttributes = Resource.getDefault()
-					.merge(Resource.create(
-							Attributes.of(io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME,
-									"application")))
+					.merge(Resource
+						.create(Attributes.of(io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME, "application")))
 					.getAttributes()
 					.asMap();
 				assertThat(spanData.getResource().getAttributes().asMap()).isEqualTo(expectedAttributes);

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

@@ -1011,7 +1011,7 @@ bom {
 			]
 		}
 	}
-	library("Micrometer Tracing", "1.2.0-M3") {
+	library("Micrometer Tracing", "1.2.0-SNAPSHOT") {
 		considerSnapshots()
 		calendarName = "Tracing"
 		group("io.micrometer") {

spring-boot-project/spring-boot-test-autoconfigure/build.gradle

@@ -28,6 +28,8 @@ dependencies {
 	optional("org.seleniumhq.selenium:htmlunit-driver") {
 		exclude(group: "commons-logging", module: "commons-logging")
 		exclude(group: "com.sun.activation", module: "jakarta.activation")
+		exclude(group: "io.opentelemetry")
+		exclude(group: "io.opentelemetry.*")
 	}
 	optional("org.seleniumhq.selenium:selenium-api")
 	optional("org.springframework:spring-orm")

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

@@ -30,6 +30,8 @@ dependencies {
 	optional("org.seleniumhq.selenium:htmlunit-driver") {
 		exclude(group: "commons-logging", module: "commons-logging")
 		exclude(group: "com.sun.activation", module: "jakarta.activation")
+		exclude(group: "io.opentelemetry")
+		exclude(group: "io.opentelemetry.*")
 	}
 	optional("org.seleniumhq.selenium:selenium-api")
 	optional("org.springframework:spring-test")

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-test/build.gradle

@@ -20,5 +20,7 @@ dependencies {
 	testImplementation("org.seleniumhq.selenium:htmlunit-driver") {
 		exclude group: "commons-logging", module: "commons-logging"
 		exclude(group: "com.sun.activation", module: "jakarta.activation")
+		exclude(group: "io.opentelemetry")
+		exclude(group: "io.opentelemetry.*")
 	}
 }