open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove aws.endpoint attribute from sqs (#13620) 

Co-authored-by: Lauri Tulmin <tulmin@gmail.com>
Co-authored-by: Steve Rao <raozihao.rzh@alibaba-inc.com>
This commit is contained in:
crossoverJie 2025-04-02 18:31:01 +08:00 committed by GitHub
parent cba8fd8d42
commit 9fa80a421c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
12 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ class AwsSpanAssertions {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
equalTo(stringKey("aws.queue.name"), queueName),
equalTo(stringKey("aws.queue.url"), queueUrl),
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
@ -66,7 +65,6 @@ class AwsSpanAssertions {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
equalTo(stringKey("aws.bucket.name"), bucketName),
equalTo(RPC_METHOD, rpcMethod),
equalTo(RPC_SYSTEM, "aws-api"),
@ -92,7 +90,6 @@ class AwsSpanAssertions {
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(MESSAGING_DESTINATION_NAME, topicArn),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
equalTo(RPC_METHOD, rpcMethod),
equalTo(RPC_SYSTEM, "aws-api"),

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

@ -131,7 +131,6 @@ class S3ClientTest extends AbstractS3ClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "HeadBucket"),
equalTo(stringKey("aws.endpoint"), "https://s3.amazonaws.com"),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, IllegalStateException.class.getName()))));

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

@ -99,7 +99,6 @@ class S3TracingTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
equalTo(stringKey("aws.queue.url"), queueUrl),
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
equalTo(RPC_METHOD, "ReceiveMessage"),
@ -192,7 +191,6 @@ class S3TracingTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
equalTo(stringKey("aws.queue.url"), queueUrl),
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
equalTo(RPC_METHOD, "ReceiveMessage"),

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

@ -83,7 +83,6 @@ class SnsTracingTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), v -> v.isInstanceOf(String.class)),
equalTo(stringKey("aws.queue.url"), queueUrl),
satisfies(AWS_REQUEST_ID, v -> v.isInstanceOf(String.class)),
equalTo(RPC_METHOD, "ReceiveMessage"),

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

@ -218,7 +218,6 @@ class Aws0ClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
satisfies(RPC_SERVICE, v -> v.contains(service)),
equalTo(RPC_METHOD, operation),
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
equalTo(stringKey("aws.agent"), "java-aws-sdk")));
additionalAttributes.forEach((k, v) -> attributes.add(equalTo(stringKey(k), v)));
@ -266,7 +265,6 @@ class Aws0ClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "GetObject"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + UNUSABLE_PORT),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, AmazonClientException.class.getName()))));
@ -304,7 +302,6 @@ class Aws0ClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "GetObject"),
equalTo(stringKey("aws.endpoint"), "https://s3.amazonaws.com"),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, IllegalStateException.class.getName()))));
@ -344,7 +341,6 @@ class Aws0ClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "GetObject"),
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, AmazonClientException.class.getName()))));

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

@ -11,7 +11,6 @@ import io.opentelemetry.api.common.AttributeKey;
final class AwsExperimentalAttributes {
static final AttributeKey<String> AWS_AGENT = stringKey("aws.agent");
static final AttributeKey<String> AWS_ENDPOINT = stringKey("aws.endpoint");
static final AttributeKey<String> AWS_BUCKET_NAME = stringKey("aws.bucket.name");
static final AttributeKey<String> AWS_QUEUE_URL = stringKey("aws.queue.url");
static final AttributeKey<String> AWS_QUEUE_NAME = stringKey("aws.queue.name");

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

@ -7,7 +7,6 @@ package io.opentelemetry.instrumentation.awssdk.v1_11;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_AGENT;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_BUCKET_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_ENDPOINT;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_NAME;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_QUEUE_URL;
import static io.opentelemetry.instrumentation.awssdk.v1_11.AwsExperimentalAttributes.AWS_STREAM_NAME;
@ -29,7 +28,6 @@ class AwsSdkExperimentalAttributesExtractor
@Override
public void onStart(AttributesBuilder attributes, Context parentContext, Request<?> request) {
attributes.put(AWS_AGENT, COMPONENT_NAME);
attributes.put(AWS_ENDPOINT, request.getEndpoint().toString());
Object originalRequest = request.getOriginalRequest();
setRequestAttribute(attributes, AWS_BUCKET_NAME, originalRequest, RequestAccess::getBucketName);

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

@ -103,7 +103,6 @@ public abstract class AbstractBaseAwsClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
satisfies(RPC_SERVICE, v -> v.contains(service)),
equalTo(RPC_METHOD, operation),
equalTo(stringKey("aws.endpoint"), endpoint.getServiceEndpoint()),
equalTo(stringKey("aws.agent"), "java-aws-sdk")));
if (hasRequestId()) {

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

@ -128,8 +128,6 @@ public abstract class AbstractS3ClientTest extends AbstractBaseAwsClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "GetObject"),
equalTo(
stringKey("aws.endpoint"), "http://127.0.0.1:" + UNUSABLE_PORT),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, SdkClientException.class.getName()))));
@ -175,7 +173,6 @@ public abstract class AbstractS3ClientTest extends AbstractBaseAwsClientTest {
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_SERVICE, "Amazon S3"),
equalTo(RPC_METHOD, "GetObject"),
equalTo(stringKey("aws.endpoint"), server.httpUri().toString()),
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.bucket.name"), "someBucket"),
equalTo(ERROR_TYPE, SdkClientException.class.getName()))));

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

@ -105,7 +105,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(RPC_SYSTEM, "aws-api"),
@ -125,7 +124,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -153,7 +151,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -211,7 +208,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(RPC_SYSTEM, "aws-api"),
@ -231,7 +227,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -259,7 +254,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -298,7 +292,6 @@ public abstract class AbstractSqsSuppressReceiveSpansTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),

12
instrumentation/aws-sdk/aws-sdk-1.11/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java
View File

@ -139,7 +139,6 @@ public abstract class AbstractSqsTracingTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(RPC_SYSTEM, "aws-api"),
@ -158,7 +157,6 @@ public abstract class AbstractSqsTracingTest {
new ArrayList<>(
Arrays.asList(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -200,7 +198,6 @@ public abstract class AbstractSqsTracingTest {
new ArrayList<>(
Arrays.asList(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -239,7 +236,6 @@ public abstract class AbstractSqsTracingTest {
new ArrayList<>(
Arrays.asList(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -309,7 +305,6 @@ public abstract class AbstractSqsTracingTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(stringKey("aws.queue.name"), "testSdkSqs"),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(RPC_SYSTEM, "aws-api"),
@ -329,7 +324,6 @@ public abstract class AbstractSqsTracingTest {
.hasNoParent()
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:" + sqsPort + "/000000000000/testSdkSqs"),
@ -368,8 +362,6 @@ public abstract class AbstractSqsTracingTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:"
@ -392,8 +384,6 @@ public abstract class AbstractSqsTracingTest {
.hasParent(trace.getSpan(0))
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:"
@ -426,8 +416,6 @@ public abstract class AbstractSqsTracingTest {
.hasParent(receiveSpan.get())
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
equalTo(
stringKey("aws.endpoint"), "http://localhost:" + sqsPort),
equalTo(
stringKey("aws.queue.url"),
"http://localhost:"

3
instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java
View File

@ -69,7 +69,6 @@ class AwsSpanAssertions {
attributeAssertions.addAll(
Arrays.asList(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), val -> val.isInstanceOf(String.class)),
satisfies(
stringKey("aws.queue.name"),
val ->
@ -124,7 +123,6 @@ class AwsSpanAssertions {
return span.hasName(spanName)
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), val -> val.isInstanceOf(String.class)),
equalTo(stringKey("aws.bucket.name"), bucketName),
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_METHOD, spanName.substring(3)),
@ -146,7 +144,6 @@ class AwsSpanAssertions {
.hasKind(CLIENT)
.hasAttributesSatisfyingExactly(
equalTo(stringKey("aws.agent"), "java-aws-sdk"),
satisfies(stringKey("aws.endpoint"), val -> val.isInstanceOf(String.class)),
satisfies(AWS_REQUEST_ID, val -> val.isInstanceOf(String.class)),
equalTo(RPC_SYSTEM, "aws-api"),
equalTo(RPC_METHOD, spanName.substring(4)),