Skip to content

Skip ClassCastException on every DynamoDB request in AWS SDK v2 instrumentation #11285

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

Draft
dougqh wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −17
Draft

Skip ClassCastException on every DynamoDB request in AWS SDK v2 instrumentation #11285

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
23 changes: 6 additions & 17 deletions ...ava-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,14 +133,14 @@ public Context onSdkRequest(

// S3
request.getValueForField("Bucket", String.class).ifPresent(name -> setBucketName(span, name));
if ("s3".equalsIgnoreCase(awsServiceName) && traceConfig().isDataStreamsEnabled()) {
request
.getValueForField("Key", String.class)
.ifPresent(key -> span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key));
span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(httpRequest));
if ("s3".equalsIgnoreCase(awsServiceName)) {
// gate "Key" extraction to S3 — DynamoDB's Key is Map<String, AttributeValue>, would CCE
request.getValueForField("Key", String.class).ifPresent(key -> setObjectKey(span, key));
if (traceConfig().isDataStreamsEnabled()) {
span.setTag(Tags.HTTP_REQUEST_CONTENT_LENGTH, getRequestContentLength(httpRequest));
}
}

getRequestKey(request).ifPresent(key -> setObjectKey(span, key));
request
.getValueForField("StorageClass", String.class)
.ifPresent(
Expand Down Expand Up @@ -279,17 +279,6 @@ private static void setBucketName(AgentSpan span, String name) {
setPeerService(span, InstrumentationTags.AWS_BUCKET_NAME, name);
}

private static Optional<String> getRequestKey(SdkRequest request) {
Optional<String> key = Optional.empty();
try {
key = request.getValueForField("Key", String.class);
} catch (ClassCastException ignored) {
// Key is not always a string, like for dynamodb GetItemRequest
}

return key;
}

private static void setObjectKey(AgentSpan span, String key) {
span.setTag(InstrumentationTags.AWS_OBJECT_KEY, key);
}
Expand Down
Loading