Unify Log4j2 appender tests #14859
Draft
Unify Log4j2 appender tests #14859
+355
−501
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
|
🔧 The result from spotlessApply was committed to the PR branch. |
trask
commented
Oct 1, 2025
There was a problem hiding this comment.
these tests were moved to the shared testing base class
There was a problem hiding this comment.
these tests were mostly redundant with the javaagent tests which were moved to the new shared base class
| } | ||
|
|
||
| @Test | ||
| void logWithSpan() { // Does not work for log replay, but it is not likely to occur because |
There was a problem hiding this comment.
redundant with the new shared base class tests
| <OpenTelemetry name="OpenTelemetryAppender" numLogsCapturedBeforeOtelInstall="1" captureMapMessageAttributes="true" captureMarkerAttribute="true" captureContextDataAttributes="key1,key2" captureExperimentalAttributes="true" captureCodeAttributes="true"/> | ||
| </Appenders> | ||
| <Loggers> | ||
| <Logger name="TestLogger" level="All"> |
There was a problem hiding this comment.
TestLogger is still used by library tests which were not redundant with common tests
The async logger condition was removed in the previous commit which caused testAsyncLogger to fail. AsyncLogger doesn't capture source location attributes by default in non-latest dependency tests, so this check is needed to return empty code location attributes in that case.
…odeAttributes Changed addCodeLocationAttributes() from static to instance method to enable overriding in subclasses. Library tests now override this method to return empty list since the log4j2.xml configuration lacks captureCodeAttributes. The async logger condition is preserved in both base implementation and override to maintain consistency across all test scenarios.
- Add captureCodeAttributes="true" to library/log4j2.xml - Remove override from library Log4j2Test, use base class method - Base class addCodeLocationAttributes() handles all scenarios: * Returns empty for AsyncLogger + older Log4j2 versions * Returns code location attributes otherwise - All tests pass (library and AsyncLogger)
The javaagent auto-instruments Log4j2 and enables code location capture, which works even with AsyncLogger. Updated addCodeLocationAttributes() to: - Always return code location for javaagent tests - Only skip for library AsyncLogger tests with older dependencies All tests now pass: - javaagent testAsync: ✓ (expects code location) - library test: ✓ (expects code location) - library testAsyncLogger: ✓ (no code location for older deps)
|
🔧 The result from spotlessApply was committed to the PR branch. |
trask
force-pushed
the
unify-log4j2-appender-tests
branch
from
679f376 to
5b21e7f
Compare
trask
commented
Oct 3, 2025
.../src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java
Outdated
Show resolved
Hide resolved
…a/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java
jaydeluca
reviewed
Oct 3, 2025
| } | ||
|
|
||
| protected static List<AttributeAssertion> threadAttributesAssertions() { | ||
| return Arrays.asList( |
There was a problem hiding this comment.
you could do static imports for asList and stringKey and make all of the test methods not public
13 tasks
trask
force-pushed
the
unify-log4j2-appender-tests
branch
from
3f45b8b to
e9cf224
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.
Resolves #4956