Skip to content

Add code attributes for log4j1 #13947

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 27 commits into from
Aug 20, 2025
Merged

Add code attributes for log4j1 #13947

merged 27 commits into from
Aug 20, 2025

Conversation

oliver-zhang
Copy link
Contributor

Add the ability to get code attributes for log4j1

@oliver-zhang oliver-zhang requested a review from a team as a code owner May 29, 2025 07:19
@linux-foundation-easycla Linux Foundation: EasyCLA
Copy link

linux-foundation-easycla bot commented May 29, 2025 •
edited
Loading

CLA Signed

The committers listed above are authorized under a signed CLA.

@oliver-zhang oliver-zhang marked this pull request as draft May 29, 2025 07:21
@oliver-zhang oliver-zhang marked this pull request as ready for review May 29, 2025 07:35
@oliver-zhang
Copy link
Contributor Author

/easycla

trask
trask reviewed May 29, 2025
View reviewed changes
Copy link
Member

@trask trask left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @oliver-zhang! can you add tests for this similar to those in log4j2?

@oliver-zhang
Copy link
Contributor Author

hi @oliver-zhang! can you add tests for this similar to those in log4j2?

Unit tests have been added

@oliver-zhang oliver-zhang requested a review from trask June 6, 2025 01:22
@trask
Copy link
Member

trask commented Jun 19, 2025

hi @oliver-zhang, thanks for your patience, hopefully we should get #13860 merged in the next few days and then you can rebase and update your PR

SylvainJuge
SylvainJuge approved these changes Jun 27, 2025
View reviewed changes
...javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java Outdated
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

@SuppressWarnings("deprecation") // using deprecated semconv
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[minor] probably not needed anymore

@trask trask added this to the v2.18.0 milestone Jun 28, 2025
@SylvainJuge SylvainJuge self-requested a review July 11, 2025 11:26
@SylvainJuge
Copy link
Contributor

Hi @oliver-zhang, there are still a few test failures, for example in io.opentelemetry.instrumentation.log4j.appender.v1_2.Log4j1Test, can you take a look and fix them ?

@trask trask removed this from the v2.18.0 milestone Jul 17, 2025
@oliver-zhang oliver-zhang marked this pull request as draft July 23, 2025 01:26
@SylvainJuge
Copy link
Contributor

I've implemented the test fixes in oliver-zhang#1, so it should be mostly a matter of merging it to fix the remaining issues. Once this is done @oliver-zhang you should be able to mark it as ready for review and we should be able to merge it once all the checks are passing.

@SylvainJuge SylvainJuge self-requested a review August 11, 2025 12:16
@oliver-zhang oliver-zhang marked this pull request as ready for review August 12, 2025 01:39
@trask trask merged commit c0e4684 into open-telemetry:main Aug 20, 2025
89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SylvainJuge SylvainJuge SylvainJuge approved these changes

@trask trask Awaiting requested review from trask

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@oliver-zhang @trask @SylvainJuge