diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts b/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts index 660bf9a6b2ce..705211f467cf 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts +++ b/instrumentation/logback/logback-appender-1.0/javaagent/build.gradle.kts @@ -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") } diff --git a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java index f91ad32f394d..83299de4e385 100644 --- a/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java +++ b/instrumentation/logback/logback-appender-1.0/javaagent/src/test/java/io/opentelemetry/instrumentation/logback/appender/v1_0/LogbackTest.java @@ -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; @@ -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 { diff --git a/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java b/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java index dc4c51c44a8e..88b58a0246fb 100644 --- a/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java +++ b/instrumentation/logback/logback-mdc-1.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/logback/mdc/v1_0/LogbackMdcInstrumentationModule.java @@ -29,11 +29,4 @@ public List 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; - } }