Unify library config with captureCodeAttributes and smart verification

- Add captureCodeAttributes="true" to library/log4j2.xml
- Remove override from library Log4j2Test, use base class method
- Base class addCodeLocationAttributes() handles all scenarios:
  * Returns empty for AsyncLogger + older Log4j2 versions
  * Returns code location attributes otherwise
- All tests pass (library and AsyncLogger)

Author: trask

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

@@ -7,9 +7,6 @@
 
 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;
@@ -33,18 +30,4 @@ static void cleanup() {
   protected InstrumentationExtension testing() {
     return testing;
   }
-
-  @Override
-  protected List<AttributeAssertion> addCodeLocationAttributes(String methodName) {
-    // Library test configuration doesn't have captureCodeAttributes="true"
-    // so code location attributes should not be captured
-    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<>();
-    }
-    // For library tests without captureCodeAttributes, don't expect code location
-    return new ArrayList<>();
-  }
 }

instrumentation/log4j/log4j-appender-2.17/library/src/test/resources/log4j2.xml

@@ -6,7 +6,7 @@
         pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} traceId: %X{trace_id} spanId: %X{span_id} flags: %X{trace_flags} - %msg%n"/>
     </Console>
     <!-- TODO run tests both with and without experimental log attributes -->
-    <OpenTelemetry name="OpenTelemetryAppender" numLogsCapturedBeforeOtelInstall="1" captureMapMessageAttributes="true" captureMarkerAttribute="true" captureContextDataAttributes="key1,key2" captureExperimentalAttributes="true" captureCodeAttributes="true"/>
+    <OpenTelemetry name="OpenTelemetryAppender" numLogsCapturedBeforeOtelInstall="1" captureCodeAttributes="true" captureMapMessageAttributes="true" captureMarkerAttribute="true" captureContextDataAttributes="key1,key2" captureExperimentalAttributes="true"/>
   </Appenders>
   <Loggers>
     <Logger name="TestLogger" level="All">