Merged
Conversation
- Load the MDC with the application class loader, as opposed to the Thread's context classloader (fixes elastic#720) - Remove span.id MDC entry This causes the most allocations as in contrast to transaction.id and trace.id, the String manifestation can't be reused. Other agents also don't add the span.id so it makes sense to align on that - Docs improvements - Mention slf4j in supported technologies page
Member
Author
|
run the tests |
eyalkoren
reviewed
Jul 25, 2019
Contributor
eyalkoren
left a comment
eyalkoren
left a comment
There was a problem hiding this comment.
Comments and what we discussed regarding avoiding hard reference to the CL.
In addition, positive test for the fallback context CL.
And lastly- is there common agreement between agents whether the span ID is logged or not?
...pm-slf4j-plugin/src/test/java/co/elastic/apm/agent/slf4j/Slf4JMdcActivationListenerTest.java
Show resolved
Hide resolved
apm-agent-core/src/main/java/co/elastic/apm/agent/impl/transaction/TraceContext.java
Outdated
Show resolved
Hide resolved
apm-agent-core/src/main/java/co/elastic/apm/agent/logging/LoggingConfiguration.java
Outdated
Show resolved
Hide resolved
Codecov Report
@@ Coverage Diff @@
## master #742 +/- ##
============================================
+ Coverage 64.79% 64.89% +0.09%
+ Complexity 169 68 -101
============================================
Files 209 210 +1
Lines 8925 8955 +30
Branches 1147 1157 +10
============================================
+ Hits 5783 5811 +28
+ Misses 2788 2784 -4
- Partials 354 360 +6
Continue to review full report at Codecov.
|
eyalkoren
approved these changes
Jul 25, 2019
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Thread's context classloader (fixes Stop using Thread context class loader for log correlation #720)
This causes the most allocations as in contrast to transaction.id and
trace.id, the String manifestation can't be reused.
Other agents also don't add the span.id so it makes sense to align on that
closes #724