Ruby 4.0 support - Add logger as a dependency

.github/actions/run_multiverse/action.yml

@@ -19,7 +19,7 @@ runs:
       # - 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
+      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
     - name: Install Ruby ${{ inputs.ruby-version }}
       uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0

.github/actions/run_unit_tests/action.yml

@@ -16,7 +16,7 @@ runs:
       # - 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
+      run: sudo apt-get update; sudo apt-get install -y --no-install-recommends libcurl4-nss-dev libsasl2-dev libxslt1-dev
 
     - name: Install Ruby ${{ inputs.ruby-version }}
       uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # tag v1.257.0
@@ -49,6 +49,9 @@ runs:
             },
             "3.4.4": {
               "rails": "norails,rails61,rails70,rails71,rails72,rails80"
+            },
+            "3.5.0-preview1": {
+              "rails": "norails,rails61,rails70,rails71,rails72,rails80"
             }
           }
 

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
       - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
         with:
-          ruby-version: 3.4
+          ruby-version: 3.5.0-preview1
       - run: bundle
       - run: rubocop
 
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.6.10, 3.4.4]
+        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.6.10, 3.4.4]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.6.10, 3.4.4]
+        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.6.10, 3.4.4]
+        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.6.10, 3.4.4]
+        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.6.10, 3.4.4]
+        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.6.10, 3.4.4]
+        ruby-version: [2.6.10, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -287,7 +287,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.8, 3.4.4]
+        ruby-version: [2.7.8, 3.4.4, 3.5.0-preview1]
     steps:
       - name: Configure git
         run: 'git config --global init.defaultBranch main'
@@ -312,7 +312,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
       - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
         with:
-          ruby-version: 3.4
+          ruby-version: 3.5.0-preview1
       - run: bundle
       - name: Download all workflow run artifacts
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag v6.0.0

.github/workflows/ci_cron.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # tag v5.0.0
       - uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25 # tag v1.267.0
         with:
-          ruby-version: 3.4
+          ruby-version: 3.5.0-preview1
       - run: bundle
       - run: rubocop
 
@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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'
@@ -88,7 +88,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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.6.10, 2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        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'
@@ -290,7 +290,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7.8, 3.0.7, 3.1.7, 3.2.8, 3.3.8, 3.4.4]
+        ruby-version: [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/setup_bundler

@@ -59,14 +59,18 @@ function install_ruby_version_specific_gems {
     gem install --default digest:3.1.0
     gem install --default digest:3.2.0
     gem install --default erb:4.0.4
-    gem install --default erb:5.0.1
-    gem install --default logger:1.7.0
+    gem install --default erb:5.0.2
+
     gem install --default securerandom:0.3.2
     gem install --default securerandom:0.4.1
     gem install --default set:1.1.2
     gem install --default strscan:3.0.4
     gem install --default strscan:3.1.5
 
+    if [[ $RUBY_VERSION =~ ^(2\.|3\.[0-4]) ]]; then
+    gem install --default logger:1.7.0
+    fi
+
     echo "DEBUG: Completed installing gems"
 
 }

CHANGELOG.md

@@ -5,6 +5,9 @@
 - **Breaking Change: Remove 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)
 
+- **Feature: Add `logger` as a dependency**
+  The `logger` gem is now listed as a dependency of the agent to ensure continued logging functionality and support for Ruby 4.0.0 and newer versions. [PR#3293](https://github.com/newrelic/newrelic-ruby-agent/pull/3293)
+
 - **Breaking Change: Rename ActiveJob metrics**
   ActiveJob metrics have been updated to include the job's class name for more specific reporting. This is a breaking change and may require updating custom dashboards or alerts. [PR#3320](https://github.com/newrelic/newrelic-ruby-agent/pull/3320)
     - Old format: `Ruby/ActiveJob/<QueueName>/<Method>`

newrelic_rpm.gemspec

@@ -50,6 +50,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.summary = 'New Relic Ruby Agent'
 
+  s.add_dependency 'logger'
+
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'feedjira', '3.2.1' unless ENV['CI']
   s.add_development_dependency 'httparty' unless ENV['CI'] # for perf tests and Gabby

test/environments/rails61/Gemfile

@@ -40,6 +40,7 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 
 gem 'logger'

test/environments/rails70/Gemfile

@@ -26,5 +26,6 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 gem 'logger'

test/environments/rails71/Gemfile

@@ -26,5 +26,6 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 gem 'logger'

test/environments/rails72/Gemfile

@@ -26,5 +26,6 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 gem 'logger'

test/environments/rails80/Gemfile

@@ -26,5 +26,6 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 gem 'logger'

test/environments/railsedge/Gemfile

@@ -26,5 +26,6 @@ if RUBY_VERSION.split('.')[0..1].join('.').to_f >= 3.4
   gem 'bigdecimal'
   gem 'mutex_m'
   gem 'ostruct'
+  gem 'benchmark'
 end
 gem 'logger'

test/multiverse/suites/active_record_pg/Envfile

@@ -37,6 +37,7 @@ def gem_list(activerecord_version = nil)
 
     gem 'rack'
     gem 'minitest', '~> 5.2.3'
+    gem 'benchmark' if RUBY_VERSION >= '3.5.0'
   RB
 end
 

test/multiverse/suites/activemerchant/Envfile

@@ -16,6 +16,7 @@ def gem_list(activemerchant_version = nil)
     gem 'activesupport'
     gem 'nokogiri'
     gem 'minitest', '~> 5.1.0'
+    gem 'benchmark'
 
     # Need to load newrelic_rpm after ActiveMerchant Gateways are required
     gem 'newrelic_rpm', :require => false, :path => File.expand_path('../../../../')

test/multiverse/suites/delayed_job/Envfile

@@ -26,6 +26,7 @@ end
 
 boilerplate_gems = <<~SQLITE
   gem 'rack'
+  gem 'benchmark'
   #{sqlite}
   #{bigdecimal}
 

test/multiverse/suites/rails/Envfile

@@ -46,6 +46,7 @@ def gem_list(rails_version = nil)
     gem 'erubis' if RUBY_PLATFORM.eql?('java')
     gem 'loofah', '~> 2.20.0' if RUBY_VERSION >= '2.4.0' && RUBY_VERSION < '2.5.0'
     gem 'drb' if RUBY_VERSION >= '3.4.0'
+    gem 'benchmark'
   RB
 end
 

test/multiverse/suites/rails_prepend/Envfile

@@ -31,6 +31,7 @@ def gem_list(rails_version = nil)
     #{thor}
     gem 'loofah', '~> 2.20.0' if RUBY_VERSION >= '2.4.0' && RUBY_VERSION < '2.5.0'
     gem 'drb' if RUBY_VERSION >= '3.4.0'
+    gem 'benchmark' if RUBY_VERSION >= '3.5.0'
   RB
 end