Skip to content

Conversation

mkuratczyk
Copy link
Contributor

@mkuratczyk mkuratczyk commented Aug 28, 2025

Backport of #14232 for v4.1.x.
There were many conflicts so it's not a straightforward backport. Some automation
was used to resolve conflicts. Some indentation is wrong, but hopefully we can ignore this
(it's good, or at least better, on main).

For the record, I don't feel great about backporting these changes. :)
But if it's hard to backport anything else because of that, I guess we can do this.

@mergify mergify bot added the make label Aug 28, 2025
mkuratczyk and others added 29 commits September 3, 2025 09:07
It's added automatically by logger
`?RMQLOG_DOMAIN_GLOBAL` used to be added by a now deleted logging
module rabbit_log.
Some community plugins use rabbit_log. To simplify
the transition, we can keep this module as a simple
wrapper on logger macros.
The continuation lines in multi-line LOG macro calls should align
with the opening quote character of the format string.
Fixed alignment in:
- amqp_channel.erl: 3 instances
- amqp_gen_connection.erl: 2 instances
- rabbit_fifo_client.erl: 2 instances

Continuation lines now properly align with the opening quote.
@mkuratczyk mkuratczyk force-pushed the v4.1.x-consistent-logging branch from 822453f to e73955a Compare September 3, 2025 07:08
@mkuratczyk mkuratczyk changed the title DO NOT MERGE v4.1.x consistent logging v4.1.x consistent logging Sep 3, 2025
@mkuratczyk mkuratczyk marked this pull request as ready for review September 3, 2025 08:25
@michaelklishin
Copy link
Collaborator

I agree, the only reason for backporting #14232 is to avoid conflicts in many other PRs, both present and future ones, because logging touches every subsystem and every module.

Thank you!

@michaelklishin michaelklishin added this to the 4.1.5 milestone Sep 3, 2025
@michaelklishin michaelklishin changed the title v4.1.x consistent logging v4.1.x consistent logging (with ?LOG_MACROs) Sep 3, 2025
@michaelklishin michaelklishin merged commit 00251e9 into v4.1.x Sep 3, 2025
545 of 550 checks passed
@michaelklishin michaelklishin deleted the v4.1.x-consistent-logging branch September 3, 2025 17:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants