Merge branch 'main' into update/scopedown-token

Author: AdnaneKhan

.github/patches/opentelemetry-java-instrumentation.patch

@@ -1,8 +1,8 @@
 diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
-index 98def282f8..65fd6a8a13 100644
+index 2772032e73..c84a6662cf 100644
 --- a/dependencyManagement/build.gradle.kts
 +++ b/dependencyManagement/build.gradle.kts
-@@ -104,7 +104,7 @@ val DEPENDENCIES = listOf(
+@@ -101,7 +101,7 @@ val DEPENDENCIES = listOf(
    "io.netty:netty:3.10.6.Final",
    "io.opentelemetry.contrib:opentelemetry-azure-resources:${otelContribVersion}",
    "io.opentelemetry.contrib:opentelemetry-aws-resources:${otelContribVersion}",
@@ -11,31 +11,16 @@ index 98def282f8..65fd6a8a13 100644
    "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
    "io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
    "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
-diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
-index 1234567890..abcdef1234 100644
---- a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
-+++ b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
-@@ -20,8 +20,8 @@ public class TomcatIntegrationTest extends TargetSystemTest {
- 
-   @ParameterizedTest
-   @CsvSource({
-+    // TODO: Remove this patch after we no longer depend on 2.18.1 of opentelemetry-java-instrumentation.
-     "tomcat:10.0, https://tomcat.apache.org/tomcat-10.0-doc/appdev/sample/sample.war",
--    "tomcat:9.0, https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/sample.war"
-   })
-   void testCollectedMetrics(String dockerImageName, String sampleWebApplicationUrl)
-       throws Exception {
+
 diff --git a/version.gradle.kts b/version.gradle.kts
-index 023d04703c..ec9690086c 100644
+index 282db803a9..5e7f1c6775 100644
 --- a/version.gradle.kts
 +++ b/version.gradle.kts
 @@ -1,5 +1,5 @@
--val stableVersion = "2.18.1"
--val alphaVersion = "2.18.1-alpha"
-+val stableVersion = "2.18.1-adot1"
-+val alphaVersion = "2.18.1-adot1-alpha"
+-val stableVersion = "2.20.1"
+-val alphaVersion = "2.20.1-alpha"
++val stableVersion = "2.20.1-adot1"
++val alphaVersion = "2.20.1-adot1-alpha"
 
  allprojects {
    if (findProperty("otel.stable") != "true") {
--- 
-2.45.1

.github/patches/versions

@@ -1,2 +1,2 @@
-OTEL_JAVA_INSTRUMENTATION_VERSION=v2.18.1
+OTEL_JAVA_INSTRUMENTATION_VERSION=v2.20.1
 OTEL_JAVA_CONTRIB_VERSION=v1.48.0

.github/workflows/application-signals-e2e-test.yml

@@ -25,6 +25,8 @@ jobs:
   upload-main-build:
     runs-on: ubuntu-latest
     steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0
+
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@a03048d87541d1d9fcf2ecf528a4a65ba9bd7838 #5.0.0
         with:
@@ -36,7 +38,10 @@ jobs:
           name: aws-opentelemetry-agent.jar
 
       - name: Upload main-build adot.jar to s3
-        run: aws s3 cp ./aws-opentelemetry-agent-*-SNAPSHOT.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar
+        run: |
+          # Extract artifact suffix using version.gradle.kts
+          VERSION=$(awk -F'"' '/val adotVersion = / {print $2}' version.gradle.kts)
+          aws s3 cp ./aws-opentelemetry-agent-$VERSION.jar s3://adot-main-build-staging-jar/aws-opentelemetry-agent.jar
 
   #
   # PACKAGED DISTRIBUTION LANGUAGE VERSION COVERAGE

.github/workflows/daily-scan.yml

@@ -110,7 +110,7 @@ jobs:
         id: high_scan_v2
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.5"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.20.0"
           severity: 'CRITICAL,HIGH'
           logout: 'false'
 
@@ -119,7 +119,7 @@ jobs:
         id: low_scan_v2
         uses: ./.github/actions/image_scan
         with:
-          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.11.5"
+          image-ref: "public.ecr.aws/aws-observability/adot-autoinstrumentation-java:v2.20.0"
           severity: 'MEDIUM,LOW,UNKNOWN'
           logout: 'false'