-
Notifications
You must be signed in to change notification settings - Fork 1k
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.
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
Rebind log4j2 metrics if configuration is changed #5810
base: main
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you for the quick turnaround time on submitting a pull request for this. It generally looks good to me. Will metrics filters still be configured on the old Configuration instance? Should that be the case? Does that not result in a memory leak of sorts?
Thanks for the review! That is a good point! I don't think it would be any big issue, as the old configuration is already stopped here, but I do think it would be cleaner to clean up any old references to I made a new commit here where I also do a cleanup of the old configuration instance. I also changed the changeListener to only do an update if the configuration instance is not the same object as the old instance (as no rebinding or cleanup should be needed then). |
4361d51
to
41d0e7e
Compare
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/logging/Log4j2Metrics.java
Outdated
Show resolved
Hide resolved
Kind of unrelated to this PR, so I haven't changed it, but the call to loggerContext.updateLoggers(configuration); Seems to be completely unnecessary. I don't know how expensive this operation is, but it seems to be unnecessary to trigger a reload as this class modifies the configuration in-place? |
30c036c
to
466e132
Compare
* Use `PropertyChangeListener` to rebind the `MetricsFilter` to log4j2 if configuration is reloaded * Keep track of the listener to deregister it when we close the binder Signed-off-by: Patrik Ivarsson <patrik.ivarsson@avanza.se>
466e132
to
ffe57d9
Compare
Basically it does two things:
|
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/logging/Log4j2Metrics.java
Outdated
Show resolved
Hide resolved
micrometer-core/src/main/java/io/micrometer/core/instrument/binder/logging/Log4j2Metrics.java
Show resolved
Hide resolved
Signed-off-by: Patrik Ivarsson <patrik.ivarsson@avanza.se>
.filter(loggerConfig -> !loggerConfig.isAdditive()) | ||
.forEach(loggerConfig -> { | ||
if (loggerConfig != rootLoggerConfig) { | ||
metricsFilters.values().forEach(rootLoggerConfig::removeFilter); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this be loggerConfig::removeFilter
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah it should, I must have messed this up during the rebase... 😅 Fixed!
Signed-off-by: Patrik Ivarsson <patrik.ivarsson@avanza.se>
Describe the issue
This PR is intended to fix #5756
When log4j2 metrics are reconfigured, metrics will no longer be recorded. For example, if
monitorInterval
(docs) is configured to 30 is used and configuration is reloaded after application start, metrics would only be recorded for the first 30 seconds.By using a
PropertyChangeListener
, it looks like we can register theMetricsFilter
in much the same way, but it will be rebound after reloading the configuration. All the previous tests seem to pass too when using this method of configuration.