ddtrace 0.11.2 → 0.11.3

data/lib/ddtrace/contrib/rails/middlewares.rb

@@ -22,8 +22,13 @@ module Datadog
         # SignalException::Interrupt would still bubble up.
         rescue Exception => e
           tracer = Datadog.configuration[:rails][:tracer]
-          span = tracer.active_span()
-          span.set_error(e) unless span.nil?
+          span = tracer.active_span
+          unless span.nil?
+            # Only set error if it's supposed to be flagged as such
+            # e.g. we don't want to flag 404s.
+            # You can add custom errors via `config.action_dispatch.rescue_responses`
+            span.set_error(e) if Utils.exception_is_error?(e)
+          end
           raise e
         end
       end

data/lib/ddtrace/contrib/rails/railtie.rb

@@ -6,7 +6,10 @@ module Datadog
   # Railtie class initializes
   class Railtie < Rails::Railtie
     config.app_middleware.insert_before(0, Datadog::Contrib::Rack::TraceMiddleware)
-    config.app_middleware.use(Datadog::Contrib::Rails::ExceptionMiddleware)
+    # Insert right after Rails exception handling middleware, because if it's before,
+    # it catches and swallows the error. If it's too far after, custom middleware can find itself
+    # between, and raise exceptions that don't end up getting tagged on the request properly (e.g lost stack trace.)
+    config.app_middleware.insert_after(ActionDispatch::ShowExceptions, Datadog::Contrib::Rails::ExceptionMiddleware)
 
     config.after_initialize do
       Datadog::Contrib::Rails::Framework.setup

data/lib/ddtrace/contrib/rails/utils.rb

@@ -72,6 +72,18 @@ module Datadog
           end
         end
 
+        def self.exception_is_error?(exception)
+          if defined?(::ActionDispatch::ExceptionWrapper)
+            # Gets the equivalent status code for the exception (not all are 5XX)
+            # You can add custom errors via `config.action_dispatch.rescue_responses`
+            status = ::ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name)
+            # Only 5XX exceptions are actually errors (e.g. don't flag 404s)
+            status.to_s.starts_with?('5')
+          else
+            true
+          end
+        end
+
         private_class_method :connection_config
       end
     end

data/lib/ddtrace/ext/http.rb

@@ -6,6 +6,7 @@ module Datadog
       URL = 'http.url'.freeze
       BASE_URL = 'http.base_url'.freeze
       METHOD = 'http.method'.freeze
+      REQUEST_ID = 'http.request_id'.freeze
       STATUS_CODE = 'http.status_code'.freeze
       ERROR_RANGE = 500...600
     end

data/lib/ddtrace/patcher.rb

@@ -1,18 +1,40 @@
 module Datadog
   # Defines some useful patching methods for integrations
   module Patcher
-    module_function
+    def self.included(base)
+      base.send(:extend, CommonMethods)
+      base.send(:include, CommonMethods)
+    end
 
-    def without_warnings
-      # This is typically used when monkey patching functions such as
-      # intialize, which Ruby advices you not to. Use cautiously.
-      v = $VERBOSE
-      $VERBOSE = nil
-      begin
-        yield
-      ensure
-        $VERBOSE = v
+    # Defines some common methods for patching, that can be used
+    # at the instance, class, or module level.
+    module CommonMethods
+      def without_warnings
+        # This is typically used when monkey patching functions such as
+        # intialize, which Ruby advices you not to. Use cautiously.
+        v = $VERBOSE
+        $VERBOSE = nil
+        begin
+          yield
+        ensure
+          $VERBOSE = v
+        end
+      end
+
+      def do_once(key = nil)
+        # If already done, don't do again
+        @done_once ||= {}
+        return @done_once[key] if @done_once.key?(key)
+
+        # Otherwise 'do'
+        yield.tap do
+          # Then add the key so we don't do again.
+          @done_once[key] = true
+        end
       end
     end
+
+    # Extend the common methods so they're available as a module function.
+    extend(CommonMethods)
   end
 end

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 11
-    PATCH = 2
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.3
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -222,6 +222,7 @@ files:
 - ".rubocop.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md