Skip to content

Commit dc428e3

Browse files
committed
Fix deprecations for OpenTelemetry in tests
1 parent 2144a15 commit dc428e3

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
2525
import io.opentelemetry.sdk.resources.Resource;
2626
import io.opentelemetry.sdk.trace.SdkTracerProvider;
27-
import io.opentelemetry.semconv.ResourceAttributes;
2827
import org.junit.jupiter.api.Test;
2928

3029
import org.springframework.boot.autoconfigure.AutoConfiguration;
@@ -86,7 +85,7 @@ void shouldApplySpringApplicationNameToResource() {
8685
this.runner.withPropertyValues("spring.application.name=my-application").run((context) -> {
8786
Resource resource = context.getBean(Resource.class);
8887
assertThat(resource.getAttributes().asMap())
89-
.contains(entry(ResourceAttributes.SERVICE_NAME, "my-application"));
88+
.contains(entry(AttributeKey.stringKey("service.name"), "my-application"));
9089
});
9190
}
9291

@@ -112,7 +111,7 @@ void shouldFallbackToDefaultApplicationNameIfSpringApplicationNameIsNotSet() {
112111
this.runner.run((context) -> {
113112
Resource resource = context.getBean(Resource.class);
114113
assertThat(resource.getAttributes().asMap())
115-
.contains(entry(ResourceAttributes.SERVICE_NAME, "unknown_service"));
114+
.contains(entry(AttributeKey.stringKey("service.name"), "unknown_service"));
116115
});
117116
}
118117

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import io.opentelemetry.sdk.trace.data.SpanData;
5454
import io.opentelemetry.sdk.trace.export.SpanExporter;
5555
import io.opentelemetry.sdk.trace.samplers.Sampler;
56-
import io.opentelemetry.semconv.ResourceAttributes;
5756
import org.assertj.core.api.InstanceOfAssertFactories;
5857
import org.junit.jupiter.api.BeforeAll;
5958
import org.junit.jupiter.api.Test;
@@ -195,7 +194,7 @@ void shouldSetupDefaultResourceAttributes() {
195194
exporter.await(Duration.ofSeconds(10));
196195
SpanData spanData = exporter.getExportedSpans().get(0);
197196
Map<AttributeKey<?>, Object> expectedAttributes = Resource.getDefault()
198-
.merge(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "unknown_service")))
197+
.merge(Resource.create(Attributes.of(AttributeKey.stringKey("service.name"), "unknown_service")))
199198
.getAttributes()
200199
.asMap();
201200
assertThat(spanData.getResource().getAttributes().asMap()).isEqualTo(expectedAttributes);

0 commit comments

Comments
 (0)