ddtrace 0.17.3 → 0.18.0

data/lib/ddtrace/contrib/rack/request_queue.rb

@@ -18,9 +18,13 @@ module Datadog
           time_string = header.split('t=')[1]
           return if time_string.nil?
 
+          # Return nil if the time is clearly invalid
+          time_value = time_string.to_f
+          return if time_value.zero?
+
           # return the request_start only if it's lesser than
           # current time, to avoid significant clock skew
-          request_start = Time.at(time_string.to_f)
+          request_start = Time.at(time_value)
           request_start.utc > now ? nil : request_start
         rescue StandardError => e
           # in case of an Exception we don't create a

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

@@ -0,0 +1,14 @@
+require 'ddtrace/contrib/configuration/settings'
+
+module Datadog
+  module Contrib
+    module Shoryuken
+      module Configuration
+        # Default settings for the Shoryuken integration
+        class Settings < Contrib::Configuration::Settings
+          option :service_name, default: Ext::SERVICE_NAME
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Datadog
+  module Contrib
+    module Shoryuken
+      # Shoryuken integration constants
+      module Ext
+        APP = 'shoryuken'.freeze
+        SERVICE_NAME = 'shoryuken'.freeze
+
+        SPAN_JOB = 'shoryuken.job'.freeze
+
+        TAG_JOB_ID = 'shoryuken.id'.freeze
+        TAG_JOB_QUEUE = 'shoryuken.queue'.freeze
+        TAG_JOB_ATTRIBUTES = 'shoryuken.attributes'.freeze
+        TAG_JOB_BODY = 'shoryuken.body'.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/shoryuken/ext'
+require 'ddtrace/contrib/shoryuken/configuration/settings'
+require 'ddtrace/contrib/shoryuken/patcher'
+
+module Datadog
+  module Contrib
+    module Shoryuken
+      # Description of Shoryuken integration
+      class Integration
+        include Contrib::Integration
+
+        register_as :shoryuken
+
+        class << self
+          def version
+            Gem.loaded_specs['shoryuken'] && Gem.loaded_specs['shoryuken'].version
+          end
+
+          def present?
+            super && defined?(::Shoryuken)
+          end
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'ddtrace/contrib/shoryuken/tracer'
+
+module Datadog
+  module Contrib
+    module Shoryuken
+      # Patcher enables patching of 'shoryuken' module.
+      module Patcher
+        include Contrib::Patcher
+
+        module_function
+
+        def patched?
+          done?(:shoryuken)
+        end
+
+        def patch
+          do_once(:shoryuken) do
+            begin
+              ::Shoryuken.server_middleware do |chain|
+                chain.add Shoryuken::Tracer
+              end
+            rescue StandardError => e
+              Datadog::Tracer.log.error("Unable to apply Shoryuken integration: #{e}")
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+module Datadog
+  module Contrib
+    module Shoryuken
+      # Tracer is a Shoryuken server-side middleware which traces executed jobs
+      class Tracer
+        def initialize(options = {})
+          @tracer = options[:tracer] || Datadog.configuration[:shoryuken][:tracer]
+          @shoryuken_service = options[:service_name] || Datadog.configuration[:shoryuken][:service_name]
+          set_service_info(@shoryuken_service)
+        end
+
+        def call(worker_instance, queue, sqs_msg, body)
+          @tracer.trace(Ext::SPAN_JOB, service: @shoryuken_service, span_type: Datadog::Ext::AppTypes::WORKER) do |span|
+            span.resource = worker_instance.class.name
+            span.set_tag(Ext::TAG_JOB_ID, sqs_msg.message_id)
+            span.set_tag(Ext::TAG_JOB_QUEUE, queue)
+            span.set_tag(Ext::TAG_JOB_ATTRIBUTES, sqs_msg.attributes) if sqs_msg.respond_to?(:attributes)
+            span.set_tag(Ext::TAG_JOB_BODY, body)
+
+            yield
+          end
+        end
+
+        private
+
+        def set_service_info(service)
+          return if @tracer.services[service]
+          @tracer.set_service_info(
+            service,
+            Ext::APP,
+            Datadog::Ext::AppTypes::WORKER
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+require 'ddtrace/contrib/sidekiq/tracing'
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      # Tracer is a Sidekiq client-side middleware which traces job enqueues/pushes
+      class ClientTracer
+        include Tracing
+
+        def initialize(options = {})
+          super
+          @sidekiq_service = options[:client_service_name] || Datadog.configuration[:sidekiq][:client_service_name]
+        end
+
+        # Client middleware arguments are documented here:
+        #   https://github.com/mperham/sidekiq/wiki/Middleware#client-middleware
+        def call(worker_class, job, queue, redis_pool)
+          service = @sidekiq_service
+          set_service_info(service)
+
+          resource = job_resource(job)
+
+          @tracer.trace(Ext::SPAN_PUSH, service: service) do |span|
+            span.resource = resource
+            span.set_tag(Ext::TAG_JOB_ID, job['jid'])
+            span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
+            span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
+
+            yield
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Datadog
         # Custom settings for the Sidekiq integration
         class Settings < Contrib::Configuration::Settings
           option :service_name, default: Ext::SERVICE_NAME
+          option :client_service_name, default: Ext::CLIENT_SERVICE_NAME
         end
       end
     end

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

@@ -5,7 +5,9 @@ module Datadog
       module Ext
         APP = 'sidekiq'.freeze
         SERVICE_NAME = 'sidekiq'.freeze
+        CLIENT_SERVICE_NAME = 'sidekiq-client'.freeze
 
+        SPAN_PUSH = 'sidekiq.push'.freeze
         SPAN_JOB = 'sidekiq.job'.freeze
 
         TAG_JOB_DELAY = 'sidekiq.job.delay'.freeze

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

@@ -16,10 +16,17 @@ module Datadog
         def patch
           do_once(:sidekiq) do
             begin
-              require 'ddtrace/contrib/sidekiq/tracer'
+              require 'ddtrace/contrib/sidekiq/client_tracer'
+              ::Sidekiq.configure_client do |config|
+                config.client_middleware do |chain|
+                  chain.add(Sidekiq::ClientTracer)
+                end
+              end
+
+              require 'ddtrace/contrib/sidekiq/server_tracer'
               ::Sidekiq.configure_server do |config|
                 config.server_middleware do |chain|
-                  chain.add(Sidekiq::Tracer)
+                  chain.add(Sidekiq::ServerTracer)
                 end
               end
             rescue StandardError => e

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

@@ -0,0 +1,50 @@
+require 'ddtrace/contrib/sidekiq/tracing'
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      # Tracer is a Sidekiq server-side middleware which traces executed jobs
+      class ServerTracer
+        include Tracing
+
+        def initialize(options = {})
+          super
+          @sidekiq_service = options[:service_name] || Datadog.configuration[:sidekiq][:service_name]
+        end
+
+        def call(worker, job, queue)
+          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
+            span.set_tag(Ext::TAG_JOB_ID, job['jid'])
+            span.set_tag(Ext::TAG_JOB_RETRY, job['retry'])
+            span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
+            span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
+            span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Time.now.utc.to_f - job['enqueued_at'].to_f))
+
+            yield
+          end
+        end
+
+        private
+
+        def service_from_worker_config(resource)
+          # Try to get the Ruby class from the resource name.
+          worker_klass = begin
+            Object.const_get(resource)
+          rescue NameError
+            nil
+          end
+
+          if worker_klass.respond_to?(:datadog_tracer_config)
+            worker_klass.datadog_tracer_config[:service_name]
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+require 'ddtrace/ext/app_types'
+require 'ddtrace/contrib/sidekiq/ext'
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      # Common functionality used by both client-side and server-side tracers.
+      module Tracing
+        def initialize(options = {})
+          @tracer = options[:tracer] || Datadog.configuration[:sidekiq][:tracer]
+        end
+
+        protected
+
+        # If class is wrapping something else, the interesting resource info
+        # is the underlying, wrapped class, and not the wrapper. This is
+        # primarily to support `ActiveJob`.
+        def job_resource(job)
+          if job['wrapped']
+            job['wrapped']
+          else
+            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
+end

data/lib/ddtrace/sync_writer.rb

@@ -5,7 +5,8 @@ module Datadog
 
     def initialize(options = {})
       @transport = options.fetch(:transport) do
-        HTTPTransport.new(Writer::HOSTNAME, Writer::PORT)
+        transport_options = options.fetch(:transport_options, {})
+        HTTPTransport.new(transport_options)
       end
     end
 

data/lib/ddtrace/transport.rb

@@ -13,6 +13,9 @@ module Datadog
     attr_accessor :hostname, :port
     attr_reader :traces_endpoint, :services_endpoint
 
+    DEFAULT_AGENT_HOST = '127.0.0.1'.freeze
+    DEFAULT_TRACE_AGENT_PORT = '8126'.freeze
+
     # seconds before the transport timeout
     TIMEOUT = 1
 
@@ -45,11 +48,11 @@ module Datadog
 
     private_constant :API
 
-    def initialize(hostname, port, options = {})
+    def initialize(options = {})
       api_version = options.fetch(:api_version, V3)
 
-      @hostname = hostname
-      @port = port
+      @hostname = options[:hostname] || ENV['DD_AGENT_HOST'] || DEFAULT_AGENT_HOST
+      @port = options[:port] || ENV['DD_TRACE_AGENT_PORT'] || DEFAULT_TRACE_AGENT_PORT
       @api = API.fetch(api_version)
       @encoder = options[:encoder] || @api[:encoder]
       @response_callback = options[:response_callback]

data/lib/ddtrace/utils/database.rb

@@ -2,16 +2,20 @@ module Datadog
   module Utils
     # Common database-related utility functions.
     module Database
+      VENDOR_DEFAULT = 'defaultdb'.freeze
+      VENDOR_POSTGRES = 'postgres'.freeze
+      VENDOR_SQLITE = 'sqlite'.freeze
+
       module_function
 
       def normalize_vendor(vendor)
         case vendor
         when nil
-          'defaultdb'
+          VENDOR_DEFAULT
         when 'postgresql'
-          'postgres'
+          VENDOR_POSTGRES
         when 'sqlite3'
-          'sqlite'
+          VENDOR_SQLITE
         else
           vendor
         end

data/lib/ddtrace/version.rb

@@ -1,8 +1,8 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 17
-    PATCH = 3
+    MINOR = 18
+    PATCH = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/ddtrace/writer.rb

@@ -7,9 +7,6 @@ module Datadog
   class Writer
     attr_reader :transport, :worker, :priority_sampler
 
-    HOSTNAME = '127.0.0.1'.freeze
-    PORT = '8126'.freeze
-
     def initialize(options = {})
       # writer and transport parameters
       @buff_size = options.fetch(:buffer_size, 100)
@@ -24,7 +21,7 @@ module Datadog
 
       # transport and buffers
       @transport = options.fetch(:transport) do
-        HTTPTransport.new(HOSTNAME, PORT, transport_options)
+        HTTPTransport.new(transport_options)
       end
 
       @services = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.17.3
+  version: 0.18.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-29 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -283,6 +283,10 @@ files:
 - docker-compose.yml
 - docs/GettingStarted.md
 - lib/ddtrace.rb
+- lib/ddtrace/augmentation.rb
+- lib/ddtrace/augmentation/method_wrapper.rb
+- lib/ddtrace/augmentation/method_wrapping.rb
+- lib/ddtrace/augmentation/shim.rb
 - lib/ddtrace/buffer.rb
 - lib/ddtrace/configurable.rb
 - lib/ddtrace/configuration.rb
@@ -308,6 +312,7 @@ files:
 - lib/ddtrace/contrib/active_record/ext.rb
 - lib/ddtrace/contrib/active_record/integration.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
+- lib/ddtrace/contrib/active_record/patches/abstract_adapter.rb
 - lib/ddtrace/contrib/active_record/utils.rb
 - lib/ddtrace/contrib/active_support/notifications/event.rb
 - lib/ddtrace/contrib/active_support/notifications/subscriber.rb
@@ -452,11 +457,18 @@ files:
 - lib/ddtrace/contrib/sequel/integration.rb
 - lib/ddtrace/contrib/sequel/patcher.rb
 - lib/ddtrace/contrib/sequel/utils.rb
+- lib/ddtrace/contrib/shoryuken/configuration/settings.rb
+- lib/ddtrace/contrib/shoryuken/ext.rb
+- lib/ddtrace/contrib/shoryuken/integration.rb
+- lib/ddtrace/contrib/shoryuken/patcher.rb
+- lib/ddtrace/contrib/shoryuken/tracer.rb
+- lib/ddtrace/contrib/sidekiq/client_tracer.rb
 - lib/ddtrace/contrib/sidekiq/configuration/settings.rb
 - lib/ddtrace/contrib/sidekiq/ext.rb
 - lib/ddtrace/contrib/sidekiq/integration.rb
 - lib/ddtrace/contrib/sidekiq/patcher.rb
-- lib/ddtrace/contrib/sidekiq/tracer.rb
+- lib/ddtrace/contrib/sidekiq/server_tracer.rb
+- lib/ddtrace/contrib/sidekiq/tracing.rb
 - lib/ddtrace/contrib/sinatra/configuration/settings.rb
 - lib/ddtrace/contrib/sinatra/env.rb
 - lib/ddtrace/contrib/sinatra/ext.rb