code review

Author: oliver-zhang

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

@@ -141,15 +141,15 @@ public void capture(
       }
 
       String lineNumber = locationInfo.getLineNumber();
-      int codeLineNo = 0;
+      int codeLineNo = -1;
       if (!lineNumber.equals("?")) {
         try {
           codeLineNo = Integer.parseInt(lineNumber);
         } catch (NumberFormatException e) {
           // ignore
         }
       }
-      if (codeLineNo > 0) {
+      if (codeLineNo >= 0) {
         if (SemconvStability.isEmitStableCodeSemconv()) {
           attributes.put(CodeAttributes.CODE_LINE_NUMBER, codeLineNo);
         }

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

@@ -11,10 +11,6 @@
 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;
@@ -24,6 +20,7 @@
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil;
 import io.opentelemetry.sdk.common.InstrumentationScopeInfo;
 import io.opentelemetry.sdk.logs.data.LogRecordData;
 import io.opentelemetry.sdk.testing.assertj.AttributeAssertion;
@@ -37,7 +34,6 @@
 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;
@@ -78,20 +74,21 @@ private static Stream<Arguments> provideParameters() {
   @Test
   public void testCodeAttributes() {
     logger.info("this is test message");
+    List<AttributeAssertion> assertions =
+        SemconvCodeStabilityUtil.codeFileAndLineAssertions("Log4j1Test.java");
+    assertions.addAll(
+        SemconvCodeStabilityUtil.codeFunctionAssertions(Log4j1Test.class, "testCodeAttributes"));
+    assertions.add(equalTo(THREAD_NAME, Thread.currentThread().getName()));
+    assertions.add(equalTo(THREAD_ID, Thread.currentThread().getId()));
+
     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")));
+                .hasAttributesSatisfyingExactly(assertions));
   }
 
   @ParameterizedTest