Adjust ActionDispatch contib tests

Author: Strech

lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb

@@ -9,7 +9,6 @@ module ActionPack
         module ActionDispatch
           # Instrumentation for ActionDispatch components
           module Instrumentation
-            HTTP_ROUTE_KEY = 'datadog.http.route'
             SCRIPT_NAME_KEY = 'SCRIPT_NAME'
             FORMAT_SUFFIX = '(.:format)'
 
@@ -52,7 +51,6 @@ def find_routes(req)
                     http_route = route.path.spec.to_s
                     http_route.delete_suffix!(FORMAT_SUFFIX)
 
-                    req.env[HTTP_ROUTE_KEY] = http_route
                     Instrumentation.set_http_route_tags(http_route, req.env[SCRIPT_NAME_KEY])
 
                     break
@@ -71,7 +69,6 @@ def find_routes(req)
                       http_route = route.path.spec.to_s
                       http_route.delete_suffix!(FORMAT_SUFFIX)
 
-                      req.env[HTTP_ROUTE_KEY] = http_route
                       Instrumentation.set_http_route_tags(http_route, req.env[SCRIPT_NAME_KEY])
                     end
 

spec/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation_spec.rb

@@ -4,15 +4,9 @@
 require 'datadog/tracing/contrib/action_pack/action_dispatch/instrumentation'
 
 RSpec.describe Datadog::Tracing::Contrib::ActionPack::ActionDispatch::Instrumentation do
-  describe '::set_http_route_tags' do
-    let(:tracing_enabled) { true }
-
-    before do
-      expect(Datadog::Tracing).to receive(:enabled?).and_return(tracing_enabled)
-    end
-
+  describe '.set_http_route_tags' do
     context 'when tracing is disabled' do
-      let(:tracing_enabled) { false }
+      before { expect(Datadog::Tracing).to receive(:enabled?).and_return(false) }
 
       it 'sets no tags' do
         Datadog::Tracing.trace('rack.request') do |_span, trace|
@@ -24,37 +18,41 @@
       end
     end
 
-    it 'sets http.route and http.route.path tags on existing trace' do
-      Datadog::Tracing.trace('rack.request') do |_span, trace|
-        described_class.set_http_route_tags('/users/:id(.:format)', '/auth')
+    context 'when tracing is enabled' do
+      before { expect(Datadog::Tracing).to receive(:enabled?).and_return(true) }
 
-        expect(trace.send(:meta).fetch('http.route')).to eq('/users/:id')
-        expect(trace.send(:meta).fetch('http.route.path')).to eq('/auth')
+      it 'sets http.route and http.route.path tags on existing trace' do
+        Datadog::Tracing.trace('rack.request') do |_span, trace|
+          described_class.set_http_route_tags('/users/:id', '/auth')
+
+          expect(trace.send(:meta).fetch('http.route')).to eq('/users/:id')
+          expect(trace.send(:meta).fetch('http.route.path')).to eq('/auth')
+        end
       end
-    end
 
-    it 'sets no http.route.path when script name is nil' do
-      Datadog::Tracing.trace('rack.request') do |_span, trace|
-        described_class.set_http_route_tags('/users/:id(.:format)', nil)
+      it 'sets no http.route.path when script name is nil' do
+        Datadog::Tracing.trace('rack.request') do |_span, trace|
+          described_class.set_http_route_tags('/users/:id', nil)
 
-        expect(trace.send(:meta).fetch('http.route')).to eq('/users/:id')
-        expect(trace.send(:meta)).not_to have_key('http.route.path')
+          expect(trace.send(:meta).fetch('http.route')).to eq('/users/:id')
+          expect(trace.send(:meta)).not_to have_key('http.route.path')
+        end
       end
-    end
 
-    it 'sets no tags when route spec is nil' do
-      Datadog::Tracing.trace('rack.request') do |_span, trace|
-        described_class.set_http_route_tags(nil, '/auth')
+      it 'sets no tags when route spec is nil' do
+        Datadog::Tracing.trace('rack.request') do |_span, trace|
+          described_class.set_http_route_tags(nil, '/auth')
 
-        expect(trace.send(:meta)).not_to have_key('http.route')
-        expect(trace.send(:meta)).not_to have_key('http.route.path')
+          expect(trace.send(:meta)).not_to have_key('http.route')
+          expect(trace.send(:meta)).not_to have_key('http.route.path')
+        end
       end
-    end
 
-    it 'does not create new traces when no active trace is present' do
-      described_class.set_http_route_tags('/users/:id', '/auth')
+      it 'does not create new traces when no active trace is present' do
+        described_class.set_http_route_tags('/users/:id', '/auth')
 
-      expect(traces).to be_empty
+        expect(traces).to be_empty
+      end
     end
   end
 end