add unit test

Author: oliver-zhang

instrumentation/log4j/log4j-appender-1.2/javaagent/build.gradle.kts

@@ -34,6 +34,7 @@ configurations {
 tasks.withType<Test>().configureEach {
   // TODO run tests both with and without experimental log attributes
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-mdc-attributes=*")
+  jvmArgs("-Dotel.instrumentation.log4j-appender.experimental.capture-code-attributes=true")
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")
   jvmArgs("-Dotel.instrumentation.log4j-appender.experimental-log-attributes=true")
   jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")

instrumentation/log4j/log4j-appender-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java

@@ -38,7 +38,7 @@ public final class LogEventMapper {
 
   private static final AttributeKey<String> CODE_FILEPATH = AttributeKey.stringKey("code.filepath");
   private static final AttributeKey<String> CODE_FUNCTION = AttributeKey.stringKey("code.function");
-  private static final AttributeKey<String> CODE_LINENO = AttributeKey.stringKey("code.lineno");
+  private static final AttributeKey<Long> CODE_LINENO = AttributeKey.longKey("code.lineno");
   private static final AttributeKey<String> CODE_NAMESPACE =
       AttributeKey.stringKey("code.namespace");
   // copied from org.apache.log4j.Level because it was only introduced in 1.2.12
@@ -125,9 +125,15 @@ public void capture(
       attributes.put(CODE_NAMESPACE, locationInfo.getClassName());
       attributes.put(CODE_FUNCTION, locationInfo.getMethodName());
       String lineNumber = locationInfo.getLineNumber();
-      if (lineNumber != null) {
-        attributes.put(CODE_LINENO, lineNumber);
+      int codeLineNo = 0;
+      if (!lineNumber.equals("?")) {
+        try {
+          codeLineNo = Integer.parseInt(lineNumber);
+        }catch (NumberFormatException e) {
+          // ignore
+        }
       }
+      attributes.put(CODE_LINENO, codeLineNo);
     }
 
     builder.setAllAttributes(attributes.build());

instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java

@@ -11,6 +11,12 @@
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_MESSAGE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_STACKTRACE;
 import static io.opentelemetry.semconv.ExceptionAttributes.EXCEPTION_TYPE;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FILEPATH;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_FUNCTION;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_LINENO;
+import static io.opentelemetry.semconv.incubating.CodeIncubatingAttributes.CODE_NAMESPACE;
+import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_ID;
+import static io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes.THREAD_NAME;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import io.opentelemetry.api.common.AttributeKey;
@@ -31,13 +37,15 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
 import org.apache.log4j.helpers.Loader;
+import org.assertj.core.api.AbstractLongAssert;
 import org.assertj.core.api.AssertAccess;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+@SuppressWarnings("deprecation") // using deprecated semconv
 class Log4j1Test {
 
   static {
@@ -67,6 +75,25 @@ private static Stream<Arguments> provideParameters() {
         Arguments.of(true, true));
   }
 
+  @Test
+  public void testCodeAttributes() {
+    logger.info("this is test message");
+    testing.waitAndAssertLogRecords(
+        logRecord ->
+            logRecord
+                .hasBody("this is test message")
+                .hasInstrumentationScope(InstrumentationScopeInfo.builder("abc").build())
+                .hasSeverity(Severity.INFO)
+                .hasSeverityText("INFO")
+                .hasAttributesSatisfyingExactly(
+                    equalTo(THREAD_NAME, Thread.currentThread().getName()),
+                    equalTo(THREAD_ID, Thread.currentThread().getId()),
+                    equalTo(CODE_NAMESPACE, Log4j1Test.class.getName()),
+                    equalTo(CODE_FUNCTION, "testCodeAttributes"),
+                    satisfies(CODE_LINENO, AbstractLongAssert::isPositive),
+                    equalTo(CODE_FILEPATH, "Log4j1Test.java")));
+  }
+
   @ParameterizedTest
   @MethodSource("provideParameters")
   public void test(boolean logException, boolean withParent) throws InterruptedException {
@@ -79,7 +106,6 @@ public void test(boolean logException, boolean withParent) throws InterruptedExc
     test(Logger::error, Logger::error, logException, withParent, "abc", Severity.ERROR, "ERROR");
     testing.clearData();
   }
-
   private static void test(
       LoggerMethod loggerMethod,
       ExceptionLoggerMethod exceptionLoggerMethod,