Merge branch 'v10_0_0' into ci_ruby_3_5

Author: hannahramadan

.github/actions/run_multiverse/action.yml

@@ -16,11 +16,10 @@ runs:
   using: "composite"
   steps:
       # - curl is needed for Curb
-      # - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
       # - sasl is needed for memcached
     - name: Install OS packages
       shell: bash
-      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
+      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev
 
     - name: Install Ruby ${{ inputs.ruby-version }}
       uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0

.github/actions/run_unit_tests/action.yml

@@ -13,11 +13,10 @@ runs:
   using: "composite"
   steps:
       # - curl is needed for Curb
-      # - xslt is needed for older Nokogiris, RUBY_VERSION < 2.5
       # - sasl is needed for memcached
     - name: Install OS packages
       shell: bash
-      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
+      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev
 
     - name: Install Ruby ${{ inputs.ruby-version }}
       uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
@@ -30,12 +29,6 @@ runs:
         key: ${{ inputs.ruby-version }}
         map: |
           {
-            "2.4.10": {
-              "rails": "norails,rails52,rails51,rails50,rails42,rails41,rails40"
-            },
-            "2.5.9": {
-              "rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
-            },
             "2.6.10": {
               "rails": "norails,rails61,rails60,rails52,rails51,rails50,rails42"
             },

.github/actions/setup_mysql_tests/action.yml

@@ -8,25 +8,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-      # This allows the cache in the following step to be able to write files to the directory needed for mysql
-    - if: inputs.ruby-version == '2.4.10'
-      name: Prepare mysql directory
-      shell: bash
-      run: sudo chown -R $USER /usr/local
-
-    - if: inputs.ruby-version == '2.4.10'
-      name: Cache mysql55
-      id: mysql55-cache
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag v4.2.3
-      with:
-        path: /usr/local/mysql55
-        key: mysql55-install
-
-    - if: steps.mysql55-cache.outputs.cache-hit != 'true' && inputs.ruby-version == '2.4.10'
-      name: Install mysql55
-      shell: bash
-      run: sudo ./test/script/install_mysql55
-
     - name: Wait for/Check Mysql
       uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # tag v3.0.2
       with:

.github/workflows/ci.yml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -56,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         multiverse: [agent, ai, background, background_2, frameworks, httpclients, httpclients_2, hybrid_agent, rails, rest]
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-22.04
     services:
       mongodb:
-        image: ${{ contains(fromJson('["2.4.10"]'), matrix.ruby-version) && 'mongo:5.0.11' || 'mongo:latest' }}
+        image: mongo:latest
         ports:
           - 27017:27017
       rabbitmq:
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -182,7 +182,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -229,7 +229,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -268,7 +268,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'

.github/workflows/ci_cron.yml

@@ -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.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         multiverse: [agent, ai, background, background_2, frameworks, httpclients, httpclients_2, hybrid_agent, rails, rest]
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -73,7 +73,7 @@ jobs:
     runs-on: ubuntu-22.04
     services:
       mongodb:
-        image: ${{ contains(fromJson('["2.4.10"]'), matrix.ruby-version) && 'mongo:5.0.11' || 'mongo:latest' }}
+        image: mongo:latest
         ports:
           - 27017:27017
       rabbitmq:
@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -183,7 +183,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -231,7 +231,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -271,7 +271,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.4.10, 2.5.9, 2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
+        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'

.github/workflows/scripts/generate_release_notes.rb

@@ -35,6 +35,8 @@ def build_metadata
     titles.each do |t|
       category = t.split(':').first
       case category
+      when 'Breaking Change'
+        metadata[:features] << t.delete_prefix('Breaking Change: ')
       when 'Feature'
         metadata[:features] << t.delete_prefix('Feature: ')
       when 'Bugfix'

.github/workflows/scripts/setup_bundler

@@ -14,19 +14,9 @@ function using_old_rails {
   [[ $RAILS_VERSION =~ .*"4".* ]]
 }
 
-function using_old_ruby {
-  # example RUBY_VERSION strings:
-  #   '2.4.10' => true, starts with "2", next digit is not a "6" or "7"
-  #   '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] ]]
-}
-
 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
-
   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
@@ -56,17 +46,6 @@ function install_desired_bundler_version {
   gem list bundler
 }
 
-function configure_bundler {
-  if ! [[ $RUBY_VERSION =~ ^2\.4 ]]; then
-    echo "DEBUG: Ruby is not at version 2.4.x, skipping 'bundler config'"
-    return
-  fi
-
-  # add mysql specific config for bundler when we are using older mysql
-  echo "DEBUG: running 'bundle config'"
-  bundle config --global build.mysql2 --with-mysql-config=/usr/local/mysql55/bin/mysql_config
-}
-
 function install_ruby_version_specific_gems {
   if using_jruby; then
     echo "DEBUG: Skipping specific gem installation, as JRuby is in use"
@@ -104,7 +83,6 @@ function set_up_bundler {
 
   update_to_desired_rubygems_version
   install_desired_bundler_version
-  configure_bundler
 }
 
 echo "DEBUG: setting up Bundler"

.rubocop.yml

@@ -878,9 +878,8 @@ Naming/VariableNumber:
 Performance/BindCall:
   Enabled: false
 
-# TODO: OLD RUBIES - Requires 2.5
 Performance/DeletePrefix:
-  Enabled: false
+  Enabled: true
 
 # TODO: OLD RUBIES - Requires 2.7
 Performance/MapCompact:
@@ -1237,12 +1236,8 @@ Style/LineEndConcatenation:
   Enabled: false
   # SafeAutoCorrect: false
 
-# TODO: OLD RUBIES - enable this cop after support for Ruby <= 2.5 has been
-#                    dropped. NewRelic::Agent::InfiniteTracing::Transformer.hash_to_attributes
-#                    currently does `values.map {}.to_h`. Newer Rubies should
-#                    use `values.to_h {}` instead.
 Style/MapToHash:
-  Enabled: false
+  Enabled: true
 
 Style/MethodCallWithArgsParentheses:
   Enabled: true

CHANGELOG.md

@@ -1,11 +1,16 @@
 # New Relic Ruby Agent Release Notes
 
-## v9.23.0
+## v10.0.0
 
 - **Feature: Add sidekiq.ignore_retry_errors configuration option**
 
   A new configuration option, `sidekiq.ignore_retry_errors`, has been added to control if Sidekiq job retries are captured. Retry errors are captured by default, but now if `sidekiq.ignore_retry_errors` is set to `true`, the agent will ignore exceptions raised during Sidekiq's retry attempts and will only report the error if the job permanently fails. Thank you [DonGiulio](https://github.com/DonGiulio) for recognizing this improvement and contributing a solution. [PR#3317](https://github.com/newrelic/newrelic-ruby-agent/pull/3317)
 
+- **Breaking Change: Removed support for Ruby 2.4 and 2.5**
+  Support for Ruby versions 2.4 and 2.5 has been removed. The new minimum required Ruby version is now 2.6. [PR#3314](https://github.com/newrelic/newrelic-ruby-agent/pull/3314)
+
+## v9.23.0
+
 - **Feature: Deprecation notice for recording deployments using Capistrano**
 
   Sending application deployment information using a Capistrano recipe is deprecated and will be removed in agent version 10.0.0. For recording deployments, please see our guide to [Change Tracking](https://docs.newrelic.com/docs/change-tracking/change-tracking-introduction/) for a list of available options.

infinite_tracing/lib/infinite_tracing/connection.rb

@@ -157,7 +157,6 @@ def license_key
 
       def request_headers_map
         headers = NewRelic::Agent.agent.service.instance_variable_get(:@request_headers_map) || NewRelic::EMPTY_HASH
-        # transform_keys only 2.5+, but infinite tracing is 2.5+ only also
         headers.transform_keys(&:downcase)
       end