Instrument log4j to include bugfix of contextdataprovider mechanism. #2407
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
anuraaga
requested review from
iNikem,
jkwatson,
mateuszrzeszutek,
pavolloffay,
trask and
tylerbenson
as code owners
added 2 commits
February 25, 2021 15:52
anuraaga
commented
Feb 25, 2021
| @@ -44,7 +47,12 @@ public void clearEvents() { | |||
|
|
|||
| @Override | |||
| public void append(LogEvent logEvent) { | |||
| events.add(logEvent); | |||
| // Event object may be reused by the framework so copy the data we need. | |||
There was a problem hiding this comment.
Never knew log4j has such an optimization, too bad most spring users never get to see it :D
mateuszrzeszutek
approved these changes
Feb 25, 2021
.../java/io/opentelemetry/javaagent/instrumentation/log4j/v2_13_2/BugFixingInstrumentation.java
Outdated
Show resolved
Hide resolved
| @@ -39,8 +39,7 @@ public Log4j2InstrumentationModule() { | |||
|
|
|||
| @Override | |||
| public List<TypeInstrumentation> typeInstrumentations() { | |||
| // have to return at least 1 type instrumentation so that helpers get injected | |||
| return singletonList(new EmptyTypeInstrumentation()); | |||
| return Arrays.asList(new BugFixingInstrumentation(), new EmptyTypeInstrumentation()); | |||
There was a problem hiding this comment.
Can you remove EmptyTypeInstrumentation? It's not needed anymore, since there's an actual type instrumentation in this module.
There was a problem hiding this comment.
The bugfix only applies to one of the codepaths in log4j, if it's using the other one it won't ever be applied so still need it.
…opentelemetry/javaagent/instrumentation/log4j/v2_13_2/BugFixingInstrumentation.java Co-authored-by: Mateusz Rzeszutek <mrzeszutek@splunk.com>
|
It's kinda bonkers to me to include a bugfix by way of instrumentation, but it seems only helpful and also allows the instrumentation to, you know, actually work. 🤘 Thanks for taking that on and getting to the bottom of it so quickly @anuraaga ! 🏆 |
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.
Depends on #2406
Fixes #2403