Reorder checking of delegate vs. wrapper in OTel tracer unwrap #8855
Conversation
This file contains 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
Signed-off-by: Tim Quinn <tim.quinn@oracle.com>
oracle-contributor-agreement
bot
added
the
OCA Verified
barchetta
approved these changes
Jun 6, 2024
barchetta
pushed a commit
to barchetta/helidon
that referenced
this pull request
Jun 6, 2024
…on-io#8855) * Reorder checking of delegate vs. wrapper in OTel tracer unwrap Signed-off-by: Tim Quinn <tim.quinn@oracle.com> * Relax the test a bit making sure unwrap(Object.class) returns what we expect --------- Signed-off-by: Tim Quinn <tim.quinn@oracle.com>
barchetta
added a commit
that referenced
this pull request
Jun 6, 2024
#8859) * Reorder checking of delegate vs. wrapper in OTel tracer unwrap * Relax the test a bit making sure unwrap(Object.class) returns what we expect --------- Signed-off-by: Tim Quinn <tim.quinn@oracle.com> Co-authored-by: Tim Quinn <tim.quinn@oracle.com>
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.
Description
Resolves #8854
A recent PR added the ability to unwrap the OTel tracer as the Helidon
Tracerwrapper (to the pre-existing ability to unwrap the OTel delegate tracer) by checking the wrapper first, then the delegate.This broke previous behavior where users used
unwrap(Object.class).toString()to display delegate information.This PR reorders the checking in the OTel
Tracerwrapper to restore the earlier behavior for unwrapping asObjectwhile still adding the ability to unwrap as the wrapper (which was the purpose of this part of the earlier PR).The PR also adds tests to make sure the older behavior works again.
Documentation
Bug fix; no doc impact.