Skip to content
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

Jump to bottom

Fxing S3 bucket name extraction for AWS SDK V2 #393

Merged
merged 5 commits into from
Dec 12, 2023
Merged

Fxing S3 bucket name extraction for AWS SDK V2 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ee1853e
Fxing S3 bucket name extraction for AWS SDK V2
atshaw43 Dec 12, 2023
9a186fe
Fixing stylecheck
atshaw43 Dec 12, 2023
bd94e8c
Fixing issue
atshaw43 Dec 12, 2023
c1062c5
Fixing stylecheck
atshaw43 Dec 12, 2023
4b34015
Fixing stylecheck
atshaw43 Dec 12, 2023
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
1 change: 1 addition & 0 deletions aws-xray-recorder-sdk-aws-sdk-v2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
testImplementation("software.amazon.awssdk:lambda:2.15.20")
testImplementation("software.amazon.awssdk:sqs:2.15.20")
testImplementation("software.amazon.awssdk:sns:2.15.20")
testImplementation("software.amazon.awssdk:s3:2.15.20")
}

tasks.jar {
Expand Down
32 changes: 26 additions & 6 deletions ...rder-sdk-aws-sdk-v2/src/main/java/com/amazonaws/xray/interceptors/TracingInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,8 @@ private HashMap<String, Object> extractRequestParameters(
SdkRequest request = context.request();
Optional<Object> parameterValue = request.getValueForField(parameterName, Object.class);
if (parameterValue.isPresent()) {
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(parameterName), parameterValue.get());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(parameterName)), parameterValue.get());
}
});
}
Expand All @@ -161,14 +162,16 @@ private HashMap<String, Object> extractRequestParameters(
Optional<Map> parameterValue = request.getValueForField(key, Map.class);
if (parameterValue.isPresent()) {
String renameTo = descriptor.getRenameTo() != null ? descriptor.getRenameTo() : key;
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(renameTo), parameterValue.get().keySet());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(renameTo)), parameterValue.get().keySet());
}
} else if (descriptor.isList() && descriptor.shouldGetCount()) {
SdkRequest request = context.request();
Optional<List> parameterValue = request.getValueForField(key, List.class);
if (parameterValue.isPresent()) {
String renameTo = descriptor.getRenameTo() != null ? descriptor.getRenameTo() : key;
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(renameTo), parameterValue.get().size());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(renameTo)), parameterValue.get().size());
}
}
});
Expand All @@ -177,6 +180,20 @@ private HashMap<String, Object> extractRequestParameters(
return parameters;
}

/**
* @param parameterName
* The name of the parameter to normalize.
* @return
* The field key for a parameter that the X-Ray backend expects.
*/
private String normalizeParameterName(String parameterName) {
// AWS SDK V2 changed the field name from BucketName to Bucket.
if (parameterName.equals("bucket")) {
return "bucket_name";
}
return parameterName;
}

private HashMap<String, Object> extractResponseParameters(
Context.AfterExecution context, ExecutionAttributes executionAttributes) {
HashMap<String, Object> parameters = new HashMap<>();
Expand All @@ -191,7 +208,8 @@ private HashMap<String, Object> extractResponseParameters(
SdkResponse response = context.response();
Optional<Object> parameterValue = response.getValueForField(parameterName, Object.class);
if (parameterValue.isPresent()) {
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(parameterName), parameterValue.get());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(parameterName)), parameterValue.get());
}
});
}
Expand All @@ -203,14 +221,16 @@ private HashMap<String, Object> extractResponseParameters(
Optional<Map> parameterValue = response.getValueForField(key, Map.class);
if (parameterValue.isPresent()) {
String renameTo = descriptor.getRenameTo() != null ? descriptor.getRenameTo() : key;
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(renameTo), parameterValue.get().keySet());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(renameTo)), parameterValue.get().keySet());
}
} else if (descriptor.isList() && descriptor.shouldGetCount()) {
SdkResponse response = context.response();
Optional<List> parameterValue = response.getValueForField(key, List.class);
if (parameterValue.isPresent()) {
String renameTo = descriptor.getRenameTo() != null ? descriptor.getRenameTo() : key;
parameters.put(SNAKE_CASE_NAMING_STRATEGY.translate(renameTo), parameterValue.get().size());
parameters.put(normalizeParameterName(
SNAKE_CASE_NAMING_STRATEGY.translate(renameTo)), parameterValue.get().size());
}
}
});
Expand Down
Loading
Loading