ddtrace 0.17.1 → 0.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0243b521350de03538134c3513aedc7a0c23b8e8
-  data.tar.gz: addea843c61b11542c59d6577993c9a3d1dab233
+SHA256:
+  metadata.gz: 6b98c7693f06abe337bbc38c713ea7115a3964e584d8508670b65d43811235aa
+  data.tar.gz: 147c7f9e7225927b9bc7f6dd8c4aff8134d2eb2a28f7aab063ad3ba369139217
 SHA512:
-  metadata.gz: 755acb13506d77ecf0edc29d5fb9bc28c929251bdfbbf06a90fc54c80a9aec34285a0fa4799efa580a36d10b8aabbc2d577b3262d899d350fcb2f1370d060f63
-  data.tar.gz: 46d9d93281db786b614b41d0eab804655dea4770d2d555895914097ce20d4efb6af00af4c174c3fc7f080c66b4286dc9e2444d235b45ac57c8a720c075d6eb9b
+  metadata.gz: 310e51596c88f0bdccaef1851dace5302fe93fb11ccd0bb8eaddbdeb817e775ac9267ebb10cee73fe34b4a7686742201a7105da4c8313b9714724e3ad6fec67b
+  data.tar.gz: 335c7994b68a6b498add3f6bc9cc7dd64840f14337fa7c304264fda84aa74c78e0b45b2cb6f34f75550c38d887f23913df39a9ee047741216d207d7ef9ff2e1c

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased (beta)]
 
+## [0.17.2] - 2018-11-23
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.17.2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.17.1...v0.17.2
+
+### Fixed
+
+- Resque integration shutting down tracer when forking is disabled (#637)
+
 ## [0.17.1] - 2018-11-07
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.17.1

data/lib/ddtrace/contrib/resque/resque_job.rb

@@ -8,7 +8,7 @@ module Datadog
     module Resque
       # Uses Resque job hooks to create traces
       module ResqueJob
-        def around_perform(*args)
+        def around_perform(*_)
           pin = Pin.get_from(::Resque)
           return yield unless pin && pin.tracer
           pin.tracer.trace(Ext::SPAN_JOB, service: pin.service) do |span|
@@ -17,8 +17,19 @@ module Datadog
             yield
             span.service = pin.service
           end
-        ensure
-          pin.tracer.shutdown! if pin && pin.tracer
+        end
+
+        def after_perform_shutdown_tracer(*_)
+          shutdown_tracer_when_forked!
+        end
+
+        def on_failure_shutdown_tracer(*_)
+          shutdown_tracer_when_forked!
+        end
+
+        def shutdown_tracer_when_forked!
+          pin = Datadog::Pin.get_from(Resque)
+          pin.tracer.shutdown! if pin && pin.tracer && pin.config && pin.config[:forked]
         end
       end
     end
@@ -29,6 +40,9 @@ Resque.after_fork do
   # get the current tracer
   pin = Datadog::Pin.get_from(Resque)
   next unless pin && pin.tracer
+  pin.config ||= {}
+  pin.config[:forked] = true
+
   # clean the state so no CoW happens
   pin.tracer.provider.context = nil
 end

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 17
-    PATCH = 1
+    PATCH = 2
     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.1
+  version: 0.17.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-23 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.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications