Skip to content

Commit 26e6f60

Browse files
author
Jean-Francois Breault
committed
fix disable logback instraumentation
1 parent 8e10717 commit 26e6f60

File tree

1 file changed

+14
-5
lines changed
  • instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging

1 file changed

+14
-5
lines changed

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/instrumentation/logging/LogbackAppenderInstaller.java

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ static void install(ApplicationEnvironmentPreparedEvent applicationEnvironmentPr
3131
private static boolean isLogbackAppenderAddable(
3232
ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent) {
3333
Boolean otelSdkDisableProperty =
34-
evaluateBooleanProperty(applicationEnvironmentPreparedEvent, "otel.sdk.disabled");
34+
evaluateBooleanProperty(applicationEnvironmentPreparedEvent, "otel.sdk.disabled", false);
3535
Boolean logbackInstrumentationEnabledProperty =
3636
evaluateBooleanProperty(
37-
applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-appender.enabled");
38-
return otelSdkDisableProperty == null
39-
|| !otelSdkDisableProperty.booleanValue()
40-
|| logbackInstrumentationEnabledProperty == null
37+
applicationEnvironmentPreparedEvent,
38+
"otel.instrumentation.logback-appender.enabled",
39+
true);
40+
return !otelSdkDisableProperty.booleanValue()
4141
|| logbackInstrumentationEnabledProperty.booleanValue();
4242
}
4343

@@ -133,6 +133,15 @@ private static Boolean evaluateBooleanProperty(
133133
.getProperty(property, Boolean.class);
134134
}
135135

136+
private static Boolean evaluateBooleanProperty(
137+
ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent,
138+
String property,
139+
boolean defaultValue) {
140+
return applicationEnvironmentPreparedEvent
141+
.getEnvironment()
142+
.getProperty(property, Boolean.class, defaultValue);
143+
}
144+
136145
private static Optional<OpenTelemetryAppender> findOpenTelemetryAppender() {
137146
ILoggerFactory loggerFactorySpi = LoggerFactory.getILoggerFactory();
138147
if (!(loggerFactorySpi instanceof LoggerContext)) {

0 commit comments

Comments
 (0)