Skip to content

remove aws.endpoint attr from sqs #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove aws.endpoint attr from sqs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .../test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/AwsSpanAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ static SpanDataAssert sqs(
.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)),
Expand Down Expand Up @@ -66,7 +65,6 @@ static SpanDataAssert s3(
.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"),
Expand All @@ -92,7 +90,6 @@ static SpanDataAssert sns(SpanDataAssert span, String topicArn, String rpcMethod
.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"),
Expand Down
1 change: 0 additions & 1 deletion ...t/src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ public void beforeRequest(Request<?> request) {
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()))));
Expand Down
2 changes: 0 additions & 2 deletions .../src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/S3TracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ void testS3UploadTriggersSqsMessage() {
.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"),
Expand Down Expand Up @@ -192,7 +191,6 @@ void testS3UploadTriggersSnsTopicNotificationThenCreatesSqsMessage() {
.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"),
Expand Down
1 change: 0 additions & 1 deletion ...src/test/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/SnsTracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ void testSnsNotificationTriggersSqsMessageConsumedWithAwsSdk() {
.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"),
Expand Down
4 changes: 0 additions & 4 deletions ...1_11_106/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/Aws0ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,6 @@ void testSendRequestWithMockedResponse(
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)));
Expand Down Expand Up @@ -266,7 +265,6 @@ void testSendS3RequestToClosedPort() {
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()))));
Expand Down Expand Up @@ -304,7 +302,6 @@ public void beforeRequest(Request<?> request) {
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()))));
Expand Down Expand Up @@ -344,7 +341,6 @@ void testTimeoutAndRetryErrorsAreNotCaptured() {
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()))));
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AwsExperimentalAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

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");
Expand Down
2 changes: 0 additions & 2 deletions .../io/opentelemetry/instrumentation/awssdk/v1_11/AwsSdkExperimentalAttributesExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

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;
Expand All @@ -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);
Expand Down
1 change: 0 additions & 1 deletion ...rc/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractBaseAwsClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ public void assertRequestWithMockedResponse(
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()) {
Expand Down
3 changes: 0 additions & 3 deletions ...ing/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractS3ClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ public void testSendRequestToClosedPort() {
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()))));
Expand Down Expand Up @@ -175,7 +173,6 @@ void testTimeoutAndRetryErrorsNotCaptured() {
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()))));
Expand Down
7 changes: 0 additions & 7 deletions ...va/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsSuppressReceiveSpansTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ void testSimpleSqsProducerConsumerServices() {
.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"),
Expand All @@ -125,7 +124,6 @@ void testSimpleSqsProducerConsumerServices() {
.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"),
Expand Down Expand Up @@ -153,7 +151,6 @@ void testSimpleSqsProducerConsumerServices() {
.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"),
Expand Down Expand Up @@ -211,7 +208,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand All @@ -231,7 +227,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand Down Expand Up @@ -259,7 +254,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand Down Expand Up @@ -298,7 +292,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand Down
12 changes: 0 additions & 12 deletions ...g/src/main/java/io/opentelemetry/instrumentation/awssdk/v1_11/AbstractSqsTracingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
.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"),
Expand All @@ -158,7 +157,6 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
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"),
Expand Down Expand Up @@ -200,7 +198,6 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
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"),
Expand Down Expand Up @@ -239,7 +236,6 @@ void testSimpleSqsProducerConsumerServicesCaptureHeaders(boolean testCaptureHead
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"),
Expand Down Expand Up @@ -309,7 +305,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand All @@ -329,7 +324,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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"),
Expand Down Expand Up @@ -368,8 +362,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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:"
Expand All @@ -392,8 +384,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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:"
Expand Down Expand Up @@ -426,8 +416,6 @@ void testSimpleSqsProducerConsumerServicesWithParentSpan() {
.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:"
Expand Down
3 changes: 0 additions & 3 deletions ...st/java/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpanAssertions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ static SpanDataAssert sqs(
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 ->
Expand Down Expand Up @@ -124,7 +123,6 @@ static SpanDataAssert s3(SpanDataAssert span, String spanName, String bucketName
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)),
Expand All @@ -146,7 +144,6 @@ static SpanDataAssert sns(SpanDataAssert span, String spanName, String topicArn)
.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)),
Expand Down
Loading