ddtrace 0.9.2 → 0.10.0

data/lib/ddtrace/version.rb

@@ -1,8 +1,8 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 9
-    PATCH = 2
+    MINOR = 10
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/ddtrace/workers.rb

@@ -12,8 +12,9 @@ module Datadog
       DEFAULT_TIMEOUT = 5
       BACK_OFF_RATIO = 1.2
       BACK_OFF_MAX = 5
+      SHUTDOWN_TIMEOUT = 1
 
-      attr_reader :trace_buffer, :service_buffer, :shutting_down
+      attr_reader :trace_buffer, :service_buffer
 
       def initialize(transport, buff_size, trace_task, service_task, interval)
         @trace_task = trace_task
@@ -23,7 +24,8 @@ module Datadog
         @trace_buffer = TraceBuffer.new(buff_size)
         @service_buffer = TraceBuffer.new(buff_size)
         @transport = transport
-        @shutting_down = false
+        @shutdown = ConditionVariable.new
+        @mutex = Mutex.new
 
         @worker = nil
         @run = false
@@ -62,47 +64,32 @@ module Datadog
 
       # Start the timer execution.
       def start
-        return if @run
-        @run = true
-        @worker = Thread.new() do
-          Datadog::Tracer.log.debug("Starting thread in the process: #{Process.pid}")
-
-          while @run
-            @back_off = callback_traces ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
-
-            callback_services
-
-            sleep(@back_off) if @run
-          end
+        @mutex.synchronize do
+          return if @run
+          @run = true
+          Tracer.log.debug("Starting thread in the process: #{Process.pid}")
+          @worker = Thread.new { perform }
         end
       end
 
-      # Stop the timer execution. Tasks already in the queue will be executed.
+      # Closes all available queues and waits for the trace and service buffer to flush
       def stop
-        @run = false
-      end
+        @mutex.synchronize do
+          return unless @run
 
-      # Closes all available queues and waits for the trace and service buffer to flush
-      def shutdown!
-        return false if @shutting_down
-        @shutting_down = true
-        @trace_buffer.close
-        @service_buffer.close
-        sleep(0.1)
-        timeout_time = Time.now + DEFAULT_TIMEOUT
-        while (!@trace_buffer.empty? || !@service_buffer.empty?) && Time.now <= timeout_time
-          sleep(0.05)
-          Datadog::Tracer.log.debug('Waiting for the buffers to clear before exiting')
+          @trace_buffer.close
+          @service_buffer.close
+          @run = false
+          @shutdown.signal
         end
-        stop
+
         join
-        @shutting_down = false
         true
       end
 
       # Block until executor shutdown is complete or until timeout seconds have passed.
       def join
-        @worker.join(5)
+        @worker.join(SHUTDOWN_TIMEOUT)
       end
 
       # Enqueue an item in the trace internal buffer. This operation is thread-safe
@@ -116,6 +103,21 @@ module Datadog
         return if service == {} # no use to send this, not worth it
         @service_buffer.push(service)
       end
+
+      private
+
+      def perform
+        loop do
+          @back_off = callback_traces ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
+
+          callback_services
+
+          @mutex.synchronize do
+            return if !@run && @trace_buffer.empty? && @service_buffer.empty?
+            @shutdown.wait(@mutex, @back_off)
+          end
+        end
+      end
     end
   end
 end

data/lib/ddtrace/writer.rb

@@ -14,9 +14,20 @@ module Datadog
       # writer and transport parameters
       @buff_size = options.fetch(:buffer_size, 100)
       @flush_interval = options.fetch(:flush_interval, 1)
+      transport_options = options.fetch(:transport_options, {})
+
+      # priority sampling
+      if options[:priority_sampler]
+        @priority_sampler = options[:priority_sampler]
+        transport_options[:api_version] ||= HTTPTransport::V4
+        transport_options[:response_callback] ||= method(:sampling_updater)
+      end
 
       # transport and buffers
-      @transport = options.fetch(:transport, Datadog::HTTPTransport.new(HOSTNAME, PORT))
+      @transport = options.fetch(:transport) do
+        HTTPTransport.new(HOSTNAME, PORT, transport_options)
+      end
+
       @services = {}
 
       # handles the thread creation after an eventual fork
@@ -103,5 +114,13 @@ module Datadog
         transport: @transport.stats
       }
     end
+
+    private
+
+    def sampling_updater(response)
+      return unless response.is_a?(Net::HTTPOK)
+      service_rates = JSON.parse(response.body)
+      @priority_sampler.update(service_rates)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -149,12 +177,17 @@ files:
 - gemfiles/rails5_postgres_sidekiq.gemfile
 - lib/ddtrace.rb
 - lib/ddtrace/buffer.rb
+- lib/ddtrace/configurable.rb
+- lib/ddtrace/configuration.rb
+- lib/ddtrace/configuration/proxy.rb
+- lib/ddtrace/configuration/resolver.rb
 - lib/ddtrace/context.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
 - lib/ddtrace/contrib/aws/instrumentation.rb
 - lib/ddtrace/contrib/aws/parsed_context.rb
 - lib/ddtrace/contrib/aws/patcher.rb
 - lib/ddtrace/contrib/aws/services.rb
+- lib/ddtrace/contrib/base.rb
 - lib/ddtrace/contrib/dalli/instrumentation.rb
 - lib/ddtrace/contrib/dalli/patcher.rb
 - lib/ddtrace/contrib/dalli/quantize.rb
@@ -176,6 +209,8 @@ files:
 - lib/ddtrace/contrib/rails/core_extensions.rb
 - lib/ddtrace/contrib/rails/framework.rb
 - lib/ddtrace/contrib/rails/middlewares.rb
+- lib/ddtrace/contrib/rails/patcher.rb
+- lib/ddtrace/contrib/rails/railtie.rb
 - lib/ddtrace/contrib/rails/utils.rb
 - lib/ddtrace/contrib/redis/patcher.rb
 - lib/ddtrace/contrib/redis/quantize.rb
@@ -187,7 +222,6 @@ files:
 - lib/ddtrace/contrib/sucker_punch/exception_handler.rb
 - lib/ddtrace/contrib/sucker_punch/instrumentation.rb
 - lib/ddtrace/contrib/sucker_punch/patcher.rb
-- lib/ddtrace/distributed.rb
 - lib/ddtrace/encoding.rb
 - lib/ddtrace/error.rb
 - lib/ddtrace/ext/app_types.rb
@@ -205,9 +239,14 @@ files:
 - lib/ddtrace/pipeline.rb
 - lib/ddtrace/pipeline/span_filter.rb
 - lib/ddtrace/pipeline/span_processor.rb
+- lib/ddtrace/propagation/distributed_headers.rb
+- lib/ddtrace/propagation/http_propagator.rb
 - lib/ddtrace/provider.rb
+- lib/ddtrace/registry.rb
+- lib/ddtrace/registry/registerable.rb
 - lib/ddtrace/sampler.rb
 - lib/ddtrace/span.rb
+- lib/ddtrace/sync_writer.rb
 - lib/ddtrace/tracer.rb
 - lib/ddtrace/transport.rb
 - lib/ddtrace/utils.rb

data/lib/ddtrace/distributed.rb

@@ -1,38 +0,0 @@
-require 'ddtrace/span'
-
-module Datadog
-  # Common code related to distributed tracing.
-  module Distributed
-    module_function
-
-    # Parses a trace_id and a parent_id, typically sent as headers in
-    # a distributed tracing context, and returns a couple of trace_id,parent_id
-    # which are garanteed to be both non-zero. This does not 100% ensure they
-    # are valid (after all, the caller could mess up data) but at least it
-    # sorts out most common errors, such as syntax, nil values, etc.
-    # Both headers must be set, else nil values are returned, for both.
-    # Reports problem on debug log.
-    def parse_trace_headers(trace_id_header, parent_id_header)
-      return nil, nil if trace_id_header.nil? || parent_id_header.nil?
-      trace_id = trace_id_header.to_i
-      parent_id = parent_id_header.to_i
-      if trace_id.zero?
-        Datadog::Tracer.log.debug("invalid trace_id header: #{trace_id_header}")
-        return nil, nil
-      end
-      if parent_id.zero?
-        Datadog::Tracer.log.debug("invalid parent_id header: #{parent_id_header}")
-        return nil, nil
-      end
-      if trace_id < 0 || trace_id >= Datadog::Span::MAX_ID
-        Datadog::Tracer.log.debug("trace_id out of range: #{trace_id_header}")
-        return nil, nil
-      end
-      if parent_id < 0 || parent_id >= Datadog::Span::MAX_ID
-        Datadog::Tracer.log.debug("parent_id out of range: #{parent_id_header}")
-        return nil, nil
-      end
-      [trace_id, parent_id]
-    end
-  end
-end