squash: fix invalid HTTP responses in tests

open-telemetry · Oct 28, 2023 · 55ef600 · 55ef600
1 parent f85dbe7
commit 55ef600
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ck/test/opentelemetry/instrumentation/action_pack/patches/action_controller/metal_test.rb b/...ck/test/opentelemetry/instrumentation/action_pack/patches/action_controller/metal_test.rb
@@ -18,7 +18,9 @@
   let(:rails_app) { DEFAULT_RAILS_APP }
 
   # Clear captured spans
-  before { exporter.reset }
+  before do
+    exporter.reset
+  end
 
   it 'sets the span name to the format: ControllerName#action' do
     get '/ok'

diff --git a/instrumentation/action_pack/test/test_helpers/app_config.rb b/instrumentation/action_pack/test/test_helpers/app_config.rb
@@ -50,9 +50,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)

diff --git a/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb b/instrumentation/action_pack/test/test_helpers/middlewares/redirect_middleware.rb
@@ -10,7 +10,7 @@ def initialize(app, _options = {})
   end
 
   def call(env)
-    return [307, {}, 'Temporary Redirect'] if should_redirect?(env)
+    return [307, { 'Location' => '/ok', 'Content-Type' => 'text/plain' }, ['Temporary Redirect']] if should_redirect?(env)
 
     @app.call(env)
   end