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 JMS context propagation problems #2702

Merged
merged 2 commits into from
Apr 6, 2021
Merged

Fix JMS context propagation problems #2702

merged 2 commits into from
Apr 6, 2021

Conversation

mateuszrzeszutek
Copy link
Member

Fixes #2420

trask
trask approved these changes Apr 2, 2021
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

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

is it easy to add a test for this?

@mateuszrzeszutek
Copy link
Member Author

is it easy to add a test for this?

For hornetq and the tracer context leak fix - existing tests sort of cover that.

For the ProducerWithDestinationAdvice fix - that should be possible, I'll do that.

mateuszrzeszutek
mateuszrzeszutek commented Apr 6, 2021
View reviewed changes
...n/java/io/opentelemetry/javaagent/instrumentation/jms/JmsMessageProducerInstrumentation.java
@@ -129,6 +127,7 @@ public static void stopSpan(
}
CallDepthThreadLocalMap.reset(MessageProducer.class);

scope.close();
Copy link
Member Author

Choose a reason for hiding this comment

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

...aaaand one more scope leak detected 😄
It was worth adding that one test case

@trask trask merged commit 5760cd7 into open-telemetry:main Apr 6, 2021
@mateuszrzeszutek mateuszrzeszutek deleted the fix-jmx-context-propagation branch April 6, 2021 15:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anuraaga anuraaga anuraaga left review comments

@trask trask trask approved these changes

@iNikem iNikem iNikem approved these changes

@jkwatson jkwatson Awaiting requested review from jkwatson

@pavolloffay pavolloffay Awaiting requested review from pavolloffay

@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.

Broken JMS MessageProducer propagation
4 participants
@mateuszrzeszutek @anuraaga @trask @iNikem