Supporting Baggage for Instrumentations used in Weblog Tests #8773
+35
−9
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mhlidd
commented
May 6, 2025
...rap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
Show resolved
Hide resolved
mhlidd
commented
May 6, 2025
| /* Verify whether we have only span contexts or more contexts */ | ||
| public ContextScope activateScope(Context context, AgentSpan span) { | ||
| Baggage baggage = Baggage.fromContext(context); | ||
| if (baggage == null) { |
There was a problem hiding this comment.
@mcculls This is what I understood when you mentioned that we can only use span context if it is the only context that was extracted. Let me know if I interpreted that idea correctly here. 😃
There was a problem hiding this comment.
This part feels weird to me. Would need to discuss with @mcculls
- It will drop any other context data than baggage (like DSM or other product)
- If there is no data in context, context will be root, and
root.with(span)is equals tospan(no allocation, no perf cost) so this will always be save to usecontext.with(span).attach()
nitpick: And on the semantic side, you are not activating a scope, you are activating a context, which activation results in a scope
BenchmarksStartupLoadDacapo |
...rap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java
Show resolved
Hide resolved
| /* Verify whether we have only span contexts or more contexts */ | ||
| public ContextScope activateScope(Context context, AgentSpan span) { | ||
| Baggage baggage = Baggage.fromContext(context); | ||
| if (baggage == null) { |
There was a problem hiding this comment.
This part feels weird to me. Would need to discuss with @mcculls
- It will drop any other context data than baggage (like DSM or other product)
- If there is no data in context, context will be root, and
root.with(span)is equals tospan(no allocation, no perf cost) so this will always be save to usecontext.with(span).attach()
nitpick: And on the semantic side, you are not activating a scope, you are activating a context, which activation results in a scope
...c/main/java/datadog/trace/instrumentation/azure/functions/AzureFunctionsInstrumentation.java
Outdated
Show resolved
Hide resolved
mhlidd
commented
May 7, 2025
...mcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java
Outdated
Show resolved
Hide resolved
e2d8ef7 to
81a9768
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What Does This Do
This PR migrates context propagation from Span contexts to generic Contexts for the instrumentations used in weblog tests (Tomcat on the server-side and okhttp3 on the client-side). This allows us to verify that we can properly propagate generic contexts end-to-end through System-tests verification.
Additionally, this PR introduces more helper methods in the
HttpServerDecoratorin order to reduce repetitive code in the instrumentation advice layer and ensure consistency among how we handle instrumentations.Motivation
Additional Notes
Contributor Checklist
type:and (comp:orinst:) labels in addition to any usefull labelsclose,fixor any linking keywords when referencing an issue.Use
solvesinstead, and assign the PR milestone to the issueJira ticket: [PROJ-IDENT]