Skip to content

Declarative config for logback appender installer #15813

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

Open
zeitlinger wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Declarative config for logback appender installer #15813

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
675e953
rename method for clarity
zeitlinger Jan 9, 2026
883c7d7
delete DeprecatedConfigProperties
zeitlinger Jan 9, 2026
f061178
pr review
zeitlinger Jan 9, 2026
4ed36d6
pr review
zeitlinger Jan 9, 2026
a8a7561
pr review
zeitlinger Jan 12, 2026
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
48 changes: 0 additions & 48 deletions ...entelemetry/instrumentation/spring/autoconfigure/internal/DeprecatedConfigProperties.java
View file
Open in desktop

This file was deleted.

43 changes: 20 additions & 23 deletions ...ation/spring/autoconfigure/internal/instrumentation/logging/LogbackAppenderInstaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import io.opentelemetry.instrumentation.logback.appender.v1_0.OpenTelemetryAppender;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.DeprecatedConfigProperties;
import io.opentelemetry.instrumentation.spring.autoconfigure.internal.EarlyConfig;
import java.util.Iterator;
import java.util.Optional;
Expand Down Expand Up @@ -92,78 +91,76 @@ private static void initializeOpenTelemetryAppenderFromProperties(
// org.springframework.boot.context.logging.LoggingApplicationListener, config properties not
// available
Boolean codeAttribute =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-code-attributes");
if (codeAttribute != null) {
openTelemetryAppender.setCaptureCodeAttributes(codeAttribute.booleanValue());
openTelemetryAppender.setCaptureCodeAttributes(codeAttribute);
}

Boolean markerAttribute =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-marker-attribute");
if (markerAttribute != null) {
openTelemetryAppender.setCaptureMarkerAttribute(markerAttribute.booleanValue());
openTelemetryAppender.setCaptureMarkerAttribute(markerAttribute);
}

Boolean keyValuePairAttributes =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-key-value-pair-attributes");
if (keyValuePairAttributes != null) {
openTelemetryAppender.setCaptureKeyValuePairAttributes(keyValuePairAttributes.booleanValue());
openTelemetryAppender.setCaptureKeyValuePairAttributes(keyValuePairAttributes);
}

Boolean logAttributes =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental-log-attributes");
if (logAttributes != null) {
openTelemetryAppender.setCaptureExperimentalAttributes(logAttributes.booleanValue());
openTelemetryAppender.setCaptureExperimentalAttributes(logAttributes);
}

Boolean loggerContextAttributes =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-logger-context-attributes");
if (loggerContextAttributes != null) {
openTelemetryAppender.setCaptureLoggerContext(loggerContextAttributes.booleanValue());
openTelemetryAppender.setCaptureLoggerContext(loggerContextAttributes);
}

Boolean captureTemplate =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-template");
if (captureTemplate != null) {
openTelemetryAppender.setCaptureTemplate(captureTemplate.booleanValue());
openTelemetryAppender.setCaptureTemplate(captureTemplate);
}

Boolean captureArguments =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-arguments");
if (captureArguments != null) {
openTelemetryAppender.setCaptureArguments(captureArguments.booleanValue());
openTelemetryAppender.setCaptureArguments(captureArguments);
}

Boolean captureLogstashMarkerAttributes =
DeprecatedConfigProperties.getBoolean(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-logstash-markers",
"otel.instrumentation.logback-appender.experimental.capture-logstash-marker-attributes");
if (captureLogstashMarkerAttributes != null) {
openTelemetryAppender.setCaptureLogstashMarkerAttributes(
captureLogstashMarkerAttributes.booleanValue());
openTelemetryAppender.setCaptureLogstashMarkerAttributes(captureLogstashMarkerAttributes);
}

Boolean captureLogstashStructuredArguments =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent,
"otel.instrumentation.logback-appender.experimental.capture-logstash-structured-arguments");
if (captureLogstashStructuredArguments != null) {
openTelemetryAppender.setCaptureLogstashStructuredArguments(
captureLogstashStructuredArguments.booleanValue());
captureLogstashStructuredArguments);
}

String mdcAttributeProperty =
Expand Down Expand Up @@ -206,7 +203,7 @@ private static void initializeMdcAppenderFromProperties(
// org.springframework.boot.context.logging.LoggingApplicationListener, config properties not
// available
Boolean addBaggage =
evaluateBooleanProperty(
evaluateBooleanPropertyDeclarativeConifigOrLegacy(
applicationEnvironmentPreparedEvent, "otel.instrumentation.logback-mdc.add-baggage");
if (addBaggage != null) {
openTelemetryAppender.setAddBaggage(addBaggage);
Expand Down Expand Up @@ -237,7 +234,7 @@ private static void initializeMdcAppenderFromProperties(
}
}

private static Boolean evaluateBooleanProperty(
private static Boolean evaluateBooleanPropertyDeclarativeConifigOrLegacy(
ApplicationEnvironmentPreparedEvent applicationEnvironmentPreparedEvent, String property) {
ConfigurableEnvironment environment = applicationEnvironmentPreparedEvent.getEnvironment();
return environment.getProperty(
Expand Down
Loading