ddtrace 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca30d1de4944896da5082d6e5479437c7ec76ae8
-  data.tar.gz: 1a9d2c6922699e01f6364039d5ff39530c7fb6fd
+  metadata.gz: 65dcbe210bf9b8f1824d9636e81c454feb1a606a
+  data.tar.gz: 846f031c64443dc6e2fe93572ef96f488dcafc8d
 SHA512:
-  metadata.gz: '01378c87cbd74c47525e7b5eed4fa161305b3f7c1a0da54e6c105074806b5c32af84b27d69e7251ba39cc5d7040f4335f3eb878e30bd3a2f6cf08d317f75c4e8'
-  data.tar.gz: e08463b5ad5f4a67af403558bcb5a51fe9a7a4451804037ac5db6203280cb263dde1e02d78c9fc4973e12a07aa44f6334b6b79f337bc34c7fc5d8eb0118b0182
+  metadata.gz: 1cd1b941a9b4e9d7c75b4212e1fe18a91afa0533446ab6363cee88da063e38a24199a6d33b6ede30eae3ea53f7eb890d60a9b51723274b4581edb15062e1d2df
+  data.tar.gz: 5a66c125f2985a3edf2938b5fc32b7c8e4cfb787a2ffde5a2a18b01d6c22500a0ec51a3f195ff4fe0bb68dba8d98dd94f518d8cade3e8551ed7508a42ba346d6

data/CHANGELOG.md

@@ -4,6 +4,25 @@
 
 ## [Unreleased (beta)]
 
+## [0.23.0] - 2019-04-30
+
+Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.23.0
+
+Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.22.0...v0.23.0
+
+### Added
+
+- Error status support via tags for OpenTracing (#739)
+- Forced sampling support via tags (#720)
+
+### Fixed
+
+- Wrong return values for Rake integration (#742) (@Redapted)
+
+### Removed
+
+- Obsolete service telemetry (#738)
+
 ## [0.22.0] - 2019-04-15
 
 Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.22.0
@@ -767,8 +786,9 @@ 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.22.0...master
-[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.22.0...0.23-dev
+[Unreleased (stable)]: https://github.com/DataDog/dd-trace-rb/compare/v0.23.0...master
+[Unreleased (beta)]: https://github.com/DataDog/dd-trace-rb/compare/v0.23.0...0.24-dev
+[0.23.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.22.0...v0.23.0
 [0.22.0]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.2...v0.22.0
 [0.21.2]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.1...v0.21.2
 [0.21.1]: https://github.com/DataDog/dd-trace-rb/compare/v0.21.0...v0.21.1

data/lib/ddtrace/analytics.rb

@@ -29,7 +29,8 @@ module Datadog
         def self.included(base)
           base.class_eval do
             alias_method :set_tag_without_analytics, :set_tag
-            remove_method :set_tag
+            # DEV: When we stack multiple extensions the method might already be removed
+            remove_method :set_tag if method_defined?(:set_tag)
           end
         end
 

data/lib/ddtrace/contrib/active_model_serializers/patcher.rb

@@ -21,13 +21,6 @@ module Datadog
             begin
               # Subscribe to ActiveModelSerializers events
               Events.subscribe!
-
-              # Set service info
-              get_option(:tracer).set_service_info(
-                get_option(:service_name),
-                Ext::APP,
-                Datadog::Ext::AppTypes::WEB
-              )
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply ActiveModelSerializers integration: #{e}")
             end

data/lib/ddtrace/contrib/active_record/configuration/settings.rb

@@ -17,11 +17,9 @@ module Datadog
                   lazy: true
 
           option :orm_service_name
-          option :service_name, depends_on: [:tracer] do |value|
-            (value || Utils.adapter_name).tap do |service_name|
-              tracer.set_service_info(service_name, Ext::APP, Datadog::Ext::AppTypes::DB)
-            end
-          end
+          option :service_name,
+                 default: -> { Utils.adapter_name },
+                 lazy: true
 
           option :tracer, default: Datadog.tracer do |value|
             value.tap do

data/lib/ddtrace/contrib/dalli/patcher.rb

@@ -21,13 +21,6 @@ module Datadog
             begin
               add_pin!
               ::Dalli::Server.send(:include, Instrumentation)
-
-              # TODO: When Dalli pin is removed, set service info.
-              # get_option(:tracer).set_service_info(
-              #   get_option(:service_name),
-              #   Ext::APP,
-              #   Datadog::Ext::AppTypes::CACHE
-              # )
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Dalli integration: #{e}")
             end

data/lib/ddtrace/contrib/faraday/middleware.rb

@@ -82,8 +82,6 @@ module Datadog
 
         def setup_service!
           return if options[:service_name] == datadog_configuration[:service_name]
-
-          Patcher.register_service(options[:service_name])
         end
       end
     end

data/lib/ddtrace/contrib/faraday/patcher.rb

@@ -22,9 +22,6 @@ module Datadog
 
               add_pin!
               add_middleware!
-
-              # TODO: When Faraday pin is removed, set service info.
-              # register_service(get_option(:service_name))
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Faraday integration: #{e}")
             end
@@ -45,14 +42,6 @@ module Datadog
           ::Faraday::Middleware.register_middleware(ddtrace: Middleware)
         end
 
-        def register_service(name)
-          get_option(:tracer).set_service_info(
-            name,
-            Ext::APP,
-            Datadog::Ext::AppTypes::WEB
-          )
-        end
-
         def get_option(option)
           Datadog.configuration[:faraday].get_option(option)
         end

data/lib/ddtrace/contrib/grape/patcher.rb

@@ -26,13 +26,6 @@ module Datadog
 
               add_pin!
 
-              # TODO: When Grape pin is removed, set service info.
-              # get_option(:tracer).set_service_info(
-              #   get_option(:service_name),
-              #   Ext::APP,
-              #   Datadog::Ext::AppTypes::WEB
-              # )
-
               # Subscribe to ActiveSupport events
               Datadog::Contrib::Grape::Endpoint.subscribe
             rescue StandardError => e

data/lib/ddtrace/contrib/graphql/configuration/settings.rb

@@ -17,10 +17,7 @@ module Datadog
                   lazy: true
 
           option :schemas
-          option :service_name, default: Ext::SERVICE_NAME, depends_on: [:tracer] do |value|
-            get_option(:tracer).set_service_info(value, Ext::APP, Datadog::Ext::AppTypes::WEB)
-            value
-          end
+          option :service_name, default: Ext::SERVICE_NAME
         end
       end
     end

data/lib/ddtrace/contrib/grpc/patcher.rb

@@ -23,13 +23,6 @@ module Datadog
 
               add_pin!
 
-              # TODO: When GRPC pin is removed, set service info.
-              # get_option(:tracer).set_service_info(
-              #   get_option(:service_name),
-              #   Ext::APP,
-              #   Datadog::Ext::AppTypes::WEB
-              # )
-
               prepend_interceptor
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply gRPC integration: #{e}")

data/lib/ddtrace/contrib/racecar/patcher.rb

@@ -21,14 +21,6 @@ module Datadog
             begin
               # Subscribe to Racecar events
               Events.subscribe!
-
-              # Set service info
-              configuration = Datadog.configuration[:racecar]
-              configuration[:tracer].set_service_info(
-                configuration[:service_name],
-                Ext::APP,
-                Datadog::Ext::AppTypes::WORKER
-              )
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Racecar integration: #{e}")
             end

data/lib/ddtrace/contrib/rack/configuration/settings.rb

@@ -29,17 +29,9 @@ module Datadog
           option :quantize, default: {}
           option :request_queuing, default: false
 
-          option :service_name, default: Ext::SERVICE_NAME, depends_on: [:tracer] do |value|
-            get_option(:tracer).set_service_info(value, Ext::APP, Datadog::Ext::AppTypes::WEB)
-            value
-          end
+          option :service_name, default: Ext::SERVICE_NAME
 
-          option :web_service_name, default: Ext::WEBSERVER_SERVICE_NAME, depends_on: [:tracer, :request_queuing] do |value|
-            if get_option(:request_queuing)
-              get_option(:tracer).set_service_info(value, Ext::WEBSERVER_APP, Datadog::Ext::AppTypes::WEB)
-            end
-            value
-          end
+          option :web_service_name, default: Ext::WEBSERVER_SERVICE_NAME
         end
       end
     end

data/lib/ddtrace/contrib/rails/framework.rb

@@ -26,7 +26,6 @@ module Datadog
 
           activate_rack!(config)
           activate_active_record!(config)
-          set_service_info!(config)
 
           # By default, default service would be guessed from the script
           # being executed, but here we know better, get it from Rails config.
@@ -64,12 +63,6 @@ module Datadog
             tracer: config[:tracer]
           )
         end
-
-        def self.set_service_info!(config)
-          tracer = config[:tracer]
-          tracer.set_service_info(config[:controller_service], Ext::APP, Datadog::Ext::AppTypes::WEB)
-          tracer.set_service_info(config[:cache_service], Ext::APP, Datadog::Ext::AppTypes::CACHE)
-        end
       end
     end
   end

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

@@ -16,8 +16,7 @@ module Datadog
             return super unless enabled?
 
             tracer.trace(Ext::SPAN_INVOKE, span_options) do |span|
-              super
-              annotate_invoke!(span, args)
+              super.tap { annotate_invoke!(span, args) }
             end
           ensure
             shutdown_tracer!
@@ -27,8 +26,7 @@ module Datadog
             return super unless enabled?
 
             tracer.trace(Ext::SPAN_EXECUTE, span_options) do |span|
-              super
-              annotate_execute!(span, args)
+              super.tap { annotate_execute!(span, args) }
             end
           ensure
             shutdown_tracer!

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

@@ -21,13 +21,6 @@ module Datadog
             begin
               # Add instrumentation patch to Rake task
               ::Rake::Task.send(:include, Instrumentation)
-
-              # Set service info
-              get_option(:tracer).set_service_info(
-                get_option(:service_name),
-                Ext::APP,
-                Datadog::Ext::AppTypes::WORKER
-              )
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Rake integration: #{e}")
             end

data/lib/ddtrace/contrib/rest_client/configuration/settings.rb

@@ -16,10 +16,7 @@ module Datadog
                   lazy: true
 
           option :distributed_tracing, default: true
-          option :service_name, default: Ext::SERVICE_NAME, depends_on: [:tracer] do |value|
-            get_option(:tracer).set_service_info(value, Ext::APP, Datadog::Ext::AppTypes::WEB)
-            value
-          end
+          option :service_name, default: Ext::SERVICE_NAME
         end
       end
     end

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

@@ -8,7 +8,6 @@ module Datadog
         def initialize(options = {})
           @tracer = options[:tracer] || configuration[:tracer]
           @shoryuken_service = options[:service_name] || configuration[:service_name]
-          set_service_info(@shoryuken_service)
         end
 
         def call(worker_instance, queue, sqs_msg, body)
@@ -40,15 +39,6 @@ module Datadog
         def configuration
           Datadog.configuration[:shoryuken]
         end
-
-        def set_service_info(service)
-          return if @tracer.nil? || @tracer.services[service]
-          @tracer.set_service_info(
-            service,
-            Ext::APP,
-            Datadog::Ext::AppTypes::WORKER
-          )
-        end
       end
     end
   end

data/lib/ddtrace/contrib/sidekiq/client_tracer.rb

@@ -11,7 +11,6 @@ module Datadog
         def initialize(options = {})
           super
           @sidekiq_service = options[:client_service_name] || configuration[:client_service_name]
-          set_service_info(@sidekiq_service)
         end
 
         # Client middleware arguments are documented here:

data/lib/ddtrace/contrib/sidekiq/server_tracer.rb

@@ -17,7 +17,6 @@ module Datadog
           resource = job_resource(job)
 
           service = service_from_worker_config(resource) || @sidekiq_service
-          set_service_info(service)
 
           @tracer.trace(Ext::SPAN_JOB, service: service, span_type: Datadog::Ext::AppTypes::WORKER) do |span|
             span.resource = resource

data/lib/ddtrace/contrib/sidekiq/tracing.rb

@@ -22,16 +22,6 @@ module Datadog
             job['class']
           end
         end
-
-        def set_service_info(service)
-          # Ensure the tracer knows about this service.
-          return if @tracer.services[service]
-          @tracer.set_service_info(
-            service,
-            Ext::APP,
-            Datadog::Ext::AppTypes::WORKER
-          )
-        end
       end
     end
   end

data/lib/ddtrace/contrib/sinatra/configuration/settings.rb

@@ -24,10 +24,7 @@ module Datadog
           option :headers, default: DEFAULT_HEADERS
           option :resource_script_names, default: false
 
-          option :service_name, default: Ext::SERVICE_NAME, depends_on: [:tracer] do |value|
-            get_option(:tracer).set_service_info(value, Ext::APP, Datadog::Ext::AppTypes::WEB)
-            value
-          end
+          option :service_name, default: Ext::SERVICE_NAME
         end
       end
     end

data/lib/ddtrace/encoding.rb

@@ -21,11 +21,6 @@ module Datadog
         encode(to_send)
       end
 
-      # Encodes services hash
-      def encode_services(services)
-        encode(services)
-      end
-
       # Defines the underlying format used during traces or services encoding.
       # This method must be implemented and should only be used by the internal functions.
       def encode(_)

data/lib/ddtrace/ext/forced_tracing.rb

@@ -0,0 +1,9 @@
+module Datadog
+  module Ext
+    # Defines constants for forced tracing
+    module ForcedTracing
+      TAG_KEEP = 'manual.drop'.freeze
+      TAG_DROP = 'manual.keep'.freeze
+    end
+  end
+end

data/lib/ddtrace/forced_tracing.rb

@@ -0,0 +1,64 @@
+require 'ddtrace/ext/forced_tracing'
+require 'ddtrace/ext/priority'
+
+module Datadog
+  # Defines analytics behavior
+  module ForcedTracing
+    class << self
+      def keep(span)
+        return if span.nil? || span.context.nil?
+        span.context.sampling_priority = Datadog::Ext::Priority::USER_KEEP
+      end
+
+      def drop(span)
+        return if span.nil? || span.context.nil?
+        span.context.sampling_priority = Datadog::Ext::Priority::USER_REJECT
+      end
+    end
+
+    # Extension for Datadog::Span
+    module Span
+      def self.included(base)
+        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
+          base.class_eval do
+            # Instance methods
+            include InstanceMethodsCompatibility
+            include InstanceMethods
+          end
+        else
+          base.send(:prepend, InstanceMethods)
+        end
+      end
+
+      # Compatibility shim for Rubies not supporting `.prepend`
+      # NOTE: This patching strategy only works because it has been applied after
+      #       Datadog::Analytics::Span. Any changes will likely break this.
+      module InstanceMethodsCompatibility
+        def self.included(base)
+          base.send(:alias_method, :set_tag_without_forced_tracing, :set_tag)
+
+          define_method :set_tag do |*args, &block|
+            set_tag_without_forced_tracing(*args, &block)
+          end
+        end
+      end
+
+      # Instance methods
+      module InstanceMethods
+        def set_tag(key, value)
+          # Configure sampling priority if they give us a forced tracing tag
+          # DEV: Do not set if the value they give us is explicitly "false"
+          case key
+          when Ext::ForcedTracing::TAG_KEEP
+            ForcedTracing.keep(self) unless value == false
+          when Ext::ForcedTracing::TAG_DROP
+            ForcedTracing.drop(self) unless value == false
+          else
+            # Otherwise, set the tag normally.
+            super if defined?(super)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/opentracer/span.rb

@@ -29,6 +29,14 @@ module Datadog
       # @param value [String, Numeric, Boolean] the value of the tag. If it's not
       # a String, Numeric, or Boolean it will be encoded with to_s
       def set_tag(key, value)
+        # Special cases to convert opentracing tags to datadog tags
+        case key
+        when 'error'
+          # Opentracing supports and `error: <bool>` tag, we need to convert to span status
+          # DEV: Do not return, we want to still set the `error` tag as they requested
+          datadog_span.status = value ? Datadog::Ext::Errors::STATUS : 0
+        end
+
         tap { datadog_span.set_tag(key, value) }
       end
 

data/lib/ddtrace/pin.rb

@@ -57,8 +57,6 @@ module Datadog
     end
 
     def service_name=(name)
-      tracer.set_service_info(name, app, app_type) if name && app && app_type
-
       @service_name = name
     end
 

data/lib/ddtrace/span.rb

@@ -3,7 +3,9 @@ require 'thread'
 
 require 'ddtrace/utils'
 require 'ddtrace/ext/errors'
+require 'ddtrace/ext/priority'
 require 'ddtrace/analytics'
+require 'ddtrace/forced_tracing'
 
 module Datadog
   # Represents a logical unit of work in the system. Each trace consists of one or more spans.
@@ -73,7 +75,7 @@ module Datadog
     # must be strings. A valid example is:
     #
     #   span.set_tag('http.method', request.method)
-    def set_tag(key, value)
+    def set_tag(key, value = nil)
       @meta[key] = value.to_s
     rescue StandardError => e
       Datadog::Tracer.log.debug("Unable to set the tag #{key}, ignoring it. Caused by: #{e}")
@@ -256,3 +258,4 @@ end
 
 # Include extensions after Span (for Ruby 1.9 compatibility)
 Datadog::Span.send(:include, Datadog::Analytics::Span)
+Datadog::Span.send(:include, Datadog::ForcedTracing::Span)

data/lib/ddtrace/sync_writer.rb

@@ -10,9 +10,17 @@ module Datadog
       end
     end
 
-    def write(trace, services)
+    def write(trace, services = nil)
+      unless services.nil?
+        Datadog::Patcher.do_once('SyncWriter#write') do
+          Datadog::Tracer.log.warn(%(
+            write: Writing services has been deprecated and no longer need to be provided.
+            write(traces, services) can be updted to write(traces)
+          ))
+        end
+      end
+
       perform_concurrently(
-        proc { flush_services(services) },
         proc { flush_trace(trace) }
       )
     rescue => e
@@ -25,10 +33,6 @@ module Datadog
       tasks.map { |task| Thread.new(&task) }.each(&:join)
     end
 
-    def flush_services(services)
-      transport.send(:services, services)
-    end
-
     def flush_trace(trace)
       processed_traces = Pipeline.process!([trace])
       transport.send(:traces, processed_traces)

data/lib/ddtrace/tracer.rb

@@ -20,7 +20,7 @@ module Datadog
   # of these function calls and sub-requests would be encapsulated within a single trace.
   # rubocop:disable Metrics/ClassLength
   class Tracer
-    attr_reader :sampler, :services, :tags, :provider
+    attr_reader :sampler, :tags, :provider
     attr_accessor :enabled, :writer
     attr_writer :default_service
 
@@ -67,6 +67,15 @@ module Datadog
       log.level == Logger::DEBUG
     end
 
+    def services
+      # Only log each deprecation warning once (safeguard against log spam)
+      Datadog::Patcher.do_once('Tracer#set_service_info') do
+        Datadog::Tracer.log.warn('services: Usage of Tracer.services has been deprecated')
+      end
+
+      {}
+    end
+
     # Shorthand that calls the `shutdown!` method of a registered worker.
     # It's useful to ensure that the Trace Buffer is properly flushed before
     # shutting down the application.
@@ -110,7 +119,6 @@ module Datadog
       @context_flush = options[:partial_flush] ? Datadog::ContextFlush.new(options) : nil
 
       @mutex = Mutex.new
-      @services = {}
       @tags = {}
     end
 
@@ -162,14 +170,16 @@ module Datadog
     # Set the information about the given service. A valid example is:
     #
     #   tracer.set_service_info('web-application', 'rails', 'web')
+    #
+    # set_service_info is deprecated, no service information needs to be tracked
     def set_service_info(service, app, app_type)
-      @services[service] = {
-        'app' => app,
-        'app_type' => app_type
-      }
-
-      return unless Datadog::Tracer.debug_logging
-      Datadog::Tracer.log.debug("set_service_info: service: #{service} app: #{app} type: #{app_type}")
+      # Only log each deprecation warning once (safeguard against log spam)
+      Datadog::Patcher.do_once('Tracer#set_service_info') do
+        Datadog::Tracer.log.warn(%(
+          set_service_info: Usage of set_service_info has been deprecated,
+          service information no longer needs to be reported to the trace agent.
+        ))
+      end
     end
 
     # A default value for service. One should really override this one
@@ -380,8 +390,7 @@ module Datadog
         Datadog::Tracer.log.debug(str)
       end
 
-      @writer.write(trace, @services)
-      @services = {}
+      @writer.write(trace)
     end
 
     private :write, :guess_context_and_parent

data/lib/ddtrace/transport.rb

@@ -11,7 +11,7 @@ module Datadog
   # rubocop:disable Metrics/ClassLength
   class HTTPTransport
     attr_accessor :hostname, :port
-    attr_reader :traces_endpoint, :services_endpoint
+    attr_reader :traces_endpoint
 
     DEFAULT_AGENT_HOST = '127.0.0.1'.freeze
     DEFAULT_TRACE_AGENT_PORT = '8126'.freeze
@@ -27,21 +27,18 @@ module Datadog
       V4 = 'v0.4'.freeze => {
         version: V4,
         traces_endpoint: '/v0.4/traces'.freeze,
-        services_endpoint: '/v0.4/services'.freeze,
         encoder: Encoding::MsgpackEncoder,
         fallback: 'v0.3'.freeze
       }.freeze,
       V3 = 'v0.3'.freeze => {
         version: V3,
         traces_endpoint: '/v0.3/traces'.freeze,
-        services_endpoint: '/v0.3/services'.freeze,
         encoder: Encoding::MsgpackEncoder,
         fallback: 'v0.2'.freeze
       }.freeze,
       V2 = 'v0.2'.freeze => {
         version: V2,
         traces_endpoint: '/v0.2/traces'.freeze,
-        services_endpoint: '/v0.2/services'.freeze,
         encoder: Encoding::JSONEncoder
       }.freeze
     }.freeze
@@ -78,10 +75,7 @@ module Datadog
     def send(endpoint, data)
       case endpoint
       when :services
-        payload = @encoder.encode_services(data)
-        status_code = post(@api[:services_endpoint], payload) do |response|
-          process_callback(:services, response)
-        end
+        return nil
       when :traces
         count = data.length
         payload = @encoder.encode_traces(data)

data/lib/ddtrace/version.rb

@@ -1,7 +1,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 22
+    MINOR = 23
     PATCH = 0
     PRE = nil
 

data/lib/ddtrace/workers.rb

@@ -16,7 +16,6 @@ module Datadog
       SHUTDOWN_TIMEOUT = 1
 
       attr_reader \
-        :service_buffer,
         :trace_buffer
 
       def initialize(options = {})
@@ -24,7 +23,6 @@ module Datadog
 
         # Callbacks
         @trace_task = options[:on_trace]
-        @service_task = options[:on_service]
         @runtime_metrics_task = options[:on_runtime_metrics]
 
         # Intervals
@@ -35,7 +33,6 @@ module Datadog
         # Buffers
         buffer_size = options.fetch(:buffer_size, 100)
         @trace_buffer = TraceBuffer.new(buffer_size)
-        @service_buffer = TraceBuffer.new(buffer_size)
 
         # Threading
         @shutdown = ConditionVariable.new
@@ -60,21 +57,6 @@ module Datadog
         end
       end
 
-      # Callback function that process traces and executes the +send_services()+ method.
-      def callback_services
-        return true if @service_buffer.empty?
-
-        begin
-          services = @service_buffer.pop()
-          @service_task.call(services[0], @transport) unless @service_task.nil?
-        rescue StandardError => e
-          # ensures that the thread will not die because of an exception.
-          # TODO[manu]: findout the reason and reschedule the send if it's not
-          # a fatal exception
-          Datadog::Tracer.log.error("Error during services flush: dropped #{services.length} items. Cause: #{e}")
-        end
-      end
-
       def callback_runtime_metrics
         @runtime_metrics_task.call unless @runtime_metrics_task.nil?
       rescue StandardError => e
@@ -91,13 +73,12 @@ module Datadog
         end
       end
 
-      # Closes all available queues and waits for the trace and service buffer to flush
+      # Closes all available queues and waits for the trace buffer to flush
       def stop
         @mutex.synchronize do
           return unless @run
 
           @trace_buffer.close
-          @service_buffer.close
           @run = false
           @shutdown.signal
         end
@@ -117,12 +98,6 @@ module Datadog
         @trace_buffer.push(trace)
       end
 
-      # Enqueue an item in the service internal buffer. This operation is thread-safe.
-      def enqueue_service(service)
-        return if service == {} # no use to send this, not worth it
-        @service_buffer.push(service)
-      end
-
       private
 
       alias flush_data callback_traces
@@ -131,11 +106,10 @@ module Datadog
         loop do
           @back_off = flush_data ? @flush_interval : [@back_off * BACK_OFF_RATIO, BACK_OFF_MAX].min
 
-          callback_services
           callback_runtime_metrics
 
           @mutex.synchronize do
-            return if !@run && @trace_buffer.empty? && @service_buffer.empty?
+            return if !@run && @trace_buffer.empty?
             @shutdown.wait(@mutex, @back_off) if @run # do not wait when shutting down
           end
         end

data/lib/ddtrace/writer.rb

@@ -34,31 +34,25 @@ module Datadog
         Runtime::Metrics.new
       end
 
-      @services = {}
-
       # handles the thread creation after an eventual fork
       @mutex_after_fork = Mutex.new
       @pid = nil
 
       @traces_flushed = 0
-      @services_flushed = 0
 
-      # one worker for both services and traces, each have their own queues
+      # one worker for traces
       @worker = nil
     end
 
-    # spawns two different workers for spans and services;
-    # they share the same transport which is thread-safe
+    # spawns a worker for spans; they share the same transport which is thread-safe
     def start
       @pid = Process.pid
       @trace_handler = ->(items, transport) { send_spans(items, transport) }
-      @service_handler = ->(items, transport) { send_services(items, transport) }
       @runtime_metrics_handler = -> { send_runtime_metrics }
       @worker = Datadog::Workers::AsyncTransport.new(
         transport: @transport,
         buffer_size: @buff_size,
         on_trace: @trace_handler,
-        on_service: @service_handler,
         on_runtime_metrics: @runtime_metrics_handler,
         interval: @flush_interval
       )
@@ -66,7 +60,7 @@ module Datadog
       @worker.start()
     end
 
-    # stops both workers for spans and services.
+    # stops worker for spans.
     def stop
       @worker.stop()
       @worker = nil
@@ -83,17 +77,6 @@ module Datadog
       status
     end
 
-    # flush services to the trace-agent, handles services only
-    def send_services(services, transport)
-      return true if services.empty?
-
-      code = transport.send(:services, services)
-      status = !transport.server_error?(code)
-      @services_flushed += 1 if status
-
-      status
-    end
-
     def send_runtime_metrics
       return unless Datadog.configuration.runtime_metrics_enabled
 
@@ -101,7 +84,16 @@ module Datadog
     end
 
     # enqueue the trace for submission to the API
-    def write(trace, services)
+    def write(trace, services = nil)
+      unless services.nil?
+        Datadog::Patcher.do_once('Writer#write') do
+          Datadog::Tracer.log.warn(%(
+            write: Writing services has been deprecated and no longer need to be provided.
+            write(traces, services) can be updted to write(traces)
+          ))
+        end
+      end
+
       # In multiprocess environments, the main process initializes the +Writer+ instance and if
       # the process forks (i.e. a web server like Unicorn or Puma with multiple workers) the new
       # processes will share the same +Writer+ until the first write (COW). Because of that,
@@ -122,14 +114,12 @@ module Datadog
       runtime_metrics.associate_with_span(trace.first) unless trace.empty?
 
       @worker.enqueue_trace(trace)
-      @worker.enqueue_service(services)
     end
 
     # stats returns a dictionary of stats about the writer.
     def stats
       {
         traces_flushed: @traces_flushed,
-        services_flushed: @services_flushed,
         transport: @transport.stats
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-15 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -523,12 +523,14 @@ files:
 - lib/ddtrace/ext/app_types.rb
 - lib/ddtrace/ext/distributed.rb
 - lib/ddtrace/ext/errors.rb
+- lib/ddtrace/ext/forced_tracing.rb
 - lib/ddtrace/ext/http.rb
 - lib/ddtrace/ext/metrics.rb
 - lib/ddtrace/ext/net.rb
 - lib/ddtrace/ext/priority.rb
 - lib/ddtrace/ext/runtime.rb
 - lib/ddtrace/ext/sql.rb
+- lib/ddtrace/forced_tracing.rb
 - lib/ddtrace/logger.rb
 - lib/ddtrace/metrics.rb
 - lib/ddtrace/monkey.rb
@@ -598,7 +600,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications