apache
Synchronization with `main` backlog
This meta-issue lists the PRs or modifications that didn't make it to main yet. Feel free to modify it after each merged PR that you don't have time or can not port immediately:
- [ ] #2716
- [ ] #2962
- [x] #3055
- [x] #3052
- [x] #3118
- [ ] #3158
- [x] #3133
- [x] #3175 (not needed before first
3.0.0release) - [ ] #3226
- [ ] #3195
- [x] #3338
- [x] #3259
- [x] #3260
- [ ] #3265
- [ ] #3217 (documentation part)
- [ ] #3381
- [ ] #3418
- [x] #3438
- [x] #3469
- [ ] #3467
- [x] https://github.com/apache/logging-log4j2/commit/e9168137ab4463013aa8d3007812b4a1cf569dac
Ported PRs:
- [ ] #3583
- [x] #3584
- [x] #3586
- [ ] #3171
- [x] #3372
- [x] #3322
Hi @ppkarwasz, I’d like to help with porting some of the changes listed here from 2.x to main.
I’m planning to start with: • [ ] Remove outdated @BaselineIgnore annotations (#3133)
I’ll create separate PRs for each, referencing this issue. Please let me know if this approach works or if you’d prefer I prioritize other items.
I’d like to help with porting some of the changes listed here from 2.x to main.
@ramanathan1504, please be our guest in doing so. PR-per-issue is a good idea. I advise starting with simpler ones and making your way to more involved issues.
@vy Thanks for the guidance! I’ll begin with the smaller issues to get familiar with the codebase and then tackle the more complex ones.
Hi @ramanathan1504,
Thank you for the help. Please coordinate with @jvz, since he is also working on these ports.
Hi @jvz, I noticed that PR #3381 fixed issue #3170 in the 2.x branch. Should this also be ported into main? If it’s not already in progress, I’d be happy to take it up.
can I take pr #3199
@ramanathan1504, go ahead. (AFAIK, @jvz is busy with DI- and plugins-related tasks.)
Hi @vy,
While working on this PR I noticed that the failing tests are related to earlier work in PR #3418 (issues #3252, #3399, and the discussion in #3209). That some change seems to have landed in the 2.24 branch, but I don’t see it yet in 2.x or main.
Am I correct that the fix needs to be ported forward (from 2.24 → 2.x → main) before this PR can pass cleanly?
Would you like me to take care of the porting as part of this PR (or as separate follow-ups), or should I rebase on a branch where the port has already been done?
The changes to InternalLoggerRegistry were added to 2.x in #3681. They didn't end up in main as far as I know, though.
@ppkarwasz so first #3681 needs to port then i will port #3199 and related pr's to main..right?
Both those PRs are already merged, so:
- First #3199 needs to be cherry picked, because it introduces
InternalLoggerRegistry. - Then #3681 needs to be cherry picked.
Of course, this can be done in one PR. Since main does not host the Log4j API any more, parts of those PR need to be simply discarded.
I'm not actively working on other issues at the moment, but I am available for code review and to answer questions about how things work. @ramanathan1504
Both those PRs are already merged, so:
- First Removes weak references from
LoggerRepository#3199 needs to be cherry picked, because it introducesInternalLoggerRegistry.- Then Expunge stale entries in InternalLoggerRegistry #3681 needs to be cherry picked.
Of course, this can be done in one PR. Since
maindoes not host the Log4j API any more, parts of those PR need to be simply discarded.
Thanks! This all started when I was working on #3418, so I’ll reach out if I have any questions along the way.
so can I skip and take some other
I'm not actively working on other issues at the moment, but I am available for code review and to answer questions about how things work. @ramanathan1504
Thanks! I’ll reach out if I have any questions.
what about #3789?
@ashr123, feel free to submit a PR porting #3789 from 2.x to main.