Skip to content

Revert "Expose values added by logback mdc instrumentation to the appender instrumentation (#14904)" #14999

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

Merged
merged 1 commit into from
Oct 16, 2025
Merged

Revert "Expose values added by logback mdc instrumentation to the appender instrumentation (#14904)" #14999

Show file tree
Hide file tree
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
2 changes: 0 additions & 2 deletions instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ dependencies {

implementation(project(":instrumentation:logback:logback-appender-1.0:library"))

testInstrumentation(project(":instrumentation:logback:logback-mdc-1.0:javaagent"))

testImplementation("org.awaitility:awaitility")
}

Expand Down
10 changes: 0 additions & 10 deletions ...ent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import io.opentelemetry.api.common.AttributeKey;
import io.opentelemetry.api.logs.Severity;
import io.opentelemetry.api.trace.SpanContext;
import io.opentelemetry.api.trace.TraceFlags;
import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
Expand Down Expand Up @@ -168,15 +167,6 @@ private static void test(
satisfies(
EXCEPTION_STACKTRACE, v -> v.contains(LogbackTest.class.getName()))));
}
if (withParent) {
SpanContext spanContext = testing.spans().get(0).getSpanContext();
attributeAsserts.addAll(
Arrays.asList(
equalTo(AttributeKey.stringKey("trace_id"), spanContext.getTraceId()),
equalTo(AttributeKey.stringKey("span_id"), spanContext.getSpanId()),
equalTo(
AttributeKey.stringKey("trace_flags"), TraceFlags.getSampled().asHex())));
}
logRecord.hasAttributesSatisfyingExactly(attributeAsserts);
});
} else {
Expand Down
7 changes: 0 additions & 7 deletions ...telemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,4 @@ public List<TypeInstrumentation> typeInstrumentations() {
public boolean isIndyReady() {
return true;
}

@Override
public int order() {
// run before logback appender instrumentation so that the appender instrumentation can observe
// the attributes added to the mdc by this instrumentation
return -1;
}
}
Loading