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.

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

Undertow: restore attached context only when it is for different trace #10336

Merged
merged 1 commit into from
Jan 26, 2024

Conversation

laurit
Copy link
Contributor

@laurit laurit commented Jan 26, 2024

Resolves #10323
Undertow tests pass even without restoring the context. I'm not sure whether it is needed at all, perhaps executor instrumentation has improved since this was originally written and can now propagate the context? Just in case it is needed I changed it so that the context that is attached to the request is restored only when the current context and the attached context have different traces.

@laurit laurit requested a review from a team as a code owner January 26, 2024 11:44
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.

looks like we already do this same check for servlets?

@laurit
Copy link
Contributor Author

laurit commented Jan 26, 2024

looks like we already do this same check for servlets?

Yes the servlet instrumentation does something similar, I took the same traceid check from there. I think the reason why it is(was) done might be different.

@trask trask merged commit 20e3cd6 into open-telemetry:main Jan 26, 2024
47 checks passed
steverao pushed a commit to steverao/opentelemetry-java-instrumentation that referenced this pull request Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Baggage is lost between Filter and Controller when using Spring-Boot with Undertow
2 participants