Merge pull request #1801 from newrelic/jruby9410

CI: test with JRuby 9.4.2.0

.github/workflows/ci_jruby.yml

@@ -23,16 +23,10 @@ jobs:
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@v3
 
-        # - curl is needed for Curb
-        # - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
-        # - sasl is needed for memcached
-      - name: Install OS packages
-        run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev 
-
-      - name: Install Ruby jruby-9.3.9.0
+      - name: Install Ruby jruby-9.4.2.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: jruby-9.3.9.0
+          ruby-version: jruby-9.4.2.0
 
       - name: Bundle
         run: bundle install
@@ -122,12 +116,6 @@ jobs:
       matrix:
         multiverse: [agent, background, background_2, database, frameworks, httpclients, httpclients_2, rails, rest]
     steps:
-      - name: Set the default Java version
-        run: sudo update-alternatives --set java ${JAVA_HOME_8_X64}/bin/java &&
-             sudo update-alternatives --set javac ${JAVA_HOME_8_X64}/bin/javac &&
-             java -version &&
-             javac -version
-
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
 
@@ -137,14 +125,10 @@ jobs:
       - name: Install JRuby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: jruby-9.3.9.0
-        env:
-          JAVA_HOME: /usr/lib/jvm/temurin-8-jdk-amd64
+          ruby-version: jruby-9.4.2.0
 
       - name: Bundle
         run: bundle install
-        env:
-          JAVA_HOME: /usr/lib/jvm/temurin-8-jdk-amd64
 
       - name: Run Multiverse Tests
         run: ./.github/workflows/scripts/retry_command 
@@ -155,7 +139,6 @@ jobs:
           SERIALIZE: 1
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           JRUBY_OPTS: --dev --debug
-          JAVA_HOME: /usr/lib/jvm/temurin-8-jdk-amd64
 
       - name: Annotate errors
         if: ${{ failure() }}

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## dev
 
-  Upcoming version removes Distributed Tracing warnings from agent logs when using Sidekiq and fixes a bug regarding logged request headers.
+  Upcoming version removes Distributed Tracing warnings from agent logs when using Sidekiq, fixes a bug regarding logged request headers, and is tested against the recently released JRuby 9.4.2.0.
 
 
 - **Bugfix: Removes Distributed Tracing related warnings from agent logs when headers are not present in Sidekiq**
@@ -17,6 +17,10 @@
 
   Previously, the agent could log an error when trying to determine the metric name in the Action Controller instrumentation if the controller class did not respond to `controller_path`. This has been resolved and the agent will no longer call this method unless the class responds to it. Thank you to [@gsar](https://github.com/gsar) for letting us know about this issue. [PR#1844](https://github.com/newrelic/newrelic-ruby-agent/pull/1844)
 
+- **CI: target JRuby 9.4.2.0**
+
+  The agent is now actively being tested against JRuby 9.4.2.0. NOTE that this release does not contain any non-CI related changes for JRuby. Old agent versions are still expected to work with newer JRubies and the newest agent version is still expected to work with older JRubies.
+
 
 ## v9.0.0