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

SQS propagation for AWS SDK 1.1 #2114

Merged
merged 1 commit into from Jan 29, 2021
Merged

SQS propagation for AWS SDK 1.1 #2114

merged 1 commit into from Jan 29, 2021

Conversation

ghost
Copy link

@ghost ghost commented Jan 25, 2021 •
edited by ghost
Loading

Closes #2092

  • uses AWS trace header propagation
  • creates PRODUCER span for SQS messages sending
  • creates CONSUMER spans per each message consumed
  • creates (detached) CLIENT span for "message receive" execution - suppresses HTTP instrumentation span that would get created otherwise

Additional changes:

  • Apache Camel instrumentation - depending on AWS SDK instr - had to be changed as well
  • localstack to elasticmq fo Camel as well - localstack in the current version does not support AWS tracing header (noted in the dependency comment for AWS SDK instrumentation)

@anuraaga please have a look :)

Base automatically changed from master to main January 26, 2021 05:50
@ghost
Copy link
Author

ghost commented Jan 27, 2021

@anuraaga @mateuszrzeszutek all of the comments have been resolved, please have another look. I'd very much like to merge this asap, as there is coupled "camel sqs propagation" issue I'd like to close as well.

anuraaga
anuraaga approved these changes Jan 28, 2021
View reviewed changes
Copy link
Contributor

@anuraaga anuraaga left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Small comments, thanks a lot! Whether this modeling is good, I'm not too sure, but it seems fine for an initial modeling and code looks good

...t/src/main/java/io/opentelemetry/javaagent/instrumentation/apachecamel/CamelRoutePolicy.java Outdated Show resolved Hide resolved
instrumentation/apache-camel-2.20/javaagent/src/test/groovy/test/SqsCamelTest.groovy Show resolved Hide resolved
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/aws-sdk-1.11-javaagent.gradle Show resolved Hide resolved
...main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v1_11/TracingRequestHandler.java Outdated Show resolved Hide resolved
@iNikem iNikem merged commit 77922d4 into open-telemetry:main Jan 29, 2021
@ghost ghost mentioned this pull request Feb 25, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iNikem iNikem Awaiting requested review from iNikem

@jkwatson jkwatson Awaiting requested review from jkwatson

@mateuszrzeszutek mateuszrzeszutek Awaiting requested review from mateuszrzeszutek

@pavolloffay pavolloffay Awaiting requested review from pavolloffay

@trask trask Awaiting requested review from trask

@tylerbenson tylerbenson Awaiting requested review from tylerbenson

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement SQS context propagation for AWS SDK 1.11 instrumentation
4 participants
@anuraaga @mateuszrzeszutek @iNikem @kuba-wu