Capture S3 bucket+key as otel attributes #3136
Conversation
| | ||
| @Nullable | ||
| @Override | ||
| protected String getObjectKey(Request<?> request, @Nullable String bucketName) { |
There was a problem hiding this comment.
[for reviewer] with SDK v1 we have to use some manual parsing of an HTTP header, this is not the case with v2.
| newTest(() -> dynamoDB.createTable(new CreateTableRequest().withTableName(TABLE_NAME) | ||
| .withAttributeDefinitions(List.of( | ||
| new AttributeDefinition("attributeOne", ScalarAttributeType.S), | ||
| new AttributeDefinition("attributeTwo", ScalarAttributeType.N) | ||
| )) | ||
| .withKeySchema(List.of( | ||
| new KeySchemaElement("attributeOne", KeyType.HASH), | ||
| new KeySchemaElement("attributeTwo", KeyType.RANGE) | ||
| )) | ||
| .withBillingMode(BillingMode.PAY_PER_REQUEST))) | ||
| .operationName("CreateTable") | ||
| .entityName(TABLE_NAME) | ||
| .action("query") | ||
| .withSpanAssertions(dbAssert) | ||
| .execute(); |
There was a problem hiding this comment.
[for reviewer] this is mostly automatic refactoring with a "test builder" that allows to combine assertions on the spans in a more declarative way.
| newTest(() -> s3.createBucket(BUCKET_NAME)) | ||
| .operationName("CreateBucket") | ||
| .entityName(BUCKET_NAME) | ||
| .otelAttribute("aws.s3.bucket", BUCKET_NAME) |
There was a problem hiding this comment.
[for reviewer] this tests the expected OTel attribute capture that was added with this PR.
| @Nullable | ||
| @Override | ||
| protected String getObjectKey(SdkRequest request, @Nullable String bucketName) { | ||
| String value = awsSdkDataSource.getFieldValue(IAwsSdkDataSource.OBJECT_KEY_FIELD, request); | ||
| | ||
| if (value == null) { | ||
| value = awsSdkDataSource.getFieldValue(IAwsSdkDataSource.OBJECT_DESTINATION_KEY_FIELD, request); | ||
| } | ||
| | ||
| return value; | ||
| } | ||
| | ||
| @Nullable | ||
| @Override | ||
| protected String getCopySource(SdkRequest request) { | ||
| return awsSdkDataSource.getFieldValue(IAwsSdkDataSource.COPY_SOURCE_FIELD, request); | ||
| } |
There was a problem hiding this comment.
[for reviewer] with SDK v2 we don't need to parse anything from the request, just capture it.
💚 Build Succeeded
Expand to view the summary
Build stats
❕ Flaky test reportNo test was executed to be analysed. 🤖 GitHub commentsExpand to view the GitHub comments
To re-run your PR in the CI, just comment with:
|
| /test |
apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/AbstractSpan.java Outdated Show resolved Hide resolved
2 participants
What does this PR do?
Fixes #3006
Captures the following as OTel attributes from OTel semantic conventions for S3.
aws.s3.bucketaws.s3.keyaws.s3.copy_sourceThe following attributes are not covered
aws.s3.upload_idaws.s3.deleteaws.s3.part_numberThis PR is quite large due to test refactoring.
Checklist
Added an API method or config option? Document in which version this will be introducedn/aI have made corresponding changes to the documentationn/a