squash: remove global vars

Author: arielvalentin

.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/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'
@@ -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