split

Author: trask

instrumentation/log4j/log4j-appender-2.17/library/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/Log4j2Test.java

@@ -7,6 +7,9 @@
 
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.LibraryInstrumentationExtension;
+import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -30,4 +33,17 @@ static void cleanup() {
   protected InstrumentationExtension testing() {
     return testing;
   }
+
+  @Override
+  protected List<AttributeAssertion> addCodeLocationAttributes(String methodName) {
+    // For library tests, AsyncLogger can't capture code location in older versions
+    String selector = System.getProperty("Log4j2.contextSelector");
+    boolean async = selector != null && selector.endsWith("AsyncLoggerContextSelector");
+    if (async && !Boolean.getBoolean("testLatestDeps")) {
+      // source info is not available by default when async logger is used in non latest dep tests
+      return new ArrayList<>();
+    }
+
+    return super.addCodeLocationAttributes(methodName);
+  }
 }

instrumentation/log4j/log4j-appender-2.17/testing/src/main/java/io/opentelemetry/instrumentation/log4j/appender/v2_17/AbstractLog4j2Test.java

@@ -266,23 +266,8 @@ protected static void performLogging(
   }
 
   protected List<AttributeAssertion> addCodeLocationAttributes(String methodName) {
-    // For javaagent tests, code location is always captured (even with AsyncLogger)
+    // Javaagent tests always capture code location (even with AsyncLogger)
     // because the javaagent auto-instruments the appender
-    boolean isJavaagent = testing()
-        .getClass()
-        .getName()
-        .contains("AgentInstrumentationExtension");
-    
-    if (!isJavaagent) {
-      // For library tests, AsyncLogger can't capture code location in older versions
-      String selector = System.getProperty("Log4j2.contextSelector");
-      boolean async = selector != null && selector.endsWith("AsyncLoggerContextSelector");
-      if (async && !Boolean.getBoolean("testLatestDeps")) {
-        // source info is not available by default when async logger is used in non latest dep tests
-        return new ArrayList<>();
-      }
-    }
-
     List<AttributeAssertion> result = new ArrayList<>();
     result.addAll(codeFunctionAssertions(AbstractLog4j2Test.class, methodName));
     result.addAll(codeFileAndLineAssertions("AbstractLog4j2Test.java"));