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

fix(aws-sdk): use RPC attributes from spec #5166

Merged
merged 8 commits into from
Jan 19, 2022
Merged

fix(aws-sdk): use RPC attributes from spec #5166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9a09860
style: rename AwsSdkAttributes to AwsSdkHttpAttributes
Jan 17, 2022
58a1a98
Merge remote-tracking branch 'upstream/main' into aws-sdk-rpc-attrs
Jan 18, 2022
2f48b4b
feat(aws-sdk-1.11): use rpc attributes from spec
Jan 18, 2022
ab2352e
feat(aws-sdk-2.2): use rpc attributes from spec
Jan 18, 2022
2d63222
fix: update apache-camel test with aws-sdk rpc attributes
Jan 18, 2022
155ff17
chore: lint fix
Jan 18, 2022
f69ef52
Update instrumentation/aws-sdk/aws-sdk-1.11/library/src/main/java/io/…
blumamir Jan 19, 2022
c1c5110
Update instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/o…
blumamir Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions ...src/test/groovy/io/opentelemetry/javaagent/instrumentation/apachecamel/aws/AwsSpan.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ class AwsSpan {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" spanName.substring(3)
"aws.service" "Amazon S3"
"rpc.system" "aws-api"
"rpc.method" spanName.substring(3)
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" method
Expand All @@ -50,8 +51,9 @@ class AwsSpan {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" spanName.substring(4)
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.method" spanName.substring(4)
"rpc.service" "AmazonSQS"
"aws.queue.name" { it == null || it == queueName }
"aws.queue.url" { it == null || it == queueUrl }
"http.flavor" "1.1"
Expand All @@ -78,8 +80,9 @@ class AwsSpan {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" spanName.substring(4)
"aws.service" "AmazonSNS"
"rpc.system" "aws-api"
"rpc.method" spanName.substring(4)
"rpc.service" "AmazonSNS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand Down
145 changes: 87 additions & 58 deletions instrumentation/aws-sdk/aws-sdk-1.11/javaagent/src/test/groovy/S3TracingTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "CreateQueue"
"rpc.method" "CreateQueue"
"aws.queue.name" queueName
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -74,8 +75,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "CreateBucket"
"aws.service" "Amazon S3"
"rpc.method" "CreateBucket"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -96,9 +98,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "GetQueueAttributes"
"rpc.method" "GetQueueAttributes"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -118,9 +121,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "SetQueueAttributes"
"rpc.method" "SetQueueAttributes"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -140,8 +144,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "SetBucketNotificationConfiguration"
"aws.service" "Amazon S3"
"rpc.method" "SetBucketNotificationConfiguration"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -161,9 +166,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -182,8 +188,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "PutObject"
"aws.service" "Amazon S3"
"rpc.method" "PutObject"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -201,9 +208,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -228,9 +236,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -249,8 +258,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ListObjects"
"aws.service" "Amazon S3"
"rpc.method" "ListObjects"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "GET"
Expand All @@ -270,8 +280,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "DeleteObject"
"aws.service" "Amazon S3"
"rpc.method" "DeleteObject"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "DELETE"
Expand All @@ -291,8 +302,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "DeleteBucket"
"aws.service" "Amazon S3"
"rpc.method" "DeleteBucket"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "DELETE"
Expand All @@ -312,9 +324,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "PurgeQueue"
"rpc.method" "PurgeQueue"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand Down Expand Up @@ -363,9 +376,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "CreateQueue"
"rpc.method" "CreateQueue"
"aws.queue.name" queueName
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -384,9 +398,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "GetQueueAttributes"
"rpc.method" "GetQueueAttributes"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -405,8 +420,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "CreateBucket"
"aws.service" "Amazon S3"
"rpc.method" "CreateBucket"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -426,8 +442,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "CreateTopic"
"aws.service" "AmazonSNS"
"rpc.method" "CreateTopic"
"rpc.system" "aws-api"
"rpc.service" "AmazonSNS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -446,8 +463,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "Subscribe"
"aws.service" "AmazonSNS"
"rpc.method" "Subscribe"
"rpc.system" "aws-api"
"rpc.service" "AmazonSNS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -466,9 +484,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "SetQueueAttributes"
"rpc.method" "SetQueueAttributes"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -487,8 +506,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "SetTopicAttributes"
"aws.service" "AmazonSNS"
"rpc.method" "SetTopicAttributes"
"rpc.system" "aws-api"
"rpc.service" "AmazonSNS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -507,8 +527,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "SetBucketNotificationConfiguration"
"aws.service" "Amazon S3"
"rpc.method" "SetBucketNotificationConfiguration"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -529,9 +550,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -550,8 +572,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "PutObject"
"aws.service" "Amazon S3"
"rpc.method" "PutObject"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "PUT"
Expand All @@ -575,9 +598,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -596,9 +620,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ReceiveMessage"
"rpc.method" "ReceiveMessage"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand All @@ -618,8 +643,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "ListObjects"
"aws.service" "Amazon S3"
"rpc.method" "ListObjects"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "GET"
Expand All @@ -639,8 +665,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "DeleteObject"
"aws.service" "Amazon S3"
"rpc.method" "DeleteObject"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "DELETE"
Expand All @@ -660,8 +687,9 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "DeleteBucket"
"aws.service" "Amazon S3"
"rpc.method" "DeleteBucket"
"rpc.system" "aws-api"
"rpc.service" "Amazon S3"
"aws.bucket.name" bucketName
"http.flavor" "1.1"
"http.method" "DELETE"
Expand All @@ -681,9 +709,10 @@ class S3TracingTest extends AgentInstrumentationSpecification {
attributes {
"aws.agent" "java-aws-sdk"
"aws.endpoint" String
"aws.operation" "PurgeQueue"
"rpc.method" "PurgeQueue"
"aws.queue.url" queueUrl
"aws.service" "AmazonSQS"
"rpc.system" "aws-api"
"rpc.service" "AmazonSQS"
"http.flavor" "1.1"
"http.method" "POST"
"http.status_code" 200
Expand Down