Merge branch '3.4.x' into 3.5.x

Closes gh-46236

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

@@ -174,7 +174,7 @@ class BaggagePropagationIntegrationTests {
 			public ApplicationContextRunner get() {
 				return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
 					.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
-							org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
+							OpenTelemetryTracingAutoConfiguration.class))
 					.withPropertyValues("management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
 							"management.tracing.baggage.correlation.fields=country-code,bp");
 			}
@@ -200,7 +200,7 @@ class BaggagePropagationIntegrationTests {
 			public ApplicationContextRunner get() {
 				return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
 					.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
-							org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
+							OpenTelemetryTracingAutoConfiguration.class))
 					.withPropertyValues("management.tracing.propagation.type=W3C",
 							"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
 							"management.tracing.baggage.correlation.fields=country-code,bp");
@@ -240,7 +240,7 @@ class BaggagePropagationIntegrationTests {
 			public ApplicationContextRunner get() {
 				return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
 					.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
-							org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
+							OpenTelemetryTracingAutoConfiguration.class))
 					.withPropertyValues("management.tracing.propagation.type=B3",
 							"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
 							"management.tracing.baggage.correlation.fields=country-code,bp");
@@ -254,7 +254,7 @@ class BaggagePropagationIntegrationTests {
 			public ApplicationContextRunner get() {
 				return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
 					.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
-							org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
+							OpenTelemetryTracingAutoConfiguration.class))
 					.withPropertyValues("management.tracing.propagation.type=B3_MULTI",
 							"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
 							"management.tracing.baggage.correlation.fields=country-code,bp");

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

@@ -49,6 +49,7 @@ import org.junit.jupiter.api.Test;
 import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration;
+import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfigurationIntegrationTests.MockGrpcServer.RecordedGrpcRequest;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -66,8 +67,7 @@ class OtlpTracingAutoConfigurationIntegrationTests {
 		.withPropertyValues("management.tracing.sampling.probability=1.0")
 		.withConfiguration(AutoConfigurations.of(ObservationAutoConfiguration.class,
 				MicrometerTracingAutoConfiguration.class, OpenTelemetryAutoConfiguration.class,
-				org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class,
-				OtlpTracingAutoConfiguration.class));
+				OpenTelemetryTracingAutoConfiguration.class, OtlpTracingAutoConfiguration.class));
 
 	private final MockWebServer mockWebServer = new MockWebServer();