ddtrace 0.17.2 → 0.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6b98c7693f06abe337bbc38c713ea7115a3964e584d8508670b65d43811235aa
-  data.tar.gz: 147c7f9e7225927b9bc7f6dd8c4aff8134d2eb2a28f7aab063ad3ba369139217
+SHA1:
+  metadata.gz: da8890d2a4acda28dea666623f0b497fceedea7c
+  data.tar.gz: 4bda7e12410130c575411289d8400ad281099b5d
 SHA512:
-  metadata.gz: 310e51596c88f0bdccaef1851dace5302fe93fb11ccd0bb8eaddbdeb817e775ac9267ebb10cee73fe34b4a7686742201a7105da4c8313b9714724e3ad6fec67b
-  data.tar.gz: 335c7994b68a6b498add3f6bc9cc7dd64840f14337fa7c304264fda84aa74c78e0b45b2cb6f34f75550c38d887f23913df39a9ee047741216d207d7ef9ff2e1c
+  metadata.gz: f6ef938aedbe689cded02861e70a5a791ddff979c6ae78bc1bfbfb74d095592f17f0125ede4a06f76a2549d18afc9ab43d6fcf9a2ee6da24d4de0b9acdb6e97f
+  data.tar.gz: b41dcf5846930f2edbfd0fd8a5accf52c5d282569a4bc083924d56336d598c246fad8d5d12223ff8417ccec7dfbecaf8bd50dec53f1d4bc4caed9df8a26f7055

data/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ## [Unreleased (beta)]
 
+## [0.17.3] - 2018-11-29
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.17.3
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.17.2...v0.17.3
+
+### Fixed
+
+- Bad resource names for Grape::API objects in Grape 1.2.0 (#639)
+- RestClient raising NoMethodError when response is `nil` (#636, #642) (@frsantos)
+- Rack middleware inserted twice in some Rails applications (#641)
+
 ## [0.17.2] - 2018-11-23
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.17.2
@@ -564,8 +576,10 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
-[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.1...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.1...0.18-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.3...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.3...0.18-dev
+[0.17.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.2...v0.17.3
+[0.17.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.1...v0.17.2
 [0.17.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.0...v0.17.1
 [0.17.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.1...v0.17.0
 [0.16.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.16.0...v0.16.1

data/lib/ddtrace/contrib/grape/endpoint.rb

@@ -63,7 +63,16 @@ module Datadog
 
           begin
             # collect endpoint details
-            api_view = payload[:endpoint].options[:for].to_s
+            api = payload[:endpoint].options[:for]
+            # If the API inherits from Grape::API in version >= 1.2.0
+            # then the API will be an instance and the name must be derived from the base.
+            # See https://github.com/ruby-grape/grape/issues/1825
+            api_view = if defined?(::Grape::API::Instance) && api <= ::Grape::API::Instance
+                         api.base.to_s
+                       else
+                         api.to_s
+                       end
+
             path = payload[:endpoint].options[:path].join('/')
             resource = "#{api_view}##{path}"
             span.resource = resource
@@ -78,7 +87,7 @@ module Datadog
             span.set_error(payload[:exception_object]) unless payload[:exception_object].nil?
 
             # override the current span with this notification values
-            span.set_tag(Ext::TAG_ROUTE_ENDPOINT, api_view)
+            span.set_tag(Ext::TAG_ROUTE_ENDPOINT, api_view) unless api_view.nil?
             span.set_tag(Ext::TAG_ROUTE_PATH, path)
           ensure
             span.start_time = start

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

@@ -32,10 +32,12 @@ module Datadog
         end
 
         def before_intialize(app)
-          # Middleware must be added before the application is initialized.
-          # Otherwise the middleware stack will be frozen.
-          # Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
-          add_middleware(app) if Datadog.configuration[:rails][:middleware]
+          do_once(:rails_before_initialize, for: app) do
+            # Middleware must be added before the application is initialized.
+            # Otherwise the middleware stack will be frozen.
+            # Sometimes we don't want to activate middleware e.g. OpenTracing, etc.
+            add_middleware(app) if Datadog.configuration[:rails][:middleware]
+          end
         end
 
         def add_middleware(app)
@@ -59,10 +61,12 @@ module Datadog
         end
 
         def after_intialize(app)
-          # Finish configuring the tracer after the application is initialized.
-          # We need to wait for some things, like application name, middleware stack, etc.
-          setup_tracer
-          instrument_rails
+          do_once(:rails_after_initialize, for: app) do
+            # Finish configuring the tracer after the application is initialized.
+            # We need to wait for some things, like application name, middleware stack, etc.
+            setup_tracer
+            instrument_rails
+          end
         end
 
         # Configure Rails tracing with settings

data/lib/ddtrace/contrib/rest_client/request_patch.rb

@@ -60,10 +60,13 @@ module Datadog
 
             datadog_tag_request(uri, span)
 
-            response = yield(span)
-
-            span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.code)
-            response
+            yield(span).tap do |response|
+              # Verify return value is a response
+              # If so, add additional tags.
+              if response.is_a?(::RestClient::Response)
+                span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.code)
+              end
+            end
           rescue ::RestClient::ExceptionWithResponse => e
             span.set_error(e) if Datadog::Ext::HTTP::ERROR_RANGE.cover?(e.http_code)
             span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, e.http_code)

data/lib/ddtrace/patcher.rb

@@ -21,21 +21,23 @@ module Datadog
         end
       end
 
-      def do_once(key = nil)
+      def do_once(key = nil, options = {})
         # If already done, don't do again
-        @done_once ||= {}
-        return @done_once[key] if @done_once.key?(key)
+        @done_once ||= Hash.new { |h, k| h[k] = {} }
+        if @done_once.key?(key) && @done_once[key].key?(options[:for])
+          return @done_once[key][options[:for]]
+        end
 
         # Otherwise 'do'
         yield.tap do
           # Then add the key so we don't do again.
-          @done_once[key] = true
+          @done_once[key][options[:for]] = true
         end
       end
 
-      def done?(key)
+      def done?(key, options = {})
         return false unless instance_variable_defined?(:@done_once)
-        !@done_once.nil? && @done_once.key?(key)
+        !@done_once.nil? && @done_once.key?(key) && @done_once[key].key?(options[:for])
       end
     end
 

data/lib/ddtrace/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.17.2
+  version: 0.17.3
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -544,7 +544,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications