ddtrace 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 583094c453fd00bbe1415cbda7ca72c14e455c71
-  data.tar.gz: 52c5f11dc8eda8f027f4a7b0837a6b112939db31
+  metadata.gz: 690c74d7e00a2fabf4ad03e30b0b40656c8337e9
+  data.tar.gz: dc9f24349943d09fd472b0e5cb9c3b1cff1685ca
 SHA512:
-  metadata.gz: 33d2fb397612dd3e61e36306b55d10c3eb6d8700a36874ae99b09657ab2f701195faf257896b219a7d7f8b3a2baee8612aa1f15f88778b16687f07dfb04296dc
-  data.tar.gz: 7a2adbd4fb324bd2ce46b584bacaf21437defc36f893f5c285e1c94f3cc3f6d0c67317ed42b44a87fe0e762966c54b8e55cf52a133c6fd5cde57964daa6376f3
+  metadata.gz: e996f0517f9be72b1b81d36eeedf099f997e66b0d00da4ad4cd93e169a93b6dbcb7e5a8b7df466b11b6487a82236ecfb9c997c908b1337a336c34e07ac78a7be
+  data.tar.gz: 6973e5ff265f3660a19836dd7b02fba398583429c5364e4140cf3231341b855c06596ef33a2a92376f70ead4545326f591a1275ff342f0aba043c1f9ef9dbe46

data/CHANGELOG.md

@@ -4,6 +4,18 @@
 
 ## [Unreleased (beta)]
 
+## [0.18.3] - 2019-01-17
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.3
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.18.2...v0.18.3
+
+### Fixed
+
+- Mongo `NoMethodError` when no span available during `#failed`. (#674, #675) (@Azure7111)
+- Rack deprecation warnings firing with some 3rd party libraries present. (#672)
+- Shoryuken resource name when used with ActiveJob. (#671) (@aurelian)
+
 ## [0.18.2] - 2019-01-03
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.18.2
@@ -615,9 +627,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.18.2...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.2...0.19-dev
-[0.18.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...v0.18.2
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.3...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.3...0.19-dev
+[0.18.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.2...v0.18.3
+[0.18.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.1...v0.18.2
 [0.18.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.18.0...v0.18.1
 [0.18.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.3...v0.18.0
 [0.17.3]: https://github.com/DataDog/dd-trace-rb/compare/v0.17.2...v0.17.3

data/lib/ddtrace/contrib/mongodb/subscribers.rb

@@ -17,8 +17,7 @@ module Datadog
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring.rb#L70
           # https://github.com/mongodb/mongo-ruby-driver/blob/master/lib/mongo/monitoring/publishable.rb#L38-L56
           span = pin.tracer.trace(Ext::SPAN_COMMAND, service: pin.service, span_type: Ext::SPAN_TYPE_COMMAND)
-          Thread.current[:datadog_mongo_span] ||= {}
-          Thread.current[:datadog_mongo_span][event.request_id] = span
+          set_span(event, span)
 
           # build a quantized Query using the Parser module
           query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
@@ -38,7 +37,7 @@ module Datadog
         end
 
         def failed(event)
-          span = Thread.current[:datadog_mongo_span][event.request_id]
+          span = get_span(event)
           return unless span
 
           # the failure is not a real exception because it's handled by
@@ -50,11 +49,11 @@ module Datadog
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak
           span.finish unless span.nil?
-          Thread.current[:datadog_mongo_span].delete(event.request_id)
+          clear_span(event)
         end
 
         def succeeded(event)
-          span = Thread.current[:datadog_mongo_span][event.request_id]
+          span = get_span(event)
           return unless span
 
           # add fields that are available only after executing the query
@@ -66,6 +65,23 @@ module Datadog
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak
           span.finish unless span.nil?
+          clear_span(event)
+        end
+
+        private
+
+        def get_span(event)
+          Thread.current[:datadog_mongo_span] \
+            && Thread.current[:datadog_mongo_span][event.request_id]
+        end
+
+        def set_span(event, span)
+          Thread.current[:datadog_mongo_span] ||= {}
+          Thread.current[:datadog_mongo_span][event.request_id] = span
+        end
+
+        def clear_span(event)
+          return if Thread.current[:datadog_mongo_span].nil?
           Thread.current[:datadog_mongo_span].delete(event.request_id)
         end
       end

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

@@ -62,12 +62,16 @@ module Datadog
           request_span = tracer.trace(Ext::SPAN_REQUEST, trace_options)
           env[RACK_REQUEST_SPAN] = request_span
 
-          # Add deprecation warnings
-          add_deprecation_warnings(env)
-          env.without_datadog_warnings do
-            # TODO: For backwards compatibility; this attribute is deprecated.
-            env[:datadog_rack_request_span] = env[RACK_REQUEST_SPAN]
-          end
+          # TODO: Add deprecation warnings back in
+          # DEV: Some third party Gems will loop over the rack env causing our deprecation
+          #      warnings to be shown even when the user is not accessing them directly
+          #
+          # add_deprecation_warnings(env)
+          # env.without_datadog_warnings do
+          #   # TODO: For backwards compatibility; this attribute is deprecated.
+          #   env[:datadog_rack_request_span] = env[RACK_REQUEST_SPAN]
+          # end
+          env[:datadog_rack_request_span] = env[RACK_REQUEST_SPAN]
 
           # Copy the original env, before the rest of the stack executes.
           # Values may change; we want values before that happens.

data/lib/ddtrace/contrib/shoryuken/tracer.rb

@@ -11,7 +11,7 @@ module Datadog
 
         def call(worker_instance, queue, sqs_msg, body)
           @tracer.trace(Ext::SPAN_JOB, service: @shoryuken_service, span_type: Datadog::Ext::AppTypes::WORKER) do |span|
-            span.resource = worker_instance.class.name
+            span.resource = resource(worker_instance, body)
             span.set_tag(Ext::TAG_JOB_ID, sqs_msg.message_id)
             span.set_tag(Ext::TAG_JOB_QUEUE, queue)
             span.set_tag(Ext::TAG_JOB_ATTRIBUTES, sqs_msg.attributes) if sqs_msg.respond_to?(:attributes)
@@ -23,6 +23,14 @@ module Datadog
 
         private
 
+        def resource(worker_instance, body)
+          # If it's a Hash, try to get the job class from it.
+          # This is for ActiveJob compatibility.
+          job_class = body['job_class'] if body.is_a?(Hash)
+          # If nothing is available, use the worker class name.
+          job_class || worker_instance.class.name
+        end
+
         def set_service_info(service)
           return if @tracer.services[service]
           @tracer.set_service_info(

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 18
-    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.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack