Skip to content
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

Fix bug with log4j2 metrics not getting disabled #1068

Merged
merged 1 commit into from
Nov 4, 2022
Merged

Fix bug with log4j2 metrics not getting disabled #1068

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions ...4j-2/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig_Instrumentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,19 @@ public LoggerConfig_Instrumentation() {

protected void callAppenders(LogEvent event) {
// Do nothing if application_logging.enabled: false
// Do nothing if logger has parents and isAdditive is set to true to avoid duplicated counters and logs
if (isApplicationLoggingEnabled() && getParent() == null || !isAdditive()) {
if (isApplicationLoggingMetricsEnabled()) {
// Generate log level metrics
NewRelic.incrementCounter("Logging/lines");
NewRelic.incrementCounter("Logging/lines/" + event.getLevel().toString());
}
if (isApplicationLoggingEnabled()) {
// Do nothing if logger has parents and isAdditive is set to true to avoid duplicated counters and logs
if (getParent() == null || !isAdditive()) {
if (isApplicationLoggingMetricsEnabled()) {
// Generate log level metrics
NewRelic.incrementCounter("Logging/lines");
NewRelic.incrementCounter("Logging/lines/" + event.getLevel().toString());
}

if (isApplicationLoggingForwardingEnabled()) {
// Record and send LogEvent to New Relic
recordNewRelicLogEvent(event);
if (isApplicationLoggingForwardingEnabled()) {
// Record and send LogEvent to New Relic
recordNewRelicLogEvent(event);
}
}
}
Weaver.callOriginal();
Expand Down