squash: remove global state causing routes to be stale

open-telemetry · Nov 19, 2024 · ee4690a · ee4690a
1 parent b982c1e
commit ee4690a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 9 deletions.
diff --git a/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec b/instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec
@@ -34,7 +34,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
-  spec.add_development_dependency 'rails', '>= 6.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.68.0'
   spec.add_development_dependency 'rubocop-performance', '~> 1.22.0'

diff --git a/...on_pack/test/opentelemetry/instrumentation/action_pack/handlers/action_controller_test.rb b/...on_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

diff --git a/instrumentation/action_pack/test/test_helper.rb b/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
diff --git a/instrumentation/action_pack/test/test_helpers/app_config.rb b/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'

diff --git a/instrumentation/action_pack/test/test_helpers/controllers/example_controller.rb b/instrumentation/action_pack/test/test_helpers/controllers/example_controller.rb
@@ -20,6 +20,6 @@ def new_item
   end
 
   def internal_server_error
-    raise :internal_server_error
+    raise 'internal_server_error'
   end
 end