Merge branch 'main' of github.com:newrelic/newrelic-java-agent into NR-186271-remove-aws-wrap-instrumentation

Author: obenkenobi

.github/actions/setup-environment/action.yml

@@ -14,10 +14,11 @@ runs:
 
   steps:
     - name: Set up Javas
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: |
+          25
           21
           17
           11
@@ -29,17 +30,18 @@ runs:
         sed -i -e "s|jdk8=8|jdk8=${JAVA_HOME_8_X64}|
         s|jdk11=11|jdk11=${JAVA_HOME_11_X64}|
         s|jdk17=17|jdk17=${JAVA_HOME_17_X64}|
-        s|jdk21=21|jdk21=${JAVA_HOME_21_X64}|" gradle.properties.gha
+        s|jdk21=21|jdk21=${JAVA_HOME_21_X64}|
+        s|jdk25=25|jdk25=${JAVA_HOME_25_X64}|" gradle.properties.gha
         cat gradle.properties.gha >> gradle.properties
 
     - name: Setup Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         cache-read-only: ${{ inputs.gradle-cache-read-only }}
 
     - name: Setup Gradle options
       shell: bash
-      run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64" >> $GITHUB_ENV
+      run: echo "GRADLE_OPTIONS=--console=plain --parallel -Porg.gradle.java.installations.auto-detect=false -Porg.gradle.java.installations.fromEnv=JAVA_HOME_8_X64,JAVA_HOME_11_X64,JAVA_HOME_17_X64,JAVA_HOME_21_X64,JAVA_HOME_25_X64" >> $GITHUB_ENV
 
     - name: Download S3 instrumentation jar zip
       shell: bash

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# Dependabot Configuration
+#
+# This configuration file specifies the settings for Dependabot Scanning.
+# It monitors the Gradle dependencies in the specified subproject and runs checks
+# on a weekly basis. This will not create pull requests for version updates, but
+# can be updated to create pull requests.
+
+version: 2
+updates:
+  - package-ecosystem: "gradle"
+    directories:
+      - "/newrelic-agent"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 0

.github/workflows/Create-Custom-Jar.yml

@@ -14,20 +14,20 @@ on:
 jobs:
   create_custom_jar:
     name: Create jar
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use this in env var for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
     steps:
 
       - name: Checkout Java agent
-        uses: actions/checkout@v3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
           ref: ${{ inputs.agent-ref }}
 
       - name: Configure AWS Credentials
         if: ${{ env.AWS_KEY != '' }}
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # pin@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -42,10 +42,10 @@ jobs:
       - name: Set summary
         run: |
           echo "${{ inputs.description }}" >> $GITHUB_STEP_SUMMARY
-          echo "This jar was built from the ref (branch/tag/hash): ${{ inputs.ref }}." >> $GITHUB_STEP_SUMMARY
+          echo "This jar was built from the ref (branch/tag/hash): ${{ inputs.agent-ref }}." >> $GITHUB_STEP_SUMMARY
 
       - name: Capture custom jar
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         with:
           name: custom-newrelic-jar
           path: |

.github/workflows/Create-Init-Container-Release-Tags.yml

@@ -0,0 +1,22 @@
+name: Create init-container release tags
+on:
+  workflow_dispatch: # Allow manual trigger
+    inputs:
+      agent-version:
+        description: 'The release tag to create init containers for, including the v. Eg v8.12.0’. '
+        required: true
+        type: string
+jobs:
+  create_release_tags:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Create release tags for K8s Init Container
+        run: |
+          RELEASE_TITLE="New Relic Java Agent ${{ inputs.agent-version }}.0"
+          RELEASE_TAG="${{ inputs.agent-version }}.0_java"
+          RELEASE_NOTES="Automated release for [Java Agent ${{ inputs.agent-version }}](https://github.com/newrelic/newrelic-java-agent/releases/tag/${{ inputs.agent-version }})"
+          gh auth login --with-token <<< $GH_RELEASE_TOKEN
+          echo "newrelic/newrelic-agent-init-container - Releasing \"${RELEASE_TITLE}\" with tag ${RELEASE_TAG}"
+          gh release create "${RELEASE_TAG}" --title="${RELEASE_TITLE}" --repo=newrelic/newrelic-agent-init-container --notes="${RELEASE_NOTES}"
+        env:
+          GH_RELEASE_TOKEN: ${{ secrets.GH_RELEASE_TOKEN }}

.github/workflows/GHA-Functional-Tests.yaml

@@ -21,23 +21,23 @@ jobs:
   java-functional-tests:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 150
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       default-branch: "main"
     strategy:
       ##max-parallel: 1 ## used to force sequential
       fail-fast: false
       matrix:
-        java-version: [8, 11, 17, 21]
+        java-version: [ 8, 11, 17, 21, 25 ]
     steps:
       - name: Checkout Java agent
-        uses: actions/checkout@v3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
           ref: ${{ inputs.agent-ref || github.ref || 'main' }}
 
       - name: Configure AWS Credentials
         if: ${{ env.AWS_KEY != '' }}
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # pin@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -69,11 +69,11 @@ jobs:
 
       - name: Capture build reports
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         with:
           name: functional-tests-results-java-${{ matrix.java-version }}
           # The regex for the path below will capture functional test HTML reports generated by gradle for all
-          # related modules: (functional_test, newrelic-scala-api, newrelic-scala-cats-api, :newrelic-cats-effect3-api, newrelic-scala-zio-api).
+          # related modules: (functional_test, newrelic-scala-api, newrelic-scala-cats-api, :newrelic-cats-effect3-api, newrelic-scala-zio-api, newrelic-scala-zio2-api).
           # However, it's critical that the previous build step does a ./gradlew clean or the regex will capture test reports
           # that were leftover in unrelated modules for unit and instrumentation tests.
           path: |

.github/workflows/GHA-Scala-Functional-Tests.yaml

@@ -20,21 +20,21 @@ jobs:
   scala-functional-tests:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       ##max-parallel: 1 ## used to force sequential
       fail-fast: false
       matrix:
-        java-version: [8, 11]
+        java-version: [ 8, 11 ]
     steps:
       - name: Checkout Java agent
-        uses: actions/checkout@v3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
           ref: ${{ inputs.agent-ref || github.ref || 'main' }}
 
       - name: Configure AWS Credentials
         if: ${{ env.AWS_KEY != '' }}
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # pin@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -52,7 +52,7 @@ jobs:
         timeout-minutes: 25
         run: |
           # Removed ":newrelic-cats-effect3-api:test" temporarily
-          ./gradlew $GRADLE_OPTIONS :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
+          ./gradlew $GRADLE_OPTIONS :newrelic-scala3-api:test :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-zio2-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
 
       - name: Run functional tests against version defined in ${{ matrix.java-version }} (attempt 2)
         id: run_tests_2
@@ -61,18 +61,18 @@ jobs:
         timeout-minutes: 25
         run: |
           # Removed ":newrelic-cats-effect3-api:test" temporarily
-          ./gradlew $GRADLE_OPTIONS :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
+          ./gradlew $GRADLE_OPTIONS :newrelic-scala3-api:test :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-zio2-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
 
       - name: Run functional tests against version defined in ${{ matrix.java-version }} (attempt 3)
         if: steps.run_tests_2.outcome == 'failure'
         timeout-minutes: 25
         run: |
           # Removed ":newrelic-cats-effect3-api:test" temporarily
-          ./gradlew $GRADLE_OPTIONS :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
+          ./gradlew $GRADLE_OPTIONS :newrelic-scala3-api:test :newrelic-scala-api:test :newrelic-scala-cats-api:test :newrelic-scala-zio-api:test :newrelic-scala-zio2-api:test :newrelic-scala-monix-api:test -PincludeScala -Ptest${{ matrix.java-version }} --continue
 
       - name: Capture Jacoco reports
         if: matrix.java-version == '11'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         with:
           name: jacoco-reports-java-${{ matrix.java-version }}
           path: |
@@ -81,11 +81,11 @@ jobs:
       # Capture HTML build result in artifacts
       - name: Capture build reports
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         with:
           name: functional-tests-results-java-${{ matrix.java-version }}
           # The regex for the path below will capture functional test HTML reports generated by gradle for all
-          # related modules: (functional_test, newrelic-scala-api, newrelic-scala-cats-api, :newrelic-cats-effect3-api, newrelic-scala-zio-api).
+          # related modules: (functional_test, newrelic-scala-api, newrelic-scala-cats-api, :newrelic-cats-effect3-api, newrelic-scala-zio-api, newrelic-scala-zio2-api).
           # However, it's critical that the previous build step does a ./gradlew clean or the regex will capture test reports
           # that were leftover in unrelated modules for unit and instrumentation tests.
           path: |

.github/workflows/GHA-Scala-Instrumentation-Tests.yaml

@@ -20,30 +20,30 @@ jobs:
   scala-instrumentation-tests:
     name: Scala ${{ matrix.scala }} on Java ${{ matrix.java-version }}
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use this in env var for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.AWS_ACCESS_KEY_ID }}
     strategy:
       ##max-parallel: 1 ## used to force sequential
       fail-fast: false
       matrix:
-        java-version: [8, 11]
-        scala: ['2.11', '2.12', '2.13']
+        java-version: [ 8, 11 ]
+        scala: [ '2.11', '2.12', '2.13' ]
         exclude:
           - java-version: 11
             scala: 2.10
           - java-version: 11
             scala: 2.11
     steps:
       - name: Checkout Java agent
-        uses: actions/checkout@v3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
           ref: ${{ inputs.agent-ref || github.ref || 'main' }}
 
       - name: Configure AWS Credentials
         if: ${{ env.AWS_KEY != '' }}
-        uses: aws-actions/configure-aws-credentials@v1-node16
+        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # pin@v4
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -55,6 +55,15 @@ jobs:
       - name: Build newrelicJar
         run: ./gradlew $GRADLE_OPTIONS clean jar --parallel
 
+      - name: Fix the /etc/hosts/ file (since it's been messed up before)
+        run: |
+          echo "Old /etc/hosts/ file"
+          cat /etc/hosts
+          echo "Overwriting /etc/hosts file"
+          sudo echo "127.0.0.1 localhost $HOSTNAME" | sudo tee /etc/hosts
+          echo "New /etc/hosts file"
+          cat /etc/hosts
+
       - name: Run instrumentation tests for Java ${{ matrix.java-version }} and scala ${{ matrix.scala }} (attempt 1)
         id: run_tests_1
         continue-on-error: true
@@ -75,7 +84,7 @@ jobs:
 
       - name: Capture build reports
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # pin@v4
         with:
           name: instrumentation-results-java-${{ matrix.java-version }}-scala-${{ matrix.scala }}
           # The regex for the path below will capture instrumentation test HTML reports generated by gradle for all