ddtrace 0.26.0 → 0.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afb28eea48bf86f3cac41970e8b600e2f6daed82
-  data.tar.gz: 1a712a917211717bb409754fcffda978f7146522
+  metadata.gz: e58205299222f3c3a75a0a032ad3cca7c739fc68
+  data.tar.gz: 41e87bd0031a447ce9267c24bd1df4c7bc2598fd
 SHA512:
-  metadata.gz: be061d7e43faaafb0f1f3b45d78e556eda4bdacca67d8ac471f0588066152d84f53a4e88143dcfca4b1ea58cb4be1e74f3a75f143196a345966b8099704bf329
-  data.tar.gz: 7b805cd9b5a623f7100f0572ab281e999e1f3e18879a0b3ddb951d30572023058d6465fd78e4d67b4011c5ec84af6a668992232217ea60ba1ac9d513cf3c40f8
+  metadata.gz: 7b81c99d62190ba829ebca7671493dbb6a187eaf5ef8ddeaf6a6dcf1fc32f543d2acde719208e6aba0bd65f1a2690dc16b043f5649da0e16cccf7974907a7d7e
+  data.tar.gz: 28c7fa70a10769ed61a23bb60d1a474b939d1e3308225174110cf39fdc856ffa7745c17e9f0b1ef66f95852171ac7293138b9c6261bb75892ed5d9649552902d

data/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 ## [Unreleased (beta)]
 
+## [0.26.1] - 2019-11-26
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.26.1
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.26.1
+
+### Fixed
+
+- Priority sampling not activating by default (#868)
+
 ## [0.26.0] - 2019-08-06
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.26.0
@@ -904,6 +914,7 @@ 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.26.0...master
 [Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...0.27-dev
+[0.26.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.26.0...v0.26.1
 [0.26.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.1...v0.26.0
 [0.25.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.25.0...v0.25.1
 [0.25.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.24.0...v0.25.0

data/lib/ddtrace/sampler.rb

@@ -64,56 +64,110 @@ module Datadog
     end
   end
 
-  # \RateByServiceSampler samples different services at different rates
-  class RateByServiceSampler < Sampler
-    DEFAULT_KEY = 'service:,env:'.freeze
+  # Samples at different rates by key.
+  class RateByKeySampler < Sampler
+    attr_reader \
+      :default_key
+
+    def initialize(default_key, default_rate = 1.0, &block)
+      raise ArgumentError, 'No resolver given!' unless block_given?
 
-    def initialize(rate = 1.0, opts = {})
-      @env = opts.fetch(:env, Datadog.tracer.tags[:env])
+      @default_key = default_key
+      @resolver = block
       @mutex = Mutex.new
-      @fallback = RateSampler.new(rate)
-      @sampler = { DEFAULT_KEY => @fallback }
+      @samplers = {}
+
+      set_rate(default_key, default_rate)
+    end
+
+    def resolve(span)
+      @resolver.call(span)
+    end
+
+    def default_sampler
+      @samplers[default_key]
     end
 
     def sample?(span)
-      key = key_for(span)
+      key = resolve(span)
 
       @mutex.synchronize do
-        @sampler.fetch(key, @fallback).sample?(span)
+        @samplers.fetch(key, default_sampler).sample?(span)
       end
     end
 
     def sample!(span)
-      key = key_for(span)
+      key = resolve(span)
 
       @mutex.synchronize do
-        @sampler.fetch(key, @fallback).sample!(span)
+        @samplers.fetch(key, default_sampler).sample!(span)
       end
     end
 
     def sample_rate(span)
-      key = key_for(span)
+      key = resolve(span)
 
       @mutex.synchronize do
-        @sampler.fetch(key, @fallback).sample_rate
+        @samplers.fetch(key, default_sampler).sample_rate
       end
     end
 
-    def update(rate_by_service)
+    def update(key, rate)
       @mutex.synchronize do
-        @sampler.delete_if { |key, _| key != DEFAULT_KEY && !rate_by_service.key?(key) }
+        set_rate(key, rate)
+      end
+    end
 
-        rate_by_service.each do |key, rate|
-          @sampler[key] ||= RateSampler.new(rate)
-          @sampler[key].sample_rate = rate
-        end
+    def update_all(rate_by_key)
+      @mutex.synchronize do
+        rate_by_key.each { |key, rate| set_rate(key, rate) }
+      end
+    end
+
+    def delete(key)
+      @mutex.synchronize do
+        @samplers.delete(key)
+      end
+    end
+
+    def delete_if(&block)
+      @mutex.synchronize do
+        @samplers.delete_if(&block)
       end
     end
 
     private
 
+    def set_rate(key, rate)
+      @samplers[key] ||= RateSampler.new(rate)
+      @samplers[key].sample_rate = rate
+    end
+  end
+
+  # \RateByServiceSampler samples different services at different rates
+  class RateByServiceSampler < RateByKeySampler
+    DEFAULT_KEY = 'service:,env:'.freeze
+
+    def initialize(default_rate = 1.0, options = {})
+      super(DEFAULT_KEY, default_rate, &method(:key_for))
+      @env = options[:env]
+    end
+
+    def update(rate_by_service)
+      # Remove any old services
+      delete_if { |key, _| key != DEFAULT_KEY && !rate_by_service.key?(key) }
+
+      # Update each service rate
+      update_all(rate_by_service)
+    end
+
+    private
+
     def key_for(span)
-      "service:#{span.service},env:#{@env}"
+      # Resolve env dynamically, if Proc is given.
+      env = @env.is_a?(Proc) ? @env.call : @env
+
+      "service:#{span.service},env:#{env}"
     end
   end
 

data/lib/ddtrace/tracer.rb

@@ -120,6 +120,9 @@ module Datadog
 
       @mutex = Mutex.new
       @tags = {}
+
+      # Enable priority sampling by default
+      activate_priority_sampling!(@sampler)
     end
 
     # Updates the current \Tracer instance, so that the tracer can be configured after the
@@ -441,7 +444,10 @@ module Datadog
       @sampler = if base_sampler.is_a?(PrioritySampler)
                    base_sampler
                  else
-                   PrioritySampler.new(base_sampler: base_sampler)
+                   PrioritySampler.new(
+                     base_sampler: base_sampler,
+                     post_sampler: Datadog::RateByServiceSampler.new(1.0, env: proc { tags[:env] })
+                   )
                  end
     end
 

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@ module Datadog
   module VERSION
     MAJOR = 0
     MINOR = 26
-    PATCH = 0
+    PATCH = 1
     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.26.0
+  version: 0.26.1
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack