Merge pull request #2231 from newrelic/gha-ubuntu-24

Update GHA workflows to Ubuntu 24 and 22

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

@@ -14,7 +14,7 @@ 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 }}

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

@@ -21,7 +21,7 @@ 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:

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

@@ -20,7 +20,7 @@ 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

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

@@ -20,7 +20,7 @@ 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 }}

.github/workflows/GHA-Spotbugs.yml

@@ -17,7 +17,7 @@ on:
 jobs:
   spotbugs:
     timeout-minutes: 15
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
         with:
@@ -78,7 +78,7 @@ jobs:
 
   publish:
     needs: spotbugs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     concurrency: gh-pages
     env:
       BRANCH_NAME: ${{ inputs.agent-ref || 'main' }}

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

@@ -20,7 +20,7 @@ jobs:
   unit-test:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 150
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       # max-parallel: 1 ## used to force sequential vs. concurrent
       fail-fast: false

.github/workflows/GHPages-Cleanup.yml

@@ -14,7 +14,7 @@ on:
         type: string
 jobs:
   cleanup:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       DAYS: ${{ inputs.days || '5' }}
     steps:

.github/workflows/Java-Instrumentation-Tests.yml

@@ -24,7 +24,7 @@ jobs:
     name: Java ${{ matrix.java-version }}
     timeout-minutes: 120
     # needs: install-all-java
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       # we use these in env vars for conditionals (secrets can't be used in conditionals)
       AWS_KEY: ${{ secrets.aws-secret-access-key }}

.github/workflows/README.md

@@ -267,7 +267,7 @@ jobs:
     secrets: inherit
 
   another-job:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: build-agent
     steps:
       - name: Retrieve agent from cache

.github/workflows/Release-CopyToS3-prod.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   copy-to-s3:
     name: Copy ${{ inputs.version_number }} to S3 (Prod)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Self
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

.github/workflows/Release-CopyToS3-staging.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   copy-to-s3:
     name: Copy ${{ inputs.version_number }} to S3 (Staging)
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout Self
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4

.github/workflows/Release-UpdateSystemConfig.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   update-system-config:
     name: Set java_agent_version to ${{ inputs.version_number }} in system config
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Update system configuration page
         run: |

.github/workflows/Test-AITs.yml

@@ -47,7 +47,7 @@ jobs:
 
   list-tests:
     name: List tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     outputs:
       tests: ${{ steps.read-single-test.outputs.tests || steps.read-tests.outputs.tests }}
     steps:
@@ -117,7 +117,7 @@ jobs:
     name: ${{ matrix.tests }}
     needs: [ build-agent, list-tests ]
     timeout-minutes: 120
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     # Determine if easier to make the env strings below part of the matrix
     strategy:
       fail-fast: false
@@ -318,7 +318,7 @@ jobs:
           ln -s ${GITHUB_WORKSPACE}/newrelic-agent/build/newrelicJar/newrelic.jar ${GITHUB_WORKSPACE}/newrelic.jar
           echo "still complains of file not found"
           sudo apt-get install virtualenv
-          virtualenv -p /usr/bin/python3.8 .
+          virtualenv -p /usr/bin/python3.10 .
           . bin/activate
           bin/pip3 install -r conf/requirements.txt
           ZULU11=${JDK_zulu_11} \
@@ -369,7 +369,7 @@ jobs:
 
   notify-if-negative-values:
     needs: [ tests ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Download artifact(s) # surely there is a way to only download the negative_value_*.txt artifacts?
         uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # pin@v4

.github/workflows/VerifyInstrumentation-Single.yml

@@ -15,7 +15,7 @@ on:
 jobs:
   verify-module:
     name: Verify Instrumentation (${{ github.event.inputs.module || inputs.module }})
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
       MODULE: ${{ github.event.inputs.module || inputs.module }}
       AWS_KEY: ${{ secrets.aws-secret-access-key }}

.github/workflows/VerifyInstrumentation.yml

@@ -54,7 +54,7 @@ jobs:
   notify-failure:
     needs: [ verify-instrumentation-1, verify-instrumentation-2 ]
     if: ${{ failure() }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Send failure message to Slack
         id: slack

.github/workflows/X-Reusable-BuildAgent.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   # build the agent and saves Gradle's cache so all modules can use the cache
   build-agent:
-    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 }}

.github/workflows/X-Reusable-VerifyInstrumentation.yml

@@ -22,7 +22,7 @@ jobs:
   # this job reads the directories in newrelic-java-agent/instrumentation and creates a JSON with the list of the modules
   # this list is paginated and will be used in the verify-module job.
   read-modules:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     outputs:
       modules: ${{ steps.set-modules.outputs.modules }}
     steps:
@@ -48,7 +48,7 @@ jobs:
 
   verify-module:
     name: ${{ matrix.modules }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: read-modules
     strategy:
       fail-fast: false

.github/workflows/publish_main_snapshot.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   publish_snapshot:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
 

.github/workflows/publish_release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   publish_release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # pin@v4
 

.github/workflows/repolinter.yml

@@ -11,7 +11,7 @@ on: [ push, workflow_dispatch ]
 jobs:
   repolint:
     name: Run Repolinter
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Test Default Branch
         id: default-branch

instrumentation/jdbc-mariadb-1.1.7/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc", "java.sql", "javax.sql" })
+@Ignore
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test converage of Java 8.
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/jdbc-mariadb-1.3.0/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc"})
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/jdbc-mariadb-3.0.0/src/test/java/org/mariadb/jdbc/MariaDbTest.java

@@ -29,6 +29,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = {"org.mariadb.jdbc"})
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariaDbTest {
 
     private static DB mariaDb;

instrumentation/r2dbc-mariadb-1.1.2/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.1.2/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.2.1/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb-1.2.1/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "org.mariadb.r2dbc")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbInstrumentedTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mariadb/src/test/java/com/nr/agent/instrumentation/r2dbc/MariadbNoInstrumentationTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "none")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MariadbNoInstrumentationTest {
 
     public static DB mariaDb;

instrumentation/r2dbc-mysql-1.1.3/src/test/java/com/nr/agent/instrumentation/r2dbc/MySQLInstrumentedTest.java

@@ -11,6 +11,7 @@
 import io.r2dbc.spi.ConnectionFactory;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import reactor.core.publisher.Mono;
@@ -19,6 +20,10 @@
 
 @RunWith(InstrumentationTestRunner.class)
 @InstrumentationTestConfig(includePrefixes = "io.asyncer.r2dbc.mysql")
+@Ignore 
+/* Using an embedded mariaDB instance is incompatible with Ubuntu 22 and our goal of adding test coverage of Java 8. 
+*  Todo: Use test containers as opposed to the mariaDB instance and remove the @Ignore annotation
+*/
 public class MySQLInstrumentedTest {
 
     public static DB mariaDb;