Merge remote-tracking branch 'upstream/main' into changelog

Author: trask

conventions/build.gradle.kts

@@ -64,7 +64,7 @@ dependencies {
   implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
   implementation("org.spdx:spdx-gradle-plugin:0.8.0")
   // When updating, also update dependencyManagement/build.gradle.kts
-  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.4")
+  implementation("net.bytebuddy:byte-buddy-gradle-plugin:1.15.5")
   implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
   implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.2")
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.0.1")

dependencyManagement/build.gradle.kts

@@ -41,7 +41,7 @@ val DEPENDENCY_BOMS = listOf(
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
 val errorProneVersion = "2.33.0"
-val byteBuddyVersion = "1.15.4"
+val byteBuddyVersion = "1.15.5"
 val asmVersion = "9.7.1"
 val jmhVersion = "1.37"
 val mockitoVersion = "4.11.0"

gradle-plugins/build.gradle.kts

@@ -24,7 +24,7 @@ configurations.named("compileOnly") {
   extendsFrom(bbGradlePlugin)
 }
 
-val byteBuddyVersion = "1.15.4"
+val byteBuddyVersion = "1.15.5"
 val aetherVersion = "1.1.0"
 
 dependencies {

instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java

@@ -13,13 +13,16 @@
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
 import com.amazonaws.services.lambda.runtime.events.SQSEvent;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.awslambdacore.v1_0.AwsLambdaRequest;
+import io.opentelemetry.instrumentation.awslambdacore.v1_0.internal.MapUtils;
 import io.opentelemetry.javaagent.bootstrap.OpenTelemetrySdkAccess;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -60,7 +63,11 @@ public static void onEnter(
         @Advice.Local("otelFunctionScope") Scope functionScope,
         @Advice.Local("otelMessageContext") io.opentelemetry.context.Context messageContext,
         @Advice.Local("otelMessageScope") Scope messageScope) {
-      input = AwsLambdaRequest.create(context, arg, Collections.emptyMap());
+      Map<String, String> headers = Collections.emptyMap();
+      if (arg instanceof APIGatewayProxyRequestEvent) {
+        headers = MapUtils.lowercaseMap(((APIGatewayProxyRequestEvent) arg).getHeaders());
+      }
+      input = AwsLambdaRequest.create(context, arg, headers);
       io.opentelemetry.context.Context parentContext =
           AwsLambdaInstrumentationHelper.functionInstrumenter().extract(input);
 
@@ -87,6 +94,7 @@ public static void onEnter(
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
     public static void stopSpan(
         @Advice.Argument(value = 0, typing = Typing.DYNAMIC) Object arg,
+        @Advice.Return Object result,
         @Advice.Thrown Throwable throwable,
         @Advice.Local("otelInput") AwsLambdaRequest input,
         @Advice.Local("otelFunctionContext") io.opentelemetry.context.Context functionContext,
@@ -103,7 +111,7 @@ public static void stopSpan(
       if (functionScope != null) {
         functionScope.close();
         AwsLambdaInstrumentationHelper.functionInstrumenter()
-            .end(functionContext, input, null, throwable);
+            .end(functionContext, input, result, throwable);
       }
 
       OpenTelemetrySdkAccess.forceFlush(1, TimeUnit.SECONDS);

instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaApiGatewayHandlerTest.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright The OpenTelemetry Authors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package io.opentelemetry.javaagent.instrumentation.awslambdaevents.v2_2;
+
+import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.equalTo;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+import com.amazonaws.services.lambda.runtime.Context;
+import com.amazonaws.services.lambda.runtime.RequestHandler;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyRequestEvent;
+import com.amazonaws.services.lambda.runtime.events.APIGatewayProxyResponseEvent;
+import io.opentelemetry.api.trace.SpanKind;
+import io.opentelemetry.instrumentation.testing.junit.AgentInstrumentationExtension;
+import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
+import io.opentelemetry.semconv.HttpAttributes;
+import io.opentelemetry.semconv.UrlAttributes;
+import io.opentelemetry.semconv.UserAgentAttributes;
+import io.opentelemetry.semconv.incubating.FaasIncubatingAttributes;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.RegisterExtension;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class AwsLambdaApiGatewayHandlerTest {
+
+  @RegisterExtension
+  public static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+
+  @Mock private Context context;
+
+  @BeforeEach
+  void setUp() {
+    when(context.getFunctionName()).thenReturn("test_function");
+    when(context.getAwsRequestId()).thenReturn("1-22-2024");
+  }
+
+  @AfterEach
+  void tearDown() {
+    assertThat(testing.forceFlushCalled()).isTrue();
+  }
+
+  @Test
+  void tracedWithHttpPropagation() {
+    Map<String, String> headers = new HashMap<>();
+    headers.put("traceparent", "00-ee13e7026227ebf4c74278ae29691d7a-0000000000000456-01");
+    headers.put("User-Agent", "Clever Client");
+    headers.put("host", "localhost:2024");
+    headers.put("X-FORWARDED-PROTO", "http");
+
+    APIGatewayProxyRequestEvent input =
+        new APIGatewayProxyRequestEvent()
+            .withHttpMethod("PUT")
+            .withResource("/hello/{param}")
+            .withPath("/hello/world")
+            .withBody("hello")
+            .withHeaders(headers);
+
+    APIGatewayProxyResponseEvent result =
+        new TestRequestHandlerApiGateway().handleRequest(input, context);
+    assertThat(result.getBody()).isEqualTo("hello world");
+    assertThat(result.getStatusCode()).isEqualTo(201);
+
+    testing.waitAndAssertTraces(
+        trace ->
+            trace.hasSpansSatisfyingExactly(
+                span ->
+                    span.hasName("PUT /hello/{param}")
+                        .hasKind(SpanKind.SERVER)
+                        .hasTraceId("ee13e7026227ebf4c74278ae29691d7a")
+                        .hasParentSpanId("0000000000000456")
+                        .hasAttributesSatisfyingExactly(
+                            equalTo(FaasIncubatingAttributes.FAAS_INVOCATION_ID, "1-22-2024"),
+                            equalTo(FaasIncubatingAttributes.FAAS_TRIGGER, "http"),
+                            equalTo(HttpAttributes.HTTP_REQUEST_METHOD, "PUT"),
+                            equalTo(UserAgentAttributes.USER_AGENT_ORIGINAL, "Clever Client"),
+                            equalTo(UrlAttributes.URL_FULL, "http://localhost:2024/hello/world"),
+                            equalTo(HttpAttributes.HTTP_RESPONSE_STATUS_CODE, 201L))));
+  }
+
+  public static class TestRequestHandlerApiGateway
+      implements RequestHandler<APIGatewayProxyRequestEvent, APIGatewayProxyResponseEvent> {
+
+    @Override
+    public APIGatewayProxyResponseEvent handleRequest(
+        APIGatewayProxyRequestEvent input, Context context) {
+      return new APIGatewayProxyResponseEvent().withStatusCode(201).withBody("hello world");
+    }
+  }
+}

instrumentation/jsp-2.3/javaagent/build.gradle.kts

@@ -6,11 +6,22 @@ muzzle {
   pass {
     group.set("org.apache.tomcat")
     module.set("tomcat-jasper")
-    // version range [7.0.0,7.0.19) is missing from maven
     // tomcat 10 uses JSP 3.0
     versions.set("[7.0.19,10)")
     // version 8.0.9 depends on org.eclipse.jdt.core.compiler:ecj:4.4RC4 which does not exist
     skip("8.0.9")
+    // not using assertInverse.set(true) because org.eclipse.jdt.core.compiler:ecj:xxx dependency
+    // is missing for versions in range [7.0.0, 7.0.19)
+  }
+  fail {
+    group.set("org.apache.tomcat")
+    module.set("tomcat-jasper")
+    versions.set("[,7.0.0)")
+  }
+  fail {
+    group.set("org.apache.tomcat")
+    module.set("tomcat-jasper")
+    versions.set("[10,)")
   }
 }
 

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

@@ -9,6 +9,7 @@ muzzle {
     versions.set("[1.2,)")
     // version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
     skip("1.2.15")
+    assertInverse.set(true)
   }
 }
 

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

@@ -9,6 +9,7 @@ muzzle {
     versions.set("[1.2,)")
     // version 1.2.15 has a bad dependency on javax.jms:jms:1.1 which was released as pom only
     skip("1.2.15")
+    assertInverse.set(true)
   }
 }
 

instrumentation/log4j/log4j-mdc-1.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/log4j/mdc/v1_2/Log4j1InstrumentationModule.java

@@ -5,19 +5,26 @@
 
 package io.opentelemetry.javaagent.instrumentation.log4j.mdc.v1_2;
 
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
 import static java.util.Arrays.asList;
 
 import com.google.auto.service.AutoService;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import java.util.List;
+import net.bytebuddy.matcher.ElementMatcher;
 
 @AutoService(InstrumentationModule.class)
 public class Log4j1InstrumentationModule extends InstrumentationModule {
   public Log4j1InstrumentationModule() {
     super("log4j-mdc", "log4j-mdc-1.2");
   }
 
+  @Override
+  public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+    return hasClassesNamed("org.apache.log4j.MDC");
+  }
+
   @Override
   public List<TypeInstrumentation> typeInstrumentations() {
     return asList(new CategoryInstrumentation(), new LoggingEventInstrumentation());