ddtrace 0.14.0.beta1 → 0.14.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92f58d3f94ff927d412151da041ce48c3c808c3aa8b4c7a2f320c2206daad363
-  data.tar.gz: f0f9308f6e1eaba46afc42f7237faea5587cd4d4071410547d798c79f8988602
+  metadata.gz: 22136c7de76c04edc8e73f76d84eece381a9a9f8a62a4b1a320978c75038a4c3
+  data.tar.gz: 50bbe8adea037b572e177a0a7813baa74c4c0735f36ad0f4f14f4b9c78c7a35c
 SHA512:
-  metadata.gz: 06d6974ee82c2e0f1c72edbb86b0ba03a6fefe4d383b704f93ff2d2f9416bab39b520a4a9cd8458c2977be878b32d69743ae77c4170583d1a2615d1aaca070a3
-  data.tar.gz: d54d30913137f1892adb625faaa39b4c1c49b4f70c7d1750a477df3e532a34559e4731a27a7faadfad7a50793584862bde3acf801e2ab059533bf2a6b17af468
+  metadata.gz: '0358db43f6e2f66ebc77b46b4a8e4e1a2721ba23fc96c5b55c05eea1c05a92f6b14a01fb080133f70d7ae1b806c9ffd9c7feb7b39a90838a63511591b5e2d9c2'
+  data.tar.gz: 96f741fa4c727858d0d82e2f52c058639243c17cda0460fc3e5614571578a4c896d4e11134626a7d8fa41f98e1481e2a3ab6a934acf5390ad716d588c87003ab

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased (beta)]
 
+## [0.14.0.beta2] - 2018-07-25
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0.beta2
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.14.0.beta1...v0.14.0.beta2
+
+### Fixed
+
+- Rake shutdown tracer after execution (#487) @kissrobber
+
 ## [0.14.0.beta1] - 2018-07-24
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.14.0.beta1

data/lib/ddtrace/contrib/rake/instrumentation.rb

@@ -15,23 +15,31 @@ module Datadog
           def invoke(*args)
             return super unless enabled?
 
-            tracer.trace(SPAN_NAME_INVOKE) do |span|
+            tracer.trace(SPAN_NAME_INVOKE, span_options) do |span|
               super
               annotate_invoke!(span, args)
             end
+          ensure
+            shutdown_tracer!
           end
 
           def execute(args = nil)
             return super unless enabled?
 
-            tracer.trace(SPAN_NAME_EXECUTE) do |span|
+            tracer.trace(SPAN_NAME_EXECUTE, span_options) do |span|
               super
               annotate_execute!(span, args)
             end
+          ensure
+            shutdown_tracer!
           end
 
           private
 
+          def shutdown_tracer!
+            tracer.shutdown! if tracer.active_span.nil? && ::Rake.application.top_level_tasks.include?(name)
+          end
+
           def annotate_invoke!(span, args)
             span.resource = name
             span.set_tag('rake.task.arg_names', arg_names)
@@ -48,7 +56,7 @@ module Datadog
           end
 
           def quantize_args(args)
-            quantize_options = Datadog.configuration[:rake][:quantize][:args]
+            quantize_options = configuration[:quantize][:args]
             Datadog::Quantization::Hash.format(args, quantize_options)
           end
 
@@ -60,6 +68,10 @@ module Datadog
             configuration[:tracer]
           end
 
+          def span_options
+            { service: configuration[:service_name] }
+          end
+
           def configuration
             Datadog.configuration[:rake]
           end

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@ module Datadog
     MAJOR = 0
     MINOR = 14
     PATCH = 0
-    PRE = 'beta1'.freeze
+    PRE = 'beta2'.freeze
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.14.0.beta1
+  version: 0.14.0.beta2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-24 00:00:00.000000000 Z
+date: 2018-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack