Skip to content

Commit 7c7382c

Browse files
committed
address reveiw comments
1 parent bbedff6 commit 7c7382c

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/AwsSdkRequestType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ enum AwsSdkRequestType {
2222
S3(request(AttributeKeys.AWS_S3_BUCKET, "Bucket")),
2323
SQS(
2424
request(AttributeKeys.AWS_SQS_QUEUE_URL, "QueueUrl"),
25-
requestExperimental(AttributeKey.stringKey("aws.queue.name"), "QueueName")),
25+
requestExperimental(stringKey("aws.queue.name"), "QueueName")),
2626
KINESIS(request(AttributeKeys.AWS_KINESIS_STREAM_NAME, "StreamName")),
2727
DYNAMODB(),
2828
BEDROCK_RUNTIME(),
@@ -74,6 +74,6 @@ private static class AttributeKeys {
7474

7575
// copied from MessagingIncubatingAttributes
7676
static final AttributeKey<String> MESSAGING_DESTINATION_NAME =
77-
AttributeKey.stringKey("messaging.destination.name");
77+
stringKey("messaging.destination.name");
7878
}
7979
}

instrumentation/aws-sdk/aws-sdk-2.2/library/src/test/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/FieldMapperTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_DYNAMODB_PROVISIONED_READ_CAPACITY;
1313
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_DYNAMODB_PROVISIONED_WRITE_CAPACITY;
1414
import static io.opentelemetry.semconv.incubating.AwsIncubatingAttributes.AWS_DYNAMODB_TABLE_NAMES;
15+
import static java.util.Arrays.asList;
1516
import static java.util.Collections.singletonList;
1617
import static org.mockito.Mockito.mock;
1718
import static org.mockito.Mockito.verify;
1819
import static org.mockito.Mockito.verifyNoMoreInteractions;
1920
import static org.mockito.Mockito.when;
2021

2122
import io.opentelemetry.api.trace.Span;
22-
import java.util.Arrays;
2323
import java.util.Collection;
2424
import java.util.HashMap;
2525
import java.util.Map;
@@ -71,13 +71,13 @@ void shouldMapRequestFieldsOnly() {
7171
Map<String, Collection<WriteRequest>> items = new HashMap<>();
7272
BatchWriteItemRequest sdkRequest = BatchWriteItemRequest.builder().requestItems(items).build();
7373
when(serializer.serializeCollection(items.keySet()))
74-
.thenReturn(Arrays.asList("firstTable", "secondTable"));
74+
.thenReturn(asList("firstTable", "secondTable"));
7575

7676
Span span = mock(Span.class);
7777
// when
7878
underTest.mapToAttributes(sdkRequest, awsSdkRequest, span);
7979
// then
80-
verify(span).setAttribute(AWS_DYNAMODB_TABLE_NAMES, Arrays.asList("firstTable", "secondTable"));
80+
verify(span).setAttribute(AWS_DYNAMODB_TABLE_NAMES, asList("firstTable", "secondTable"));
8181
verifyNoMoreInteractions(span);
8282
}
8383

instrumentation/aws-sdk/aws-sdk-2.2/testing/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/AbstractAws2ClientCoreTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
import java.lang.reflect.Method;
5454
import java.lang.reflect.Proxy;
5555
import java.util.ArrayList;
56-
import java.util.Arrays;
5756
import java.util.List;
5857
import java.util.concurrent.CompletableFuture;
5958
import java.util.function.Function;
@@ -282,7 +281,7 @@ private static void assertDynamoDbRequest(
282281
SpanDataAssert span, String operation, List<AttributeAssertion> extraAttributes) {
283282
List<AttributeAssertion> assertions =
284283
new ArrayList<>(
285-
Arrays.asList(
284+
asList(
286285
equalTo(SERVER_ADDRESS, "127.0.0.1"),
287286
equalTo(SERVER_PORT, server.httpPort()),
288287
equalTo(URL_FULL, server.httpUri() + "/"),

0 commit comments

Comments
 (0)