Merge branch 'main' into drop-rails-6.1

arielvalentin · web-flow · commit 9319dc91c620 · 2025-01-15T21:14:58.000-06:00
diff --git a/instrumentation/action_mailer/test/test_helper.rb b/instrumentation/action_mailer/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
diff --git a/instrumentation/action_pack/test/test_helper.rb b/instrumentation/action_pack/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
diff --git a/instrumentation/action_view/test/test_helper.rb b/instrumentation/action_view/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
diff --git a/instrumentation/delayed_job/test/test_helper.rb b/instrumentation/delayed_job/test/test_helper.rb
@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
+require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 
diff --git a/instrumentation/rails/test/railtie/test_helper.rb b/instrumentation/rails/test/railtie/test_helper.rb
@@ -8,6 +8,7 @@
 ENV['RACK_ENV'] = 'test'
 ENV['RAILS_ENV'] = 'test'
 
+require 'logger'
 require 'bundler/setup'
 Bundler.require(:default, :development, :test)
 

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#`
`5`	`5`	`# SPDX-License-Identifier: Apache-2.0`
`6`	`6`
	`7`	`+require 'logger'`
`7`	`8`	`require 'bundler/setup'`
`8`	`9`	`Bundler.require(:default, :development, :test)`
`9`	`10`