Skip to content

Commit ce79a85

Browse files
lukeina2zlukeina2z
authored
fix(deps): update dependency otel/semconv to v1.29.0 (#1145)
This PR upgrades these two upstream dependencies in ADOT Java from v1.28.0 to v1.29.0. io.opentelemetry.semconv:opentelemetry-semconv io.opentelemetry.semconv:opentelemetry-semconv-incubating Upstream OTel Java Agent v2.11 is using semconv v1.29.0, not v1.28.0. This PR keeps OTel and ADOT in sync automatically on semconv. ADOT now relies on "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha" to get the version of semconv, instead of explicitly declaring one. In March 2024, upstream stopped using semconv keys from package "io.opentelemetry.semconv.SemanticAttributes". Semconv 1.25.0 migration #10983 open-telemetry/opentelemetry-java-instrumentation#10983 ADOT Java did not follow. It's still using keys from this package: https://github.com/aws-observability/aws-otel-java-instrumentation/blob/release/v2.11.x/awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtil.java#L18 Unfortunately, in this Jan., this package was deleted from upstream. This is causing ADOT Java build break if we need upgrade upstream dependencies. This PR replaces these old keys in ADOT Java code base. Basically, it is doing the same update upstream had done in last March. The code change is safe. It has a limited scope that only updates the definitions of semconv keys. The text content of these keys remain untouched. Test: ./gradlew build Pass ./gradlew test. Pass Manual E2E test Pass Backward Compatibility: This change is backward compatible. It does not change any runtime behaviors. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 4e45621 commit ce79a85

File tree

10 files changed

+106
-67
lines changed

10 files changed

+106
-67
lines changed

‎awsagentprovider/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ base {
2626

2727
dependencies {
2828
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
29-
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha")
30-
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha")
29+
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv")
30+
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
31+
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv")
32+
testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
3133
compileOnly("com.google.errorprone:error_prone_annotations:2.19.1")
3234
compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi")
3335
compileOnly("org.slf4j:slf4j-api")

‎awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGenerator.java

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,34 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.DB_CONNECTION_STRING;
19-
import static io.opentelemetry.semconv.SemanticAttributes.DB_NAME;
20-
import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION;
21-
import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT;
22-
import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM;
23-
import static io.opentelemetry.semconv.SemanticAttributes.DB_USER;
24-
import static io.opentelemetry.semconv.SemanticAttributes.FAAS_INVOKED_NAME;
25-
import static io.opentelemetry.semconv.SemanticAttributes.FAAS_TRIGGER;
26-
import static io.opentelemetry.semconv.SemanticAttributes.GRAPHQL_OPERATION_TYPE;
27-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD;
28-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD;
29-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE;
30-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_STATUS_CODE;
31-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_URL;
32-
import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION;
33-
import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_SYSTEM;
34-
import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_PEER_ADDRESS;
35-
import static io.opentelemetry.semconv.SemanticAttributes.NETWORK_PEER_PORT;
36-
import static io.opentelemetry.semconv.SemanticAttributes.NET_PEER_NAME;
37-
import static io.opentelemetry.semconv.SemanticAttributes.NET_PEER_PORT;
38-
import static io.opentelemetry.semconv.SemanticAttributes.NET_SOCK_PEER_ADDR;
39-
import static io.opentelemetry.semconv.SemanticAttributes.NET_SOCK_PEER_PORT;
40-
import static io.opentelemetry.semconv.SemanticAttributes.PEER_SERVICE;
41-
import static io.opentelemetry.semconv.SemanticAttributes.RPC_METHOD;
42-
import static io.opentelemetry.semconv.SemanticAttributes.RPC_SERVICE;
43-
import static io.opentelemetry.semconv.SemanticAttributes.SERVER_ADDRESS;
44-
import static io.opentelemetry.semconv.SemanticAttributes.SERVER_PORT;
45-
import static io.opentelemetry.semconv.SemanticAttributes.SERVER_SOCKET_ADDRESS;
46-
import static io.opentelemetry.semconv.SemanticAttributes.SERVER_SOCKET_PORT;
47-
import static io.opentelemetry.semconv.SemanticAttributes.URL_FULL;
18+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
19+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
20+
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
21+
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
22+
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
23+
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
24+
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
25+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
26+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
27+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
28+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
29+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
30+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
31+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_NAME;
32+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_TRIGGER;
33+
import static io.opentelemetry.semconv.incubating.GraphqlIncubatingAttributes.GRAPHQL_OPERATION_TYPE;
34+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
35+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_STATUS_CODE;
36+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_URL;
37+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
38+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
39+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_NAME;
40+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_PORT;
41+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_ADDR;
42+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_PORT;
43+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
44+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
45+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
4846
import static software.amazon.opentelemetry.javaagent.providers.AwsApplicationSignalsCustomizerProvider.LAMBDA_APPLICATION_SIGNALS_REMOTE_ENVIRONMENT;
4947
import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_AGENT_ID;
5048
import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_AUTH_ACCESS_KEY;
@@ -99,8 +97,6 @@
9997
import io.opentelemetry.sdk.trace.data.EventData;
10098
import io.opentelemetry.sdk.trace.data.ExceptionEventData;
10199
import io.opentelemetry.sdk.trace.data.SpanData;
102-
import io.opentelemetry.semconv.ResourceAttributes;
103-
import io.opentelemetry.semconv.SemanticAttributes;
104100
import java.lang.reflect.Method;
105101
import java.net.MalformedURLException;
106102
import java.net.URI;
@@ -126,6 +122,14 @@
126122
* represent "outgoing" traffic, and {@link SpanKind#INTERNAL} spans are ignored.
127123
*/
128124
final class AwsMetricAttributeGenerator implements MetricAttributeGenerator {
125+
// ToDo: These two keys were deleted by upstream. Code need to be updated to capture the same
126+
// information by using new keys.
127+
// https://github.com/open-telemetry/semantic-conventions-java/blob/release/v1.28.0/semconv/src/main/java/io/opentelemetry/semconv/SemanticAttributes.java#L3784-L3795
128+
static final AttributeKey<String> SERVER_SOCKET_ADDRESS =
129+
io.opentelemetry.api.common.AttributeKey.stringKey("server.socket.address");
130+
131+
static final AttributeKey<Long> SERVER_SOCKET_PORT =
132+
io.opentelemetry.api.common.AttributeKey.longKey("server.socket.port");
129133

130134
private static final Logger logger =
131135
Logger.getLogger(AwsMetricAttributeGenerator.class.getName());

‎awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsResourceAttributeConfigurator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
18+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
1919
import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LOCAL_SERVICE;
2020
import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.UNKNOWN_SERVICE;
2121

‎awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanMetricsProcessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE;
19-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_STATUS_CODE;
18+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
19+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_STATUS_CODE;
2020
import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_REMOTE_SERVICE;
2121
import static software.amazon.opentelemetry.javaagent.providers.AwsSpanProcessingUtil.isKeyPresent;
2222

‎awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtil.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.DB_OPERATION;
19-
import static io.opentelemetry.semconv.SemanticAttributes.DB_STATEMENT;
20-
import static io.opentelemetry.semconv.SemanticAttributes.DB_SYSTEM;
21-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_METHOD;
22-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_REQUEST_METHOD;
23-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_TARGET;
24-
import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION;
25-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.PROCESS;
26-
import static io.opentelemetry.semconv.SemanticAttributes.RPC_SYSTEM;
27-
import static io.opentelemetry.semconv.SemanticAttributes.URL_PATH;
18+
import static io.opentelemetry.semconv.UrlAttributes.URL_PATH;
19+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
20+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
21+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
22+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
23+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_REQUEST_METHOD;
24+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_TARGET;
25+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
26+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
27+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
2828
import static software.amazon.opentelemetry.javaagent.providers.AwsApplicationSignalsCustomizerProvider.AWS_LAMBDA_FUNCTION_NAME_CONFIG;
2929
import static software.amazon.opentelemetry.javaagent.providers.AwsApplicationSignalsCustomizerProvider.isLambdaEnvironment;
3030
import static software.amazon.opentelemetry.javaagent.providers.AwsAttributeKeys.AWS_LAMBDA_LOCAL_OPERATION_OVERRIDE;

‎awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AttributePropagatingSpanProcessorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION;
19-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.PROCESS;
20-
import static io.opentelemetry.semconv.SemanticAttributes.RPC_SYSTEM;
18+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
19+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
20+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
2121
import static org.assertj.core.api.Assertions.assertThat;
2222

2323
import io.opentelemetry.api.common.AttributeKey;

‎awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java

Lines changed: 41 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,39 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
19-
import static io.opentelemetry.semconv.SemanticAttributes.*;
20-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.PROCESS;
18+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
19+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
20+
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_ADDRESS;
21+
import static io.opentelemetry.semconv.NetworkAttributes.NETWORK_PEER_PORT;
22+
import static io.opentelemetry.semconv.ServerAttributes.SERVER_ADDRESS;
23+
import static io.opentelemetry.semconv.ServerAttributes.SERVER_PORT;
24+
import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_NAME;
25+
import static io.opentelemetry.semconv.UrlAttributes.URL_FULL;
26+
import static io.opentelemetry.semconv.UrlAttributes.URL_PATH;
27+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_CONNECTION_STRING;
28+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_NAME;
29+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_OPERATION;
30+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_STATEMENT;
31+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_SYSTEM;
32+
import static io.opentelemetry.semconv.incubating.DbIncubatingAttributes.DB_USER;
33+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_NAME;
34+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_INVOKED_PROVIDER;
35+
import static io.opentelemetry.semconv.incubating.FaasIncubatingAttributes.FAAS_TRIGGER;
36+
import static io.opentelemetry.semconv.incubating.GraphqlIncubatingAttributes.GRAPHQL_OPERATION_TYPE;
37+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_METHOD;
38+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_TARGET;
39+
import static io.opentelemetry.semconv.incubating.HttpIncubatingAttributes.HTTP_URL;
40+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
41+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_SYSTEM;
42+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
43+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_NAME;
44+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_PEER_PORT;
45+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_ADDR;
46+
import static io.opentelemetry.semconv.incubating.NetIncubatingAttributes.NET_SOCK_PEER_PORT;
47+
import static io.opentelemetry.semconv.incubating.PeerIncubatingAttributes.PEER_SERVICE;
48+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_METHOD;
49+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SERVICE;
50+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
2151
import static org.assertj.core.api.Assertions.assertThat;
2252
import static org.mockito.Mockito.mock;
2353
import static org.mockito.Mockito.when;
@@ -1237,28 +1267,28 @@ public void testDBClientSpanWithRemoteResourceAttributes() {
12371267
// Validate behaviour of DB_NAME, SERVER_SOCKET_ADDRESS and SERVER_SOCKET_PORT exist, then
12381268
// remove it.
12391269
mockAttribute(DB_NAME, "db_name");
1240-
mockAttribute(SERVER_SOCKET_ADDRESS, "abc.com");
1241-
mockAttribute(SERVER_SOCKET_PORT, 3306L);
1270+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_ADDRESS, "abc.com");
1271+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_PORT, 3306L);
12421272
validateRemoteResourceAttributes("DB::Connection", "db_name|abc.com|3306");
12431273
mockAttribute(DB_NAME, null);
1244-
mockAttribute(SERVER_SOCKET_ADDRESS, null);
1245-
mockAttribute(SERVER_SOCKET_PORT, null);
1274+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_ADDRESS, null);
1275+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_PORT, null);
12461276

12471277
// Validate behaviour of DB_NAME, SERVER_SOCKET_ADDRESS exist, then remove it.
12481278
mockAttribute(DB_NAME, "db_name");
1249-
mockAttribute(SERVER_SOCKET_ADDRESS, "abc.com");
1279+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_ADDRESS, "abc.com");
12501280
validateRemoteResourceAttributes("DB::Connection", "db_name|abc.com");
12511281
mockAttribute(DB_NAME, null);
1252-
mockAttribute(SERVER_SOCKET_ADDRESS, null);
1282+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_ADDRESS, null);
12531283

12541284
// Validate behaviour of SERVER_SOCKET_PORT exist, then remove it.
1255-
mockAttribute(SERVER_SOCKET_PORT, 3306L);
1285+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_PORT, 3306L);
12561286
when(spanDataMock.getKind()).thenReturn(SpanKind.CLIENT);
12571287
actualAttributes =
12581288
GENERATOR.generateMetricAttributeMapFromSpan(spanDataMock, resource).get(DEPENDENCY_METRIC);
12591289
assertThat(actualAttributes.get(AWS_REMOTE_RESOURCE_TYPE)).isNull();
12601290
assertThat(actualAttributes.get(AWS_REMOTE_RESOURCE_IDENTIFIER)).isNull();
1261-
mockAttribute(SERVER_SOCKET_PORT, null);
1291+
mockAttribute(AwsMetricAttributeGenerator.SERVER_SOCKET_PORT, null);
12621292

12631293
// Validate behaviour of only DB_NAME exist, then remove it.
12641294
mockAttribute(DB_NAME, "db_name");

‎awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributesSpanExporterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.MESSAGING_OPERATION;
19-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.PROCESS;
18+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
19+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
2020
import static org.assertj.core.api.Assertions.assertThat;
2121
import static org.mockito.ArgumentMatchers.eq;
2222
import static org.mockito.Mockito.mock;

‎awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanMetricsProcessorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.HTTP_RESPONSE_STATUS_CODE;
18+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_RESPONSE_STATUS_CODE;
1919
import static org.assertj.core.api.Assertions.assertThat;
2020
import static org.mockito.ArgumentMatchers.any;
2121
import static org.mockito.ArgumentMatchers.eq;

‎awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsSpanProcessingUtilTest.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515

1616
package software.amazon.opentelemetry.javaagent.providers;
1717

18-
import static io.opentelemetry.semconv.SemanticAttributes.*;
19-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.PROCESS;
20-
import static io.opentelemetry.semconv.SemanticAttributes.MessagingOperationValues.RECEIVE;
18+
import static io.opentelemetry.semconv.HttpAttributes.HTTP_REQUEST_METHOD;
19+
import static io.opentelemetry.semconv.UrlAttributes.URL_PATH;
20+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_OPERATION;
21+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.PROCESS;
22+
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MessagingOperationTypeIncubatingValues.RECEIVE;
23+
import static io.opentelemetry.semconv.incubating.RpcIncubatingAttributes.RPC_SYSTEM;
2124
import static org.assertj.core.api.Assertions.assertThat;
2225
import static org.mockito.Answers.CALLS_REAL_METHODS;
2326
import static org.mockito.Mockito.mock;

0 commit comments

Comments
 (0)