Merge branch 'main' into otelbot/code-review-spring-boot-actuator-autoconfigure-2.0-javaagent

Author: jeanbisutti

instrumentation/servlet/servlet-common/library/build.gradle.kts

@@ -1,7 +1,3 @@
 plugins {
   id("otel.library-instrumentation")
 }
-
-dependencies {
-  implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
-}

instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletAdditionalAttributesExtractor.java

@@ -6,7 +6,6 @@
 package io.opentelemetry.instrumentation.servlet.internal;
 
 import static io.opentelemetry.api.common.AttributeKey.longKey;
-import static io.opentelemetry.semconv.incubating.EnduserIncubatingAttributes.ENDUSER_ID;
 
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
@@ -23,6 +22,8 @@ public class ServletAdditionalAttributesExtractor<REQUEST, RESPONSE>
     implements AttributesExtractor<
         ServletRequestContext<REQUEST>, ServletResponseContext<RESPONSE>> {
 
+  // copied from EnduserIncubatingAttributes
+  private static final AttributeKey<String> ENDUSER_ID = AttributeKey.stringKey("enduser.id");
   private static final AttributeKey<Long> SERVLET_TIMEOUT = longKey("servlet.timeout");
 
   private final ServletAccessor<REQUEST, RESPONSE> accessor;
@@ -54,10 +55,7 @@ public void onEnd(
     if (captureEnduserId) {
       Principal principal = accessor.getRequestUserPrincipal(requestContext.request());
       if (principal != null) {
-        String name = principal.getName();
-        if (name != null) {
-          attributes.put(ENDUSER_ID, name);
-        }
+        attributes.put(ENDUSER_ID, principal.getName());
       }
     }
     if (!captureExperimentalAttributes) {

instrumentation/servlet/servlet-common/library/src/main/java/io/opentelemetry/instrumentation/servlet/internal/ServletRequestGetter.java

@@ -5,8 +5,11 @@
 
 package io.opentelemetry.instrumentation.servlet.internal;
 
+import static java.util.Collections.emptyIterator;
+
 import io.opentelemetry.context.propagation.TextMapGetter;
 import java.util.Iterator;
+import javax.annotation.Nullable;
 
 class ServletRequestGetter<REQUEST> implements TextMapGetter<ServletRequestContext<REQUEST>> {
   protected final ServletAccessor<REQUEST, ?> accessor;
@@ -21,12 +24,19 @@ public Iterable<String> keys(ServletRequestContext<REQUEST> carrier) {
   }
 
   @Override
-  public String get(ServletRequestContext<REQUEST> carrier, String key) {
+  @Nullable
+  public String get(@Nullable ServletRequestContext<REQUEST> carrier, String key) {
+    if (carrier == null) {
+      return null;
+    }
     return accessor.getRequestHeader(carrier.request(), key);
   }
 
   @Override
-  public Iterator<String> getAll(ServletRequestContext<REQUEST> carrier, String key) {
+  public Iterator<String> getAll(@Nullable ServletRequestContext<REQUEST> carrier, String key) {
+    if (carrier == null) {
+      return emptyIterator();
+    }
     return accessor.getRequestHeaderValues(carrier.request(), key).iterator();
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts

@@ -54,7 +54,6 @@ tasks {
       excludeTestsMatching("*CustomSpanEventTest")
     }
 
-    systemProperty("collectMetadata", findProperty("collectMetadata"))
     systemProperty("metadataConfig", "otel.instrumentation.spring-batch.experimental-span-attributes=true")
   }
 
@@ -63,6 +62,7 @@ tasks {
   }
 
   withType<Test>().configureEach {
+    systemProperty("collectMetadata", findProperty("collectMetadata"))
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     jvmArgs("-Dotel.instrumentation.spring-batch.enabled=true")
     // TODO run tests both with and without experimental span attributes

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/job/JobFactoryBeanInstrumentation.java

@@ -7,7 +7,6 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.isArray;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
-import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -33,10 +32,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(isConstructor(), this.getClass().getName() + "$InitAdvice");
     transformer.applyAdviceToMethod(
-        isMethod()
-            .and(named("setJobExecutionListeners"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, isArray())),
+        named("setJobExecutionListeners").and(takesArguments(1)).and(takesArgument(0, isArray())),
         this.getClass().getName() + "$SetListenersAdvice");
   }
 

instrumentation/spring/spring-batch-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/job/JobParserJobFactoryBeanInstrumentation.java

@@ -7,7 +7,6 @@
 
 import static net.bytebuddy.matcher.ElementMatchers.isArray;
 import static net.bytebuddy.matcher.ElementMatchers.isConstructor;
-import static net.bytebuddy.matcher.ElementMatchers.isMethod;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 import static net.bytebuddy.matcher.ElementMatchers.takesArguments;
@@ -34,10 +33,7 @@ public ElementMatcher<TypeDescription> typeMatcher() {
   public void transform(TypeTransformer transformer) {
     transformer.applyAdviceToMethod(isConstructor(), this.getClass().getName() + "$InitAdvice");
     transformer.applyAdviceToMethod(
-        isMethod()
-            .and(named("setJobExecutionListeners"))
-            .and(takesArguments(1))
-            .and(takesArgument(0, isArray())),
+        named("setJobExecutionListeners").and(takesArguments(1)).and(takesArgument(0, isArray())),
         this.getClass().getName() + "$SetListenersAdvice");
   }
 

instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/basic/JavaConfigBatchJobTest.java

@@ -17,7 +17,7 @@ class JavaConfigBatchJobTest extends SpringBatchTest {
       new ApplicationConfigRunner(
           () -> new AnnotationConfigApplicationContext(SpringBatchApplication.class));
 
-  public JavaConfigBatchJobTest() {
+  JavaConfigBatchJobTest() {
     super(runner);
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/basic/JsrConfigBatchJobTest.java

@@ -16,7 +16,7 @@ protected boolean hasPartitionManagerStep() {
 
   @RegisterExtension static final JavaxBatchConfigRunner runner = new JavaxBatchConfigRunner();
 
-  public JsrConfigBatchJobTest() {
+  JsrConfigBatchJobTest() {
     super(runner);
   }
 }

instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/basic/SpringBatchTest.java

@@ -28,7 +28,7 @@ abstract class SpringBatchTest {
   @RegisterExtension
   static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
 
-  public SpringBatchTest(JobRunner runner) {
+  SpringBatchTest(JobRunner runner) {
     this.runner = runner;
   }
 

instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/basic/XmlConfigBatchJobTest.java

@@ -15,7 +15,7 @@ class XmlConfigBatchJobTest extends SpringBatchTest {
   static final ApplicationConfigRunner runner =
       new ApplicationConfigRunner(() -> new ClassPathXmlApplicationContext("spring-batch.xml"));
 
-  public XmlConfigBatchJobTest() {
+  XmlConfigBatchJobTest() {
     super(runner);
   }
 }