Use NoMuzzle annotation instead of using reflection to avoid Muzzle check

Author: jj22ee

lambda-layer/patches/opentelemetry-java-instrumentation.patch

@@ -25,10 +25,15 @@ index a6b89d253d..e62d30eddb 100644
        if (!functionInstrumenter().shouldStart(parentContext, otelInput)) {
          return;
 diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts
-index df605add2f..b2f01d9d4d 100644
+index df605add2f..e16c736990 100644
 --- a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts
 +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/build.gradle.kts
-@@ -9,7 +9,7 @@ dependencies {
+@@ -5,11 +5,12 @@ plugins {
+ dependencies {
+   compileOnly("io.opentelemetry:opentelemetry-sdk")
+   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
++  compileOnly(project(":muzzle"))
+ 
    compileOnly("com.google.auto.value:auto-value-annotations")
    annotationProcessor("com.google.auto.value:auto-value")
 
@@ -37,7 +42,7 @@ index df605add2f..b2f01d9d4d 100644
 
    // We do lightweight parsing of JSON to extract HTTP headers from requests for propagation.
    // This will be commonly needed even for users that don't use events, but luckily it's not too big.
-@@ -26,6 +26,7 @@ dependencies {
+@@ -26,6 +27,7 @@ dependencies {
 
    testImplementation(project(":instrumentation:aws-lambda:aws-lambda-core-1.0:testing"))
    testImplementation("uk.org.webcompere:system-stubs-jupiter")
@@ -147,10 +152,10 @@ index 9341bf6f79..f719c1ea93 100644
  }
 diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractor.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractor.java
 new file mode 100644
-index 0000000000..921a7b6b7f
+index 0000000000..6349d1bb29
 --- /dev/null
 +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/main/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractor.java
-@@ -0,0 +1,89 @@
+@@ -0,0 +1,85 @@
 +/*
 + * Copyright The OpenTelemetry Authors
 + * SPDX-License-Identifier: Apache-2.0
@@ -162,9 +167,7 @@ index 0000000000..921a7b6b7f
 +
 +import io.opentelemetry.context.Context;
 +import io.opentelemetry.context.propagation.TextMapGetter;
-+import java.lang.invoke.MethodHandle;
-+import java.lang.invoke.MethodHandles;
-+import java.lang.invoke.MethodType;
++import io.opentelemetry.javaagent.tooling.muzzle.NoMuzzle;
 +import java.util.Locale;
 +import java.util.Map;
 +import java.util.logging.Logger;
@@ -180,7 +183,7 @@ index 0000000000..921a7b6b7f
 +  private static final String AWS_TRACE_HEADER_PROP = "com.amazonaws.xray.traceHeader";
 +  // lower-case map getter used for extraction
 +  static final String AWS_TRACE_HEADER_PROPAGATOR_KEY = "x-amzn-trace-id";
-+  static volatile MethodHandle getXrayTraceIdHandle;
++  static boolean getXrayTraceIdMethodExists = true;
 +
 +  static Context extract(
 +      Map<String, String> headers,
@@ -194,23 +197,21 @@ index 0000000000..921a7b6b7f
 +    return instrumenter.extract(mergedHeaders, MapGetter.INSTANCE);
 +  }
 +
++  @NoMuzzle
 +  private static String getTraceHeader(
 +      com.amazonaws.services.lambda.runtime.Context lambdaContext) {
 +    String traceHeader = null;
-+    try {
-+      MethodHandle handle = getXrayTraceIdHandle;
-+      if (handle == null) {
-+        handle =
-+            MethodHandles.lookup()
-+                .findVirtual(
-+                    lambdaContext.getClass(),
-+                    "getXrayTraceId",
-+                    MethodType.methodType(String.class));
-+        getXrayTraceIdHandle = handle;
++
++    // Lambda Core dependency that is actually used by Lambda Runtime may be on an older version
++    // that does not have the `getXrayTraceId` method. If `NoSuchMethodError` occurs, we do not
++    // attempt invoking `getXrayTraceId` again.
++    if (getXrayTraceIdMethodExists) {
++      try {
++        traceHeader = lambdaContext.getXrayTraceId();
++      } catch (NoSuchMethodError e) {
++        logger.fine("Failed to get X-Ray trace ID from lambdaContext: " + e);
++        getXrayTraceIdMethodExists = false;
 +      }
-+      traceHeader = (String) handle.invoke(lambdaContext);
-+    } catch (Throwable t) {
-+      logger.fine("Failed to get X-Ray trace ID via MethodHandle: " + t.getMessage());
 +    }
 +    if (traceHeader != null && !traceHeader.isEmpty()) {
 +      return traceHeader;
@@ -255,10 +256,10 @@ index cb19d1e568..12ed174bb2 100644
      assertThat(spanContext.getSpanId()).isEqualTo("00f067aa0ba902b7");
 diff --git a/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java
 new file mode 100644
-index 0000000000..e2a69ee6d8
+index 0000000000..4b0f354769
 --- /dev/null
 +++ b/instrumentation/aws-lambda/aws-lambda-core-1.0/library/src/test/java/io/opentelemetry/instrumentation/awslambdacore/v1_0/internal/ParentContextExtractorTest.java
-@@ -0,0 +1,418 @@
+@@ -0,0 +1,375 @@
 +/*
 + * Copyright The OpenTelemetry Authors
 + * SPDX-License-Identifier: Apache-2.0
@@ -281,7 +282,6 @@ index 0000000000..e2a69ee6d8
 +import io.opentelemetry.context.propagation.TextMapPropagator;
 +import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 +import io.opentelemetry.extension.trace.propagation.B3Propagator;
-+import java.lang.invoke.MethodHandle;
 +import java.util.Map;
 +import org.junit.jupiter.api.Test;
 +import org.junit.jupiter.api.extension.ExtendWith;
@@ -600,81 +600,39 @@ index 0000000000..e2a69ee6d8
 +  }
 +
 +  @Test
-+  void shouldFallbackToSystemPropertyWhenReflectionFails() {
++  void shouldFallbackToSystemPropertyWhenNoSuchMethodErrorThrown() {
 +    // given
 +    Map<String, String> headers = ImmutableMap.of();
-+    // Create a mock context that doesn't have getXrayTraceId method (simulates older Lambda
-+    // runtime)
-+    Context mockLambdaContextWithoutXrayMethod = mock(Context.class);
++    Context mockLambdaContextWithNoSuchMethodError = mock(Context.class);
++    when(mockLambdaContextWithNoSuchMethodError.getXrayTraceId())
++        .thenThrow(new NoSuchMethodError("getXrayTraceId method not found"));
 +    systemProperties.set(
 +        "com.amazonaws.xray.traceHeader",
 +        "Root=1-8a3c60f7-d188f8fa79d48a391a778fa7;Parent=0000000000000789;Sampled=1");
 +
-+    // when
-+    io.opentelemetry.context.Context context =
-+        ParentContextExtractor.extract(
-+            headers, INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContextWithoutXrayMethod);
-+    // then
-+    Span span = Span.fromContext(context);
-+    SpanContext spanContext = span.getSpanContext();
-+    assertThat(spanContext.isValid()).isTrue();
-+    assertThat(spanContext.getSpanId()).isEqualTo("0000000000000789");
-+    assertThat(spanContext.getTraceId()).isEqualTo("8a3c60f7d188f8fa79d48a391a778fa7");
-+  }
-+
-+  @Test
-+  void shouldFallbackToSystemPropertyWhenIllegalAccessException() {
-+    // given
-+    Map<String, String> headers = ImmutableMap.of();
-+    Context mockLambdaContextWithAccessException = mock(Context.class);
-+    when(mockLambdaContextWithAccessException.getXrayTraceId())
-+        .thenThrow(new RuntimeException("Simulated IllegalAccessException"));
-+    systemProperties.set(
-+        "com.amazonaws.xray.traceHeader",
-+        "Root=1-8a3c60f7-d188f8fa79d48a391a778fa7;Parent=0000000000000789;Sampled=1");
++    // Reset the static flag to ensure the method is attempted
++    ParentContextExtractor.getXrayTraceIdMethodExists = true;
 +
-+    // when
++    // when - call extract
 +    io.opentelemetry.context.Context context =
 +        ParentContextExtractor.extract(
-+            headers, INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContextWithAccessException);
++            headers, INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContextWithNoSuchMethodError);
++
 +    // then
 +    Span span = Span.fromContext(context);
 +    SpanContext spanContext = span.getSpanContext();
 +    assertThat(spanContext.isValid()).isTrue();
 +    assertThat(spanContext.getSpanId()).isEqualTo("0000000000000789");
 +    assertThat(spanContext.getTraceId()).isEqualTo("8a3c60f7d188f8fa79d48a391a778fa7");
-+  }
-+
-+  @Test
-+  void shouldCacheMethodHandleAcrossMultipleInvocations() {
-+    // given
-+    Context mockLambdaContext = mock(Context.class);
-+    when(mockLambdaContext.getXrayTraceId())
-+        .thenReturn("Root=1-4fd0b613-1f19f39af59518d127b0cafe;Parent=0000000000000123;Sampled=1");
++    // Verify getXrayTraceId was called only once
++    assertThat(ParentContextExtractor.getXrayTraceIdMethodExists).isFalse();
++    verify(mockLambdaContextWithNoSuchMethodError, times(1)).getXrayTraceId();
 +
-+    // Clear any previously cached MethodHandle
-+    ParentContextExtractor.getXrayTraceIdHandle = null;
-+
-+    // when - call extract multiple times (which internally calls getTraceHeader)
-+    assertThat(ParentContextExtractor.getXrayTraceIdHandle).isNull(); // Initially null
-+
-+    ParentContextExtractor.extract(
-+        ImmutableMap.of(), INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContext);
-+    assertThat(ParentContextExtractor.getXrayTraceIdHandle).isNotNull(); // Cached after first call
-+
-+    MethodHandle cachedHandle = ParentContextExtractor.getXrayTraceIdHandle;
-+
-+    ParentContextExtractor.extract(
-+        ImmutableMap.of(), INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContext);
++    // when - call extract again
 +    ParentContextExtractor.extract(
-+        ImmutableMap.of(), INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContext);
-+
-+    // then - MethodHandle should remain the same (cached)
-+    assertThat(ParentContextExtractor.getXrayTraceIdHandle).isSameAs(cachedHandle);
-+
-+    // verify getXrayTraceId was called for each invocation (MethodHandle caching doesn't affect
-+    // this)
-+    verify(mockLambdaContext, times(3)).getXrayTraceId();
++        headers, INSTRUMENTER_WITH_B3_XRAY_PROPAGATORS, mockLambdaContextWithNoSuchMethodError);
++    // Verify the call count of getXrayTraceId is still 1
++    verify(mockLambdaContextWithNoSuchMethodError, times(1)).getXrayTraceId();
 +  }
 +}
 diff --git a/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java b/instrumentation/aws-lambda/aws-lambda-events-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awslambdaevents/v2_2/AwsLambdaRequestHandlerInstrumentation.java