Merge branch 'main' into zhaez/nightly-build

Author: ezhang6811

.github/actions/patch-dependencies/action.yml

@@ -103,14 +103,14 @@ runs:
       shell: bash
 
     - name: Build opentelemetry-java-instrumentation with tests
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
       if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests != 'false' }}
       with:
         arguments: check -x spotlessCheck publishToMavenLocal --scan --no-daemon
         build-root-directory: opentelemetry-java-instrumentation
 
     - name: Build opentelemetry java instrumentation
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa #v2
       if: ${{ env.patch_otel_java_instrumentation == 'true' && inputs.run_tests == 'false' }}
       with:
         arguments: publishToMavenLocal --scan --no-daemon
@@ -119,4 +119,4 @@ runs:
     - name: cleanup opentelmetry-java-instrumentation
       run: rm -rf opentelemetry-java-instrumentation
       if: ${{ env.patch_otel_java_instrumentation == 'true' }}
-      shell: bash
+      shell: bash

.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,18 +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/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

@@ -8,10 +8,8 @@
 name: Daily scan
 
 on:
-  schedule: # scheduled to run at 14:00, 20:00, 02:00 UTC every day
-    - cron: '0 14 * * *' # 6:00/7:00   PST/PDT (14:00 UTC)
-    - cron: '0 20 * * *' # 12:00/13:00 PST/PDT (20:00 UTC)
-    - cron: '0 02 * * *' # 18:00/19:00 PST/PDT (02:00 UTC)
+  schedule: # scheduled to run every 6 hours
+    - cron: '10 */6 * * *' #  “At minute 10 past every 6th hour.”
   workflow_dispatch: # be able to run the workflow on demand
 
 env: