Merge branch 'revert-338-use_rack_compliant_keys' into 0.12-dev

DataDog · Mar 7, 2018 · b784857 · b784857
2 parents 41c0785 + 92daf6a
commit b784857
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/ddtrace/contrib/grape/endpoint.rb b/lib/ddtrace/contrib/grape/endpoint.rb
@@ -71,7 +71,7 @@ def self.endpoint_run(name, start, finish, id, payload)
             span.resource = resource
 
             # set the request span resource if it's a `rack.request` span
-            request_span = payload[:env][Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
+            request_span = payload[:env][:datadog_rack_request_span]
             if !request_span.nil? && request_span.name == 'rack.request'
               request_span.resource = resource
             end

diff --git a/lib/ddtrace/contrib/rack/middlewares.rb b/lib/ddtrace/contrib/rack/middlewares.rb
@@ -13,8 +13,6 @@ module Rack
       # application. If request tags are not set by the app, they will be set using
       # information available at the Rack level.
       class TraceMiddleware
-        RACK_REQUEST_SPAN = 'datadog.rack_request_span'.freeze
-
         def initialize(app)
           @app = app
         end
@@ -37,7 +35,7 @@ def call(env)
           # start a new request span and attach it to the current Rack environment;
           # we must ensure that the span `resource` is set later
           request_span = tracer.trace('rack.request', trace_options)
-          env[RACK_REQUEST_SPAN] = request_span
+          env[:datadog_rack_request_span] = request_span
 
           # Copy the original env, before the rest of the stack executes.
           # Values may change; we want values before that happens.

diff --git a/test/contrib/rack/helpers.rb b/test/contrib/rack/helpers.rb
@@ -40,7 +40,7 @@ def app
         run(proc do |env|
           # this should be considered a web framework that can alter
           # the request span after routing / controller processing
-          request_span = env['datadog.rack_request_span']
+          request_span = env[:datadog_rack_request_span]
           request_span.resource = 'GET /app/'
           request_span.set_tag('http.method', 'GET_V2')
           request_span.set_tag('http.status_code', 201)
@@ -54,7 +54,7 @@ def app
         run(proc do |env|
           # this should be considered a web framework that can alter
           # the request span after routing / controller processing
-          request_span = env[Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
+          request_span = env[:datadog_rack_request_span]
           request_span.status = 1
           request_span.set_tag('error.stack', 'Handled exception')
 
@@ -66,7 +66,7 @@ def app
         run(proc do |env|
           # this should be considered a web framework that can alter
           # the request span after routing / controller processing
-          request_span = env[Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
+          request_span = env[:datadog_rack_request_span]
           request_span.set_tag('error.stack', 'Handled exception')
 
           [500, { 'Content-Type' => 'text/html' }, 'OK']