Logback: don't make MDCPropertyMap of logging event immutable #12718
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
jeanbisutti
reviewed
Nov 13, 2024
| import ch.qos.logback.core.spi.AppenderAttachableImpl; | ||
| import java.util.Iterator; | ||
|
|
||
| public class TestAppender extends UnsynchronizedAppenderBase<ILoggingEvent> |
There was a problem hiding this comment.
Suggested change
| public class TestAppender extends UnsynchronizedAppenderBase<ILoggingEvent> | |
| class TestAppender extends UnsynchronizedAppenderBase<ILoggingEvent> |
There was a problem hiding this comment.
this class must be public
...y/src/test/java/io/opentelemetry/instrumentation/logback/mdc/v1_0/internal/UnionMapTest.java
Show resolved
Hide resolved
jaydeluca
reviewed
Nov 14, 2024
| if (eventContext == null) { | ||
| eventContext = contextData; | ||
| } else { | ||
| eventContext = new UnionMap<>(eventContext, contextData); |
There was a problem hiding this comment.
was there some benefit in retaining both individual maps with the use of UnionMap that we lose now?
There was a problem hiding this comment.
It avoided copying the original map.
jaydeluca
approved these changes
Nov 14, 2024
steverao
reviewed
Nov 14, 2024
| runWithSpanAndBaggage("test", baggage, () -> logger.info("log message")); | ||
|
|
||
| assertThat(testAppender.lastEvent.getMessage()).isEqualTo("log message"); | ||
| Map<String, String> map = testAppender.lastEvent.getMDCPropertyMap(); |
There was a problem hiding this comment.
There are two instrumentation points:
Is there any reason to miss
getMdc test here?
There was a problem hiding this comment.
This is a library instrumentation tests. It only serves as a regression test to ensure that we don't accidentally introduce something similar to the union map in the future.
akats7
pushed a commit
to akats7/opentelemetry-java-instrumentation
that referenced
this pull request
Nov 21, 2024
akats7
pushed a commit
to akats7/opentelemetry-java-instrumentation
that referenced
this pull request
Nov 21, 2024
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.
Resolves #12615