Skip to content

Commit 4989587

Browse files
committed
Merge pull request #46234 from quaff
* pr/46234: Replace fully qualified class to import Closes gh-46234
2 parents 5479f5c + 520f7ab commit 4989587

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public ApplicationContextRunner get() {
174174
public ApplicationContextRunner get() {
175175
return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
176176
.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
177-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
177+
OpenTelemetryTracingAutoConfiguration.class))
178178
.withPropertyValues("management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
179179
"management.tracing.baggage.correlation.fields=country-code,bp");
180180
}
@@ -200,7 +200,7 @@ public ApplicationContextRunner get() {
200200
public ApplicationContextRunner get() {
201201
return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
202202
.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
203-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
203+
OpenTelemetryTracingAutoConfiguration.class))
204204
.withPropertyValues("management.tracing.propagation.type=W3C",
205205
"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
206206
"management.tracing.baggage.correlation.fields=country-code,bp");
@@ -240,7 +240,7 @@ public ApplicationContextRunner get() {
240240
public ApplicationContextRunner get() {
241241
return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
242242
.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
243-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
243+
OpenTelemetryTracingAutoConfiguration.class))
244244
.withPropertyValues("management.tracing.propagation.type=B3",
245245
"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
246246
"management.tracing.baggage.correlation.fields=country-code,bp");
@@ -254,7 +254,7 @@ public ApplicationContextRunner get() {
254254
public ApplicationContextRunner get() {
255255
return new ApplicationContextRunner().withInitializer(new OtelApplicationContextInitializer())
256256
.withConfiguration(AutoConfigurations.of(OpenTelemetryAutoConfiguration.class,
257-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class))
257+
OpenTelemetryTracingAutoConfiguration.class))
258258
.withPropertyValues("management.tracing.propagation.type=B3_MULTI",
259259
"management.tracing.baggage.remote-fields=x-vcap-request-id,country-code,bp",
260260
"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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration;
5050
import org.springframework.boot.actuate.autoconfigure.opentelemetry.OpenTelemetryAutoConfiguration;
5151
import org.springframework.boot.actuate.autoconfigure.tracing.MicrometerTracingAutoConfiguration;
52+
import org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration;
5253
import org.springframework.boot.actuate.autoconfigure.tracing.otlp.OtlpTracingAutoConfigurationIntegrationTests.MockGrpcServer.RecordedGrpcRequest;
5354
import org.springframework.boot.autoconfigure.AutoConfigurations;
5455
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
@@ -66,8 +67,7 @@ class OtlpTracingAutoConfigurationIntegrationTests {
6667
.withPropertyValues("management.tracing.sampling.probability=1.0")
6768
.withConfiguration(AutoConfigurations.of(ObservationAutoConfiguration.class,
6869
MicrometerTracingAutoConfiguration.class, OpenTelemetryAutoConfiguration.class,
69-
org.springframework.boot.actuate.autoconfigure.tracing.OpenTelemetryTracingAutoConfiguration.class,
70-
OtlpTracingAutoConfiguration.class));
70+
OpenTelemetryTracingAutoConfiguration.class, OtlpTracingAutoConfiguration.class));
7171

7272
private final MockWebServer mockWebServer = new MockWebServer();
7373

0 commit comments

Comments
 (0)