Skip to content

Commit 09e823a

Browse files
akats7akats7
committed
addressed comments
1 parent 1b0a198 commit 09e823a

File tree

7 files changed

+31
-103
lines changed

7 files changed

+31
-103
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class TracingRequestHandler extends RequestHandler2 {
3333
ContextKey.named(TracingRequestHandler.class.getName() + ".RequestSpanSuppressed");
3434
private static final String SEND_MESSAGE_REQUEST =
3535
"com.amazonaws.services.sqs.model.SendMessageRequest";
36-
private static final String DYNAMODBV2 = "com.amazonaws.services.dynamodbv2.model";
36+
private static final String DYNAMODBV2 = "com.amazonaws.services.dynamodbv2.model.";
3737

3838
private final Instrumenter<Request<?>, Response<?>> requestInstrumenter;
3939
private final Instrumenter<SqsReceiveRequest, Response<?>> consumerReceiveInstrumenter;
@@ -164,7 +164,8 @@ private Instrumenter<Request<?>, Response<?>> getInstrumenter(Request<?> request
164164
String className = request.getOriginalRequest().getClass().getName();
165165
if (className.startsWith(DYNAMODBV2)) {
166166
return dynamoDbInstrumenter;
167-
} else if (className.equals(SEND_MESSAGE_REQUEST)) {
167+
}
168+
if (className.equals(SEND_MESSAGE_REQUEST)) {
168169
return producerInstrumenter;
169170
}
170171
return requestInstrumenter;

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

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.amazonaws.auth.AnonymousAWSCredentials;
2929
import com.amazonaws.client.builder.AwsClientBuilder;
3030
import com.amazonaws.handlers.RequestHandler2;
31-
import io.opentelemetry.api.common.AttributeType;
3231
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
3332
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
3433
import io.opentelemetry.testing.internal.armeria.testing.junit5.server.mock.MockWebServerExtension;
@@ -75,7 +74,7 @@ public void assertRequestWithMockedResponse(
7574
String service,
7675
String operation,
7776
String method,
78-
List<AttributeKeyPair<?>> additionalAttributes)
77+
List<AttributeAssertion> additionalAttributes)
7978
throws Exception {
8079

8180
assertThat(response).isNotNull();
@@ -113,15 +112,7 @@ public void assertRequestWithMockedResponse(
113112
stringKey("aws.request_id"), v -> v.isInstanceOf(String.class)));
114113
}
115114

116-
additionalAttributes.forEach(
117-
(att) -> {
118-
if (att.getType() == AttributeType.STRING) {
119-
attributes.add(equalTo(att.getStringKey(), att.getStringVal()));
120-
} else if (att.getType() == AttributeType.STRING_ARRAY) {
121-
attributes.add(
122-
equalTo(att.getStringArrayKey(), att.getStringArrayVal()));
123-
}
124-
});
115+
attributes.addAll(additionalAttributes);
125116

126117
span.hasName(service + "." + operation)
127118
.hasKind(operation.equals("SendMessage") ? PRODUCER : CLIENT)

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,19 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringArrayKeyPair;
9-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
8+
import static io.opentelemetry.api.common.AttributeKey.stringArrayKey;
9+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
10+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
11+
import static java.util.Collections.singletonList;
1012

1113
import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;
1214
import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;
1315
import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;
16+
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
1417
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
1518
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
1619
import io.opentelemetry.testing.internal.armeria.common.MediaType;
1720
import java.util.Arrays;
18-
import java.util.Collections;
1921
import java.util.List;
2022
import org.junit.jupiter.api.Test;
2123

@@ -39,13 +41,11 @@ public void sendRequestWithMockedResponse() throws Exception {
3941

4042
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, ""));
4143

42-
List<String> tableList = Collections.singletonList("sometable");
43-
44-
List<AttributeKeyPair<?>> additionalAttributes =
44+
List<AttributeAssertion> additionalAttributes =
4545
Arrays.asList(
46-
createStringKeyPair("aws.table.name", "sometable"),
47-
createStringKeyPair("db.system", "dynamodb"),
48-
createStringArrayKeyPair("aws.dynamodb.table_names", tableList));
46+
equalTo(stringKey("aws.table.name"), "sometable"),
47+
equalTo(stringKey("db.system"), "dynamodb"),
48+
equalTo(stringArrayKey("aws.dynamodb.table_names"), singletonList("sometable")));
4949

5050
Object response = client.createTable(new CreateTableRequest("sometable", null));
5151
assertRequestWithMockedResponse(

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55

66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
8+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
10+
import static java.util.Collections.singletonList;
911

1012
import com.amazonaws.services.kinesis.AmazonKinesis;
1113
import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;
1214
import com.amazonaws.services.kinesis.model.DeleteStreamRequest;
15+
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
1316
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
1417
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
1518
import io.opentelemetry.testing.internal.armeria.common.MediaType;
16-
import java.util.Arrays;
1719
import java.util.List;
1820
import java.util.function.Function;
1921
import java.util.stream.Stream;
@@ -44,8 +46,9 @@ public void testSendRequestWithMockedResponse(
4446

4547
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, ""));
4648

47-
List<AttributeKeyPair<?>> additionalAttributes =
48-
Arrays.asList(createStringKeyPair("aws.stream.name", "somestream"));
49+
List<AttributeAssertion> additionalAttributes =
50+
singletonList(equalTo(stringKey("aws.stream.name"), "somestream"));
51+
4952
Object response = call.apply(client);
5053
assertRequestWithMockedResponse(
5154
response, client, "Kinesis", operation, "POST", additionalAttributes);

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

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

88
import static io.opentelemetry.api.common.AttributeKey.stringKey;
99
import static io.opentelemetry.api.trace.SpanKind.CLIENT;
10-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
1110
import static io.opentelemetry.instrumentation.test.utils.PortUtils.UNUSABLE_PORT;
1211
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
1312
import static io.opentelemetry.semconv.ErrorAttributes.ERROR_TYPE;
@@ -30,6 +29,7 @@
3029
import com.amazonaws.services.s3.AmazonS3;
3130
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
3231
import io.opentelemetry.api.trace.Span;
32+
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
3333
import io.opentelemetry.sdk.trace.data.StatusData;
3434
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
3535
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
@@ -61,7 +61,7 @@ public void testSendRequestWithMockedResponse(
6161
String operation,
6262
String method,
6363
Function<AmazonS3, Object> call,
64-
List<AttributeKeyPair<?>> additionalAttributes)
64+
List<AttributeAssertion> additionalAttributes)
6565
throws Exception {
6666

6767
AmazonS3 client =
@@ -83,12 +83,12 @@ private static Stream<Arguments> provideArguments() {
8383
"CreateBucket",
8484
"PUT",
8585
(Function<AmazonS3, Object>) c -> c.createBucket("testbucket"),
86-
singletonList(createStringKeyPair("aws.bucket.name", "testbucket"))),
86+
singletonList(equalTo(stringKey("aws.bucket.name"), "testbucket"))),
8787
Arguments.of(
8888
"GetObject",
8989
"GET",
9090
(Function<AmazonS3, Object>) c -> c.getObject("someBucket", "someKey"),
91-
singletonList(createStringKeyPair("aws.bucket.name", "someBucket"))));
91+
singletonList(equalTo(stringKey("aws.bucket.name"), "someBucket"))));
9292
}
9393

9494
@Test

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

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

66
package io.opentelemetry.instrumentation.awssdk.v1_11;
77

8-
import static io.opentelemetry.instrumentation.awssdk.v1_11.AttributeKeyPair.createStringKeyPair;
8+
import static io.opentelemetry.api.common.AttributeKey.stringKey;
9+
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
910
import static io.opentelemetry.semconv.incubating.MessagingIncubatingAttributes.MESSAGING_DESTINATION_NAME;
11+
import static java.util.Collections.singletonList;
1012

1113
import com.amazonaws.services.sns.AmazonSNS;
1214
import com.amazonaws.services.sns.AmazonSNSClientBuilder;
1315
import com.amazonaws.services.sns.model.PublishRequest;
16+
import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
1417
import io.opentelemetry.testing.internal.armeria.common.HttpResponse;
1518
import io.opentelemetry.testing.internal.armeria.common.HttpStatus;
1619
import io.opentelemetry.testing.internal.armeria.common.MediaType;
17-
import java.util.Arrays;
1820
import java.util.List;
1921
import java.util.function.Function;
2022
import java.util.stream.Stream;
@@ -53,8 +55,8 @@ public void testSendRequestWithMockedResponse(Function<AmazonSNS, Object> call)
5355

5456
server.enqueue(HttpResponse.of(HttpStatus.OK, MediaType.PLAIN_TEXT_UTF_8, body));
5557

56-
List<AttributeKeyPair<?>> additionalAttributes =
57-
Arrays.asList(createStringKeyPair(MESSAGING_DESTINATION_NAME.toString(), "somearn"));
58+
List<AttributeAssertion> additionalAttributes =
59+
singletonList(equalTo(stringKey(MESSAGING_DESTINATION_NAME.toString()), "somearn"));
5860

5961
Object response = call.apply(client);
6062
assertRequestWithMockedResponse(

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

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)