Skip to content

Commit 9fa80a4

Browse files
crossoverJielauritsteverao
authored
remove aws.endpoint attribute from sqs (#13620)
Co-authored-by: Lauri Tulmin <[email protected]> Co-authored-by: Steve Rao <[email protected]>
1 parent cba8fd8 commit 9fa80a4

File tree

12 files changed

+0
-40
lines changed

12 files changed

+0
-40
lines changed

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSpanAssertions.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ static SpanDataAssert sqs(
3434
.hasNoParent()
3535
.hasAttributesSatisfyingExactly(
3636
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
37-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
3837
equalTo(stringKey("aws.queue.name"), queueName),
3938
equalTo(stringKey("aws.queue.url"), queueUrl),
4039
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
@@ -66,7 +65,6 @@ static SpanDataAssert s3(
6665
.hasNoParent()
6766
.hasAttributesSatisfyingExactly(
6867
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
69-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
7068
equalTo(stringKey("aws.bucket.name"), bucketName),
7169
equalTo(RPC_METHOD, rpcMethod),
7270
equalTo(RPC_SYSTEM, "aws-api"),
@@ -92,7 +90,6 @@ static SpanDataAssert sns(SpanDataAssert span, String topicArn, String rpcMethod
9290
.hasAttributesSatisfyingExactly(
9391
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
9492
equalTo(MESSAGING_DESTINATION_NAME, topicArn),
95-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
9693
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
9794
equalTo(RPC_METHOD, rpcMethod),
9895
equalTo(RPC_SYSTEM, "aws-api"),

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ public void beforeRequest(Request<?> request) {
131131
equalTo(RPC_SYSTEM, "aws-api"),
132132
equalTo(RPC_SERVICE, "Amazon S3"),
133133
equalTo(RPC_METHOD, "HeadBucket"),
134-
equalTo(stringKey("aws.endpoint"), "https://s3.amazonaws.com"),
135134
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
136135
equalTo(stringKey("aws.bucket.name"), "someBucket"),
137136
equalTo(ERROR_TYPE, IllegalStateException.class.getName()))));

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3TracingTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ void testS3UploadTriggersSqsMessage() {
9999
.hasParent(trace.getSpan(0))
100100
.hasAttributesSatisfyingExactly(
101101
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
102-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
103102
equalTo(stringKey("aws.queue.url"), queueUrl),
104103
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
105104
equalTo(RPC_METHOD, "ReceiveMessage"),
@@ -192,7 +191,6 @@ void testS3UploadTriggersSnsTopicNotificationThenCreatesSqsMessage() {
192191
.hasNoParent()
193192
.hasAttributesSatisfyingExactly(
194193
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
195-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
196194
equalTo(stringKey("aws.queue.url"), queueUrl),
197195
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
198196
equalTo(RPC_METHOD, "ReceiveMessage"),

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SnsTracingTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ void testSnsNotificationTriggersSqsMessageConsumedWithAwsSdk() {
8383
.hasParent(trace.getSpan(0))
8484
.hasAttributesSatisfyingExactly(
8585
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
86-
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
8786
equalTo(stringKey("aws.queue.url"), queueUrl),
8887
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
8988
equalTo(RPC_METHOD, "ReceiveMessage"),

‎instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test_before_1_11_106/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws0ClientTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@ void testSendRequestWithMockedResponse(
218218
equalTo(RPC_SYSTEM, "aws-api"),
219219
satisfies(RPC_SERVICE, v -> v.contains(service)),
220220
equalTo(RPC_METHOD, operation),
221-
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
222221
equalTo(stringKey("aws.agent"), "java-aws-sdk")));
223222

224223
additionalAttributes.forEach((k, v) -> attributes.add(equalTo(stringKey(k), v)));
@@ -266,7 +265,6 @@ void testSendS3RequestToClosedPort() {
266265
equalTo(RPC_SYSTEM, "aws-api"),
267266
equalTo(RPC_SERVICE, "Amazon S3"),
268267
equalTo(RPC_METHOD, "GetObject"),
269-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + UNUSABLE_PORT),
270268
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
271269
equalTo(stringKey("aws.bucket.name"), "someBucket"),
272270
equalTo(ERROR_TYPE, AmazonClientException.class.getName()))));
@@ -304,7 +302,6 @@ public void beforeRequest(Request<?> request) {
304302
equalTo(RPC_SYSTEM, "aws-api"),
305303
equalTo(RPC_SERVICE, "Amazon S3"),
306304
equalTo(RPC_METHOD, "GetObject"),
307-
equalTo(stringKey("aws.endpoint"), "https://s3.amazonaws.com"),
308305
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
309306
equalTo(stringKey("aws.bucket.name"), "someBucket"),
310307
equalTo(ERROR_TYPE, IllegalStateException.class.getName()))));
@@ -344,7 +341,6 @@ void testTimeoutAndRetryErrorsAreNotCaptured() {
344341
equalTo(RPC_SYSTEM, "aws-api"),
345342
equalTo(RPC_SERVICE, "Amazon S3"),
346343
equalTo(RPC_METHOD, "GetObject"),
347-
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
348344
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
349345
equalTo(stringKey("aws.bucket.name"), "someBucket"),
350346
equalTo(ERROR_TYPE, AmazonClientException.class.getName()))));

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsExperimentalAttributes.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
final class AwsExperimentalAttributes {
1313
static final AttributeKey<String> AWS_AGENT = stringKey("aws.agent");
14-
static final AttributeKey<String> AWS_ENDPOINT = stringKey("aws.endpoint");
1514
static final AttributeKey<String> AWS_BUCKET_NAME = stringKey("aws.bucket.name");
1615
static final AttributeKey<String> AWS_QUEUE_URL = stringKey("aws.queue.url");
1716
static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");

‎instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkExperimentalAttributesExtractor.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_AGENT;
99
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_BUCKET_NAME;
10-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_ENDPOINT;
1110
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_NAME;
1211
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_URL;
1312
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_STREAM_NAME;
@@ -29,7 +28,6 @@ class AwsSdkExperimentalAttributesExtractor
2928
@Override
3029
public void onStart(AttributesBuilder attributes, Context parentContext, Request<?> request) {
3130
attributes.put(AWS_AGENT, COMPONENT_NAME);
32-
attributes.put(AWS_ENDPOINT, request.getEndpoint().toString());
3331

3432
Object originalRequest = request.getOriginalRequest();
3533
setRequestAttribute(attributes, AWS_BUCKET_NAME, originalRequest, RequestAccess::getBucketName);

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ public void assertRequestWithMockedResponse(
103103
equalTo(RPC_SYSTEM, "aws-api"),
104104
satisfies(RPC_SERVICE, v -> v.contains(service)),
105105
equalTo(RPC_METHOD, operation),
106-
equalTo(stringKey("aws.endpoint"), endpoint.getServiceEndpoint()),
107106
equalTo(stringKey("aws.agent"), "java-aws-sdk")));
108107

109108
if (hasRequestId()) {

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractS3ClientTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,6 @@ public void testSendRequestToClosedPort() {
128128
equalTo(RPC_SYSTEM, "aws-api"),
129129
equalTo(RPC_SERVICE, "Amazon S3"),
130130
equalTo(RPC_METHOD, "GetObject"),
131-
equalTo(
132-
stringKey("aws.endpoint"), "http://127.0.0.1:" + UNUSABLE_PORT),
133131
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
134132
equalTo(stringKey("aws.bucket.name"), "someBucket"),
135133
equalTo(ERROR_TYPE, SdkClientException.class.getName()))));
@@ -175,7 +173,6 @@ void testTimeoutAndRetryErrorsNotCaptured() {
175173
equalTo(RPC_SYSTEM, "aws-api"),
176174
equalTo(RPC_SERVICE, "Amazon S3"),
177175
equalTo(RPC_METHOD, "GetObject"),
178-
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
179176
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
180177
equalTo(stringKey("aws.bucket.name"), "someBucket"),
181178
equalTo(ERROR_TYPE, SdkClientException.class.getName()))));

‎instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ void testSimpleSqsProducerConsumerServices() {
105105
.hasNoParent()
106106
.hasAttributesSatisfyingExactly(
107107
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
108-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
109108
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
110109
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
111110
equalTo(RPC_SYSTEM, "aws-api"),
@@ -125,7 +124,6 @@ void testSimpleSqsProducerConsumerServices() {
125124
.hasNoParent()
126125
.hasAttributesSatisfyingExactly(
127126
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
128-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
129127
equalTo(
130128
stringKey("aws.queue.url"),
131129
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@@ -153,7 +151,6 @@ void testSimpleSqsProducerConsumerServices() {
153151
.hasParent(trace.getSpan(0))
154152
.hasAttributesSatisfyingExactly(
155153
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
156-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
157154
equalTo(
158155
stringKey("aws.queue.url"),
159156
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@@ -211,7 +208,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
211208
.hasNoParent()
212209
.hasAttributesSatisfyingExactly(
213210
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
214-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
215211
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
216212
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
217213
equalTo(RPC_SYSTEM, "aws-api"),
@@ -231,7 +227,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
231227
.hasNoParent()
232228
.hasAttributesSatisfyingExactly(
233229
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
234-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
235230
equalTo(
236231
stringKey("aws.queue.url"),
237232
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@@ -259,7 +254,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
259254
.hasParent(trace.getSpan(0))
260255
.hasAttributesSatisfyingExactly(
261256
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
262-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
263257
equalTo(
264258
stringKey("aws.queue.url"),
265259
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@@ -298,7 +292,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
298292
.hasParent(trace.getSpan(0))
299293
.hasAttributesSatisfyingExactly(
300294
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
301-
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
302295
equalTo(
303296
stringKey("aws.queue.url"),
304297
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),

0 commit comments

Comments
 (0)