Skip to content

Commit 5b0e769

Browse files
trasktrask
authored
Update semconv dependency version (#1585)
1 parent 9ad072c commit 5b0e769

File tree

8 files changed

+156
-207
lines changed

8 files changed

+156
-207
lines changed

‎aws-xray/build.gradle.kts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ dependencies {
1313
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
1414

1515
implementation("com.squareup.okhttp3:okhttp")
16-
implementation("io.opentelemetry:opentelemetry-semconv")
16+
implementation("io.opentelemetry.semconv:opentelemetry-semconv")
17+
implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
1718

1819
annotationProcessor("com.google.auto.service:auto-service")
1920
testImplementation("com.google.auto.service:auto-service")
@@ -45,10 +46,3 @@ testing {
4546
}
4647
}
4748
}
48-
49-
configurations.all {
50-
resolutionStrategy {
51-
// TODO this module still needs to be updated to the latest semconv
52-
force("io.opentelemetry:opentelemetry-semconv:1.28.0-alpha")
53-
}
54-
}

‎aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributeGenerator.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,33 @@
1515
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_SPAN_KIND;
1616
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_STREAM_NAME;
1717
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_TABLE_NAME;
18-
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
19-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DB_OPERATION;
20-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DB_SYSTEM;
21-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_INVOKED_NAME;
22-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_TRIGGER;
23-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.GRAPHQL_OPERATION_TYPE;
24-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_METHOD;
25-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_TARGET;
26-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_URL;
27-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
28-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
29-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PEER_NAME;
30-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PEER_PORT;
31-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_ADDR;
32-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_PORT;
33-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.PEER_SERVICE;
34-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_METHOD;
35-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_SERVICE;
18+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
19+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
20+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
21+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_NAME;
22+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_TRIGGER;
23+
import static io.opentelemetry.semconv.incubating.GraphqlIncubatingAttributes.GRAPHQL_OPERATION_TYPE;
24+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
25+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_TARGET;
26+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_URL;
27+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
28+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
29+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_NAME;
30+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_PORT;
31+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_ADDR;
32+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_PORT;
33+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
34+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
35+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
3636

3737
import io.opentelemetry.api.common.AttributeKey;
3838
import io.opentelemetry.api.common.Attributes;
3939
import io.opentelemetry.api.common.AttributesBuilder;
4040
import io.opentelemetry.api.trace.SpanKind;
4141
import io.opentelemetry.sdk.resources.Resource;
4242
import io.opentelemetry.sdk.trace.data.SpanData;
43-
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
44-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
43+
import io.opentelemetry.semconv.ServiceAttributes;
44+
import io.opentelemetry.semconv.incubating.GraphqlIncubatingAttributes;
4545
import java.net.MalformedURLException;
4646
import java.net.URL;
4747
import java.util.Optional;
@@ -57,6 +57,7 @@
5757
* represent "incoming" traffic, {@link SpanKind#CLIENT} and {@link SpanKind#PRODUCER} spans
5858
* represent "outgoing" traffic, and {@link SpanKind#INTERNAL} spans are ignored.
5959
*/
60+
@SuppressWarnings("deprecation") // uses deprecated semantic conventions
6061
final class AwsMetricAttributeGenerator implements MetricAttributeGenerator {
6162

6263
private static final Logger logger =
@@ -119,7 +120,7 @@ private static Optional<String> getRemoteTarget(SpanData span) {
119120
return Optional.empty();
120121
}
121122

122-
/** Service is always derived from {@link ResourceAttributes#SERVICE_NAME} */
123+
/** Service is always derived from {@link ServiceAttributes#SERVICE_NAME} */
123124
private static void setService(Resource resource, SpanData span, AttributesBuilder builder) {
124125
String service = resource.getAttribute(SERVICE_NAME);
125126
if (service == null) {
@@ -195,8 +196,8 @@ private static void setEgressOperation(SpanData span, AttributesBuilder builder)
195196
* <li>DB
196197
* <li>FAAS
197198
* <li>Messaging
198-
* <li>GraphQL - Special case, if {@link SemanticAttributes#GRAPHQL_OPERATION_TYPE} is present,
199-
* we use it for RemoteOperation and set RemoteService to {@link #GRAPHQL}.
199+
* <li>GraphQL - Special case, if {@link GraphqlIncubatingAttributes#GRAPHQL_OPERATION_TYPE} is
200+
* present, we use it for RemoteOperation and set RemoteService to {@link #GRAPHQL}.
200201
* </ul>
201202
*
202203
* <p>In each case, these span attributes were selected from the OpenTelemetry trace semantic

‎aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.contrib.awsxray;
77

8-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_STATUS_CODE;
8+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_STATUS_CODE;
99

1010
import io.opentelemetry.api.common.Attributes;
1111
import io.opentelemetry.api.metrics.DoubleHistogram;
@@ -39,6 +39,7 @@
3939
* AlwaysRecordSampler}, which will result in 100% of spans being sent to the processor.
4040
*/
4141
@Immutable
42+
@SuppressWarnings("deprecation") // uses deprecated semantic conventions
4243
public final class AwsSpanMetricsProcessor implements SpanProcessor {
4344

4445
private static final double NANOS_TO_MILLIS = 1_000_000.0;

‎aws-xray/src/main/java/io/opentelemetry/contrib/awsxray/SamplingRuleApplier.java‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@
55

66
package io.opentelemetry.contrib.awsxray;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
9+
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_ECS_CONTAINER_ARN;
10+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PLATFORM;
11+
import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
12+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_HOST;
13+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
14+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_TARGET;
15+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_URL;
16+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_HOST_NAME;
17+
818
import io.opentelemetry.api.common.AttributeKey;
919
import io.opentelemetry.api.common.Attributes;
1020
import io.opentelemetry.api.trace.SpanKind;
@@ -17,8 +27,7 @@
1727
import io.opentelemetry.sdk.trace.samplers.Sampler;
1828
import io.opentelemetry.sdk.trace.samplers.SamplingDecision;
1929
import io.opentelemetry.sdk.trace.samplers.SamplingResult;
20-
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
21-
import io.opentelemetry.semconv.trace.attributes.SemanticAttributes;
30+
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
2231
import java.time.Duration;
2332
import java.util.Collections;
2433
import java.util.Date;
@@ -37,14 +46,18 @@ final class SamplingRuleApplier {
3746

3847
static {
3948
Map<String, String> xrayCloudPlatform = new HashMap<>();
40-
xrayCloudPlatform.put(ResourceAttributes.CloudPlatformValues.AWS_EC2, "AWS::EC2::Instance");
41-
xrayCloudPlatform.put(ResourceAttributes.CloudPlatformValues.AWS_ECS, "AWS::ECS::Container");
42-
xrayCloudPlatform.put(ResourceAttributes.CloudPlatformValues.AWS_EKS, "AWS::EKS::Container");
4349
xrayCloudPlatform.put(
44-
ResourceAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK,
50+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_EC2, "AWS::EC2::Instance");
51+
xrayCloudPlatform.put(
52+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_ECS, "AWS::ECS::Container");
53+
xrayCloudPlatform.put(
54+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_EKS, "AWS::EKS::Container");
55+
xrayCloudPlatform.put(
56+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_ELASTIC_BEANSTALK,
4557
"AWS::ElasticBeanstalk::Environment");
4658
xrayCloudPlatform.put(
47-
ResourceAttributes.CloudPlatformValues.AWS_LAMBDA, "AWS::Lambda::Function");
59+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_LAMBDA,
60+
"AWS::Lambda::Function");
4861
XRAY_CLOUD_PLATFORM = Collections.unmodifiableMap(xrayCloudPlatform);
4962
}
5063

@@ -162,15 +175,15 @@ boolean matches(Attributes attributes, Resource resource) {
162175
String host = null;
163176

164177
for (Map.Entry<AttributeKey<?>, Object> entry : attributes.asMap().entrySet()) {
165-
if (entry.getKey().equals(SemanticAttributes.HTTP_TARGET)) {
178+
if (entry.getKey().equals(HTTP_TARGET)) {
166179
httpTarget = (String) entry.getValue();
167-
} else if (entry.getKey().equals(SemanticAttributes.HTTP_URL)) {
180+
} else if (entry.getKey().equals(HTTP_URL)) {
168181
httpUrl = (String) entry.getValue();
169-
} else if (entry.getKey().equals(SemanticAttributes.HTTP_METHOD)) {
182+
} else if (entry.getKey().equals(HTTP_METHOD)) {
170183
httpMethod = (String) entry.getValue();
171-
} else if (entry.getKey().equals(SemanticAttributes.NET_HOST_NAME)) {
184+
} else if (entry.getKey().equals(NET_HOST_NAME)) {
172185
host = (String) entry.getValue();
173-
} else if (entry.getKey().equals(SemanticAttributes.HTTP_HOST)) {
186+
} else if (entry.getKey().equals(HTTP_HOST)) {
174187
// TODO (trask) remove support for deprecated http.host attribute
175188
host = (String) entry.getValue();
176189
}
@@ -207,7 +220,7 @@ boolean matches(Attributes attributes, Resource resource) {
207220
}
208221

209222
return urlPathMatcher.matches(httpTarget)
210-
&& serviceNameMatcher.matches(resource.getAttribute(ResourceAttributes.SERVICE_NAME))
223+
&& serviceNameMatcher.matches(resource.getAttribute(SERVICE_NAME))
211224
&& httpMethodMatcher.matches(httpMethod)
212225
&& hostMatcher.matches(host)
213226
&& serviceTypeMatcher.matches(getServiceType(resource))
@@ -330,29 +343,29 @@ String getRuleName() {
330343

331344
@Nullable
332345
private static String getArn(Attributes attributes, Resource resource) {
333-
String arn = resource.getAttributes().get(ResourceAttributes.AWS_ECS_CONTAINER_ARN);
346+
String arn = resource.getAttributes().get(AWS_ECS_CONTAINER_ARN);
334347
if (arn != null) {
335348
return arn;
336349
}
337-
String cloudPlatform = resource.getAttributes().get(ResourceAttributes.CLOUD_PLATFORM);
338-
if (ResourceAttributes.CloudPlatformValues.AWS_LAMBDA.equals(cloudPlatform)) {
350+
String cloudPlatform = resource.getAttributes().get(CLOUD_PLATFORM);
351+
if (CloudIncubatingAttributes.CloudPlatformIncubatingValues.AWS_LAMBDA.equals(cloudPlatform)) {
339352
return getLambdaArn(attributes, resource);
340353
}
341354
return null;
342355
}
343356

344357
@Nullable
345358
private static String getLambdaArn(Attributes attributes, Resource resource) {
346-
String arn = resource.getAttributes().get(ResourceAttributes.CLOUD_RESOURCE_ID);
359+
String arn = resource.getAttributes().get(CLOUD_RESOURCE_ID);
347360
if (arn != null) {
348361
return arn;
349362
}
350-
return attributes.get(ResourceAttributes.CLOUD_RESOURCE_ID);
363+
return attributes.get(CLOUD_RESOURCE_ID);
351364
}
352365

353366
@Nullable
354367
private static String getServiceType(Resource resource) {
355-
String cloudPlatform = resource.getAttributes().get(ResourceAttributes.CLOUD_PLATFORM);
368+
String cloudPlatform = resource.getAttributes().get(CLOUD_PLATFORM);
356369
if (cloudPlatform == null) {
357370
return null;
358371
}

‎aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsMetricAttributeGeneratorTest.java‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_SPAN_KIND;
1616
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_STREAM_NAME;
1717
import static io.opentelemetry.contrib.awsxray.AwsAttributeKeys.AWS_TABLE_NAME;
18-
import static io.opentelemetry.semconv.resource.attributes.ResourceAttributes.SERVICE_NAME;
19-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DB_OPERATION;
20-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.DB_SYSTEM;
21-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_INVOKED_NAME;
22-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_INVOKED_PROVIDER;
23-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.FAAS_TRIGGER;
24-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.GRAPHQL_OPERATION_TYPE;
25-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_METHOD;
26-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_TARGET;
27-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_URL;
28-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_OPERATION;
29-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.MESSAGING_SYSTEM;
30-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PEER_NAME;
31-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_PEER_PORT;
32-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_ADDR;
33-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_SOCK_PEER_PORT;
34-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.PEER_SERVICE;
35-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_METHOD;
36-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.RPC_SERVICE;
18+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
19+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
20+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
21+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_NAME;
22+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_PROVIDER;
23+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_TRIGGER;
24+
import static io.opentelemetry.semconv.incubating.GraphqlIncubatingAttributes.GRAPHQL_OPERATION_TYPE;
25+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
26+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_TARGET;
27+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_URL;
28+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
29+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
30+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_NAME;
31+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_PORT;
32+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_ADDR;
33+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_PORT;
34+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
35+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
36+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
3737
import static org.assertj.core.api.Assertions.assertThat;
3838
import static org.mockito.Mockito.mock;
3939
import static org.mockito.Mockito.when;
@@ -48,6 +48,7 @@
4848
import org.junit.jupiter.api.Test;
4949

5050
/** Unit tests for {@link AwsMetricAttributeGenerator}. */
51+
@SuppressWarnings("deprecation") // uses deprecated semantic conventions
5152
class AwsMetricAttributeGeneratorTest {
5253

5354
private static final AwsMetricAttributeGenerator GENERATOR = new AwsMetricAttributeGenerator();

‎aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsSpanMetricsProcessorTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package io.opentelemetry.contrib.awsxray;
77

8-
import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.HTTP_STATUS_CODE;
8+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_STATUS_CODE;
99
import static org.assertj.core.api.Assertions.assertThat;
1010
import static org.mockito.ArgumentMatchers.any;
1111
import static org.mockito.ArgumentMatchers.eq;
@@ -36,6 +36,7 @@
3636
import org.junit.jupiter.api.Test;
3737

3838
/** Unit tests for {@link AwsSpanMetricsProcessor}. */
39+
@SuppressWarnings("deprecation") // uses deprecated semantic conventions
3940
class AwsSpanMetricsProcessorTest {
4041
// Test constants
4142
private static final boolean CONTAINS_ATTRIBUTES = true;

‎aws-xray/src/test/java/io/opentelemetry/contrib/awsxray/AwsXrayRemoteSamplerProviderTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
package io.opentelemetry.contrib.awsxray;
77

8+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
89
import static org.assertj.core.api.Assertions.assertThat;
910

1011
import io.opentelemetry.sdk.autoconfigure.AutoConfiguredOpenTelemetrySdk;
1112
import io.opentelemetry.sdk.trace.SdkTracerProvider;
12-
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
1313
import java.util.HashMap;
1414
import java.util.Map;
1515
import org.junit.jupiter.api.Test;
@@ -43,7 +43,7 @@ void serviceNameOnly() {
4343
sampler -> {
4444
assertThat(sampler.getClient().getSamplingRulesEndpoint())
4545
.isEqualTo("http://localhost:2000/GetSamplingRules");
46-
assertThat(sampler.getResource().getAttribute(ResourceAttributes.SERVICE_NAME))
46+
assertThat(sampler.getResource().getAttribute(SERVICE_NAME))
4747
.isEqualTo("cat-service");
4848
});
4949
}
@@ -74,7 +74,7 @@ void setEndpoint() {
7474
sampler -> {
7575
assertThat(sampler.getClient().getSamplingRulesEndpoint())
7676
.isEqualTo("http://localhost:3000/GetSamplingRules");
77-
assertThat(sampler.getResource().getAttribute(ResourceAttributes.SERVICE_NAME))
77+
assertThat(sampler.getResource().getAttribute(SERVICE_NAME))
7878
.isEqualTo("cat-service");
7979
});
8080
}

0 commit comments

Comments
 (0)