Merge pull request #2661 from newrelic/dev

Release 9.10.0
newrelic · May 29, 2024 · d4a9102 · d4a9102
2 parents ccde782 + 687f59a
commit d4a9102
Show file tree

Hide file tree

Showing 56 changed files with 1,043 additions and 230 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
-      - uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: '3.3'
       - run: bundle
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.3.0]
+        ruby-version: [2.4.10, 3.3.1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -49,7 +49,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
@@ -62,7 +62,7 @@ jobs:
               "2.4.10": {
                 "rails": "norails,rails42,rails52"
               },
-              "3.3.0": {
+              "3.3.1": {
                 "rails": "norails,rails61,rails70"
               }
             }
@@ -190,7 +190,7 @@ jobs:
       fail-fast: false
       matrix:
         multiverse: [agent, ai, background, background_2, database, frameworks, httpclients, httpclients_2, rails, rest]
-        ruby-version: [2.4.10, 3.3.0]
+        ruby-version: [2.4.10, 3.3.1]
 
     steps:
       - name: Configure git
@@ -204,7 +204,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
@@ -290,14 +290,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.8, 3.3.0]
+        ruby-version: [2.7.8, 3.3.1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
@@ -337,9 +337,9 @@ jobs:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
-      - uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: '3.1'
+          ruby-version: '3.3'
       - run: bundle
       - name: Download all workflow run artifacts
         uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # tag v3.0.2

diff --git a/.github/workflows/ci_cron.yml b/.github/workflows/ci_cron.yml
@@ -16,9 +16,9 @@ jobs:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
-      - uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.3'
       - run: bundle
       - run: rubocop
 
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
+        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
 
     steps:
       - name: Configure git
@@ -50,7 +50,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
@@ -72,17 +72,17 @@ jobs:
               "2.7.8": {
                 "rails": "norails,rails61,rails60,rails70"
               },
-              "3.0.6": {
+              "3.0.7": {
                 "rails": "norails,rails61,rails60,rails70"
               },
-              "3.1.4": {
-                "rails": "norails,rails61,rails70,railsedge"
+              "3.1.5": {
+                "rails": "norails,rails61,rails70"
               },
-              "3.2.2": {
-                "rails": "norails,rails61,rails70,railsedge"
+              "3.2.4": {
+                "rails": "norails,rails61,rails70"
               },
-              "3.3.0": {
-                "rails": "norails,rails61,rails70,railsedge"
+              "3.3.1": {
+                "rails": "norails,rails61,rails70"
               }
             }
 
@@ -200,7 +200,7 @@ jobs:
       fail-fast: false
       matrix:
         multiverse: [agent, ai, background, background_2, database, frameworks, httpclients, httpclients_2, rails, rest]
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
+        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -213,7 +213,7 @@ jobs:
         run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 
@@ -278,14 +278,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.8, 3.0.6, 3.1.4, 3.2.2, 3.3.0]
+        ruby-version: [2.7.8, 3.0.7, 3.1.5, 3.2.4, 3.3.1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
 
       - name: Install Ruby ${{ matrix.ruby-version }}
-        uses: ruby/setup-ruby@360dc864d5da99d54fcb8e9148c14a84b90d3e88 # tag v1.165.1
+        uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
           ruby-version: ${{ matrix.ruby-version }}
 

diff --git a/.github/workflows/ci_jruby.yml b/.github/workflows/ci_jruby.yml
@@ -16,9 +16,9 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
 
       - name: Install JRuby
-        uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # tag v1.176.0
         with:
-          ruby-version: jruby-9.4.5.0
+          ruby-version: jruby-9.4.7.0
 
       - name: Bundle
         run: bundle install
@@ -49,9 +49,9 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
 
       - name: Install JRuby
-        uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+        uses: ruby/setup-ruby@cacc9f1c0b3f4eb8a16a6bb0ed10897b43b9de49 # tag v1.176.0
         with:
-          ruby-version: jruby-9.4.5.0
+          ruby-version: jruby-9.4.7.0
 
       - name: Bundle
         run: bundle install

diff --git a/.github/workflows/config_docs.yml b/.github/workflows/config_docs.yml
@@ -14,10 +14,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-    - name: Install Ruby 3.2
-      uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+    - name: Install Ruby 3.3
+      uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
 
     - name: Checkout code
       uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

diff --git a/.github/workflows/performance_tests.yml b/.github/workflows/performance_tests.yml
@@ -33,9 +33,9 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
         with:
           ref: 'main'
-      - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: '3.2'
+          ruby-version: '3.3'
       - run: bundle
       - run: bundle exec script/runner -B
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -10,10 +10,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-    - name: Install Ruby 3.2
-      uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+    - name: Install Ruby 3.3
+      uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
 
     - name: Checkout code
       uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,9 +16,9 @@ jobs:
       with:
         fetch-depth: 0
 
-    - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+    - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
 
     - name: Install onetimepass
       run: pip install onetimepass==1.0.1

diff --git a/.github/workflows/release_notes.yml b/.github/workflows/release_notes.yml
@@ -13,9 +13,9 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-      - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
       - name: Checkout code
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
 

diff --git a/.github/workflows/release_pr.yml b/.github/workflows/release_pr.yml
@@ -13,10 +13,10 @@ jobs:
       contents: write
       pull-requests: write
     steps:
-    - name: Install Ruby 3.2
-      uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+    - name: Install Ruby 3.3
+      uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
       with:
-        ruby-version: 3.2
+        ruby-version: 3.3
 
     - name: Checkout code
       uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2

diff --git a/.github/workflows/scripts/setup_bundler b/.github/workflows/scripts/setup_bundler
@@ -20,15 +20,15 @@ function using_old_ruby {
   #   '2.7.7'  => false, starts with "2", next digit is "7"
   #   '3.1.3'  => false, does not start with "2"
   echo "DEBUG: RUBY_VERSION = $RUBY_VERSION"
-  [[ $RUBY_VERSION =~ 2.[^67] ]]
+  [[ $RUBY_VERSION =~ ^2\.[^67] ]]
 }
 
 function update_to_desired_rubygems_version {
   # Older rubies come with older Rubygems and we need 3.0.6 to
   # correctly install Bundler 1.17 for the multiverse test suite
   # Rubies < 2.3 need to use update_rubygems,
   # newer Rubies can use 'gem update --system'
-  if [[ $RUBY_VERSION =~ 2.[^7] ]]; then
+  if [[ $RUBY_VERSION =~ ^2\.[^7] ]]; then
     echo "DEBUG: running 'gem update --system 3.0.6 --force'"
     gem update --system 3.0.6 --force >/dev/null
   else
@@ -58,7 +58,7 @@ function install_desired_bundler_version {
 }
 
 function configure_bundler {
-  if ! [[ $RUBY_VERSION =~ 2.4 ]]; then
+  if ! [[ $RUBY_VERSION =~ ^2\.4 ]]; then
     echo "DEBUG: Ruby is not at version 2.4.x, skipping 'bundler config'"
     return
   fi
@@ -75,14 +75,14 @@ function install_ruby_version_specific_gems {
   fi
 
   # for some reason, ruby 3.0 fails unless 3.1.0 is installed before it bundles for rails_prepend suite/rails 7
-  if [[ $RUBY_VERSION =~ 3.0 ]]; then 
+  if [[ $RUBY_VERSION =~ ^3\.0 ]]; then 
     echo "DEBUG: running 'gem install digest'"
     gem install --default digest:3.1.0
     echo "installed digest 3.1.0"
   fi
 
   # for some reason, ruby 2.7+ fails unless strscan 3.0.4 is installed
-  if [[ $RUBY_VERSION = 3.* || $RUBY_VERSION =~ 2.7 ]]; then 
+  if [[ $RUBY_VERSION =~ ^3\. || $RUBY_VERSION =~ ^2\.7 ]]; then 
     echo "DEBUG: running 'gem install strscan'"
     gem install --default strscan:3.0.4
     echo "installed strscan 3.0.4"

diff --git a/.github/workflows/slack_notifications.yml b/.github/workflows/slack_notifications.yml
@@ -8,9 +8,9 @@ jobs:
   gem_notifications:
     runs-on: ubuntu-22.04
     steps:
-      - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
       - run: gem install httparty
       - name: Check for outdated gems
@@ -45,9 +45,9 @@ jobs:
   cve_notifications:
     runs-on: ubuntu-22.04
     steps:
-      - uses: ruby/setup-ruby@af848b40be8bb463a751551a1180d74782ba8a72 # tag v1.162.0
+      - uses: ruby/setup-ruby@1198b074305f9356bd56dd4b311757cc0dab2f1c # tag v1.175.1
         with:
-          ruby-version: 3.2
+          ruby-version: 3.3
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # tag v4.1.2
       - run: gem install httparty
       - run: gem install feedjira

diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -1250,6 +1250,7 @@ Style/MethodCallWithArgsParentheses:
     - add_development_dependency
     - catch
     - debug
+    - exit
     - expect
     - fail
     - gem
@@ -1260,6 +1261,7 @@ Style/MethodCallWithArgsParentheses:
     - pp
     - raise
     - require
+    - require_relative
     - skip
     - sleep
     - source
@@ -1268,6 +1270,7 @@ Style/MethodCallWithArgsParentheses:
     - throw
     - use
     - warn
+    - warn_and_exit
   AllowedPatterns: [^assert, ^refute]
 
 Style/MethodCallWithoutArgsParentheses:
-Original file line number
+Diff line change
@@ Expand Up / @@ -1250,6 +1250,7 @@ Style/MethodCallWithArgsParentheses: @@
         - add_development_dependency
         - catch
         - debug
+        - exit
         - expect
         - fail
         - gem
@@ Expand All / @@ -1260,6 +1261,7 @@ Style/MethodCallWithArgsParentheses: @@
         - pp
         - raise
         - require
+        - require_relative
         - skip
         - sleep
         - source
@@ Expand All / @@ -1268,6 +1270,7 @@ Style/MethodCallWithArgsParentheses: @@
         - throw
         - use
         - warn
+        - warn_and_exit
       AllowedPatterns: [^assert, ^refute]
     Style/MethodCallWithoutArgsParentheses:
@@ Expand Down @@