Merge branch 'main' into release/multi/20241119162613

.github/actions/test_gem/action.yml

@@ -95,6 +95,7 @@ runs:
       run: |
         # 💎 Install dependencies and generate appraisals 💎
         bundle install --quiet --jobs=3 --retry=4
+        bundle exec appraisal clean
         bundle exec appraisal generate
       working-directory: "${{ steps.setup.outputs.gem_dir }}"
 

.gitignore

@@ -12,6 +12,7 @@
 
 # Appraisals
 instrumentation/**/gemfiles
+instrumentation/**/tmp/**/*
 
 # Sqlite file for tests
 instrumentation/active_record/db
@@ -26,3 +27,4 @@ instrumentation/active_record/db
 .ruby-version
 
 tags
+!**/*/.gitkeep

instrumentation/action_mailer/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "action_mailer-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "action_mailer-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'action_mailer-latest' do
+    gem 'rails'
   end
 end

instrumentation/action_pack/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "rails-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
   end
 end

instrumentation/action_pack/test/opentelemetry/instrumentation/action_pack/handlers/action_controller_test.rb

@@ -16,7 +16,7 @@
   let(:exporter) { EXPORTER }
   let(:spans) { exporter.finished_spans }
   let(:span) { exporter.finished_spans.last }
-  let(:rails_app) { DEFAULT_RAILS_APP }
+  let(:rails_app) { AppConfig.initialize_app }
   let(:config) { {} }
 
   # Clear captured spans

instrumentation/action_pack/test/test_helper.rb

@@ -22,8 +22,3 @@
   c.use 'OpenTelemetry::Instrumentation::ActionPack'
   c.add_span_processor span_processor
 end
-
-# Create a globally available Rails app, this should be used in test unless
-# specifically testing behaviour with different initialization configs.
-DEFAULT_RAILS_APP = AppConfig.initialize_app
-Rails.application = DEFAULT_RAILS_APP

instrumentation/action_pack/test/test_helpers/app_config.rb

@@ -4,8 +4,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-class Application < Rails::Application; end
 require 'action_controller/railtie'
+class Application < Rails::Application; end
 require_relative 'middlewares'
 require_relative 'controllers'
 require_relative 'routes'
@@ -30,7 +30,7 @@ def initialize_app(use_exceptions_app: false, remove_rack_tracer_middleware: fal
     case Rails.version
     when /^6\.1/
       apply_rails_6_1_configs(new_app)
-    when /^7\./
+    when /^7|8\./
       apply_rails_7_configs(new_app)
     end
 

instrumentation/action_view/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "action_view-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
   end
 end

instrumentation/active_job/Appraisals

@@ -10,6 +10,14 @@
   end
 end
 
-appraise 'activejob-latest' do
-  gem 'activejob'
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "activejob-#{version}" do
+      gem 'activejob', "~> #{version}"
+    end
+  end
+
+  appraise 'activejob-latest' do
+    gem 'activejob'
+  end
 end

instrumentation/active_record/Appraisals

@@ -4,20 +4,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'activerecord-6.1' do
-  gem 'activerecord', '~> 6.1.0'
-end
-
-appraise 'activerecord-7.0' do
-  gem 'activerecord', '~> 7.0.0'
-end
-
-appraise 'activerecord-7.1' do
-  gem 'activerecord', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "activerecord-#{version}" do
+    gem 'sqlite3', '~> 1.4'
+    gem 'activerecord', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'activerecord-7.2' do
-    gem 'activerecord', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "activerecord-#{version}" do
+      gem 'sqlite3', '~> 1.4'
+      gem 'activerecord', "~> #{version}"
+    end
+  end
+
+  appraise 'activerecord-latest' do
+    gem 'sqlite3', '>= 2.1'
+    gem 'activerecord'
   end
 end

instrumentation/active_record/Gemfile

@@ -12,5 +12,4 @@ group :test do
   gem 'byebug'
   gem 'opentelemetry-instrumentation-base', path: '../base'
   gem 'pry-byebug'
-  gem 'sqlite3', '~> 1.4'
 end

instrumentation/active_support/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'activesupport-6.1' do
-  gem 'activesupport', '~> 6.1.0'
-end
-
-appraise 'activesupport-7.0' do
-  gem 'activesupport', '~> 7.0.0'
-end
-
-appraise 'activesupport-7.1' do
-  gem 'activesupport', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "activesupport-#{version}" do
+    gem 'activesupport', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'activesupport-7.2' do
-    gem 'activesupport', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "activesupport-#{version}" do
+      gem 'activesupport', "~> #{version}"
+    end
+  end
+
+  appraise 'activesupport-latest' do
+    gem 'activesupport'
   end
 end

instrumentation/delayed_job/Appraisals

@@ -4,18 +4,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'delayed_job_4.1-rails-latest' do
-  gem 'activejob'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "delayed_job_4.1-activejob-#{version}" do
+    gem 'delayed_job', '~> 4.1'
+    gem 'activejob', "~> #{version}"
+  end
 end
 
-appraise 'delayed_job_4.1-rails-7.1' do
-  gem 'activejob', '~> 7.1.0'
-end
-
-appraise 'delayed_job_4.1-rails-7.0' do
-  gem 'activejob', '~> 7.0.0'
-end
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+  %w[7.2.0].each do |version|
+    appraise "delayed_job-4.1-activejob-#{version}" do
+      gem 'delayed_job', '~> 4.1'
+      gem 'activejob', "~> #{version}"
+    end
+  end
 
-appraise 'delayed_job-4.1-rails-6.1' do
-  gem 'activejob', '~> 6.1.0'
+  appraise 'delayed_job-latest' do
+    gem 'delayed_job'
+    gem 'activejob'
+  end
 end

instrumentation/delayed_job/Gemfile

@@ -9,6 +9,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'delayed_job', '~> 4.1'
   gem 'opentelemetry-instrumentation-base', path: '../base'
 end

instrumentation/rails/Appraisals

@@ -4,20 +4,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-appraise 'rails-6.1' do
-  gem 'rails', '~> 6.1.0'
-end
-
-appraise 'rails-7.0' do
-  gem 'rails', '~> 7.0.0'
-end
-
-appraise 'rails-7.1' do
-  gem 'rails', '~> 7.1.0'
+%w[6.1.0 7.0.0 7.1.0].each do |version|
+  appraise "rails-#{version}" do
+    gem 'rails', "~> #{version}"
+  end
 end
 
 if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
-  appraise 'rails-7.2' do
-    gem 'rails', '~> 7.2.0'
+  %w[7.2.0].each do |version|
+    appraise "rails-#{version}" do
+      gem 'rails', "~> #{version}"
+    end
+  end
+
+  appraise 'rails-latest' do
+    gem 'rails'
   end
 end

instrumentation/rails/test/instrumentation/opentelemetry/instrumentation/rails/patches/action_controller/metal_test.rb

@@ -12,7 +12,7 @@
   let(:exporter) { EXPORTER }
   let(:spans) { exporter.finished_spans }
   let(:span) { exporter.finished_spans.last }
-  let(:rails_app) { DEFAULT_RAILS_APP }
+  let(:rails_app) { AppConfig.initialize_app }
 
   # Clear captured spans
   before { exporter.reset }

instrumentation/rails/test/instrumentation/test_helper.rb

@@ -23,8 +23,3 @@
   c.use_all
   c.add_span_processor span_processor
 end
-
-# Create a globally available Rails app, this should be used in test unless
-# specifically testing behaviour with different initialization configs.
-DEFAULT_RAILS_APP = AppConfig.initialize_app
-Rails.application = DEFAULT_RAILS_APP

instrumentation/rails/test/instrumentation/test_helpers/app_config.rb

@@ -4,8 +4,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-class Application < Rails::Application; end
 require 'action_controller/railtie'
+class Application < Rails::Application; end
+
 require_relative 'middlewares'
 require_relative 'controllers'
 require_relative 'routes'
@@ -28,7 +29,7 @@ def initialize_app(use_exceptions_app: false, remove_rack_tracer_middleware: fal
     case Rails.version
     when /^6\.1/
       apply_rails_6_1_configs(new_app)
-    when /^7\./
+    when /^7|8\./
       apply_rails_7_configs(new_app)
     end
 
@@ -46,9 +47,7 @@ def initialize_app(use_exceptions_app: false, remove_rack_tracer_middleware: fal
   private
 
   def remove_rack_middleware(application)
-    application.middleware.delete(
-      OpenTelemetry::Instrumentation::Rack::Middlewares::TracerMiddleware
-    )
+    application.middleware.delete(Rack::Events)
   end
 
   def add_exceptions_app(application)

instrumentation/rails/test/instrumentation/test_helpers/controllers/example_controller.rb

@@ -12,6 +12,6 @@ def ok
   end
 
   def internal_server_error
-    raise :internal_server_error
+    raise 'internal_server_error'
   end
 end

instrumentation/rails/test/instrumentation/test_helpers/routes.rb

@@ -6,7 +6,7 @@
 
 def draw_routes(rails_app)
   rails_app.routes.draw do
-    get '/ok', to: 'example#ok'
+    get 'ok', to: 'example#ok'
     get '/internal_server_error', to: 'example#internal_server_error'
   end
 end