ddtrace 1.0.0 → 1.9.0

data/lib/datadog/tracing/contrib/redis/quantize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # typed: true
 
 require 'set'
@@ -8,11 +10,13 @@ module Datadog
       module Redis
         # Quantize contains Redis-specific resource quantization tools.
         module Quantize
-          PLACEHOLDER = '?'.freeze
-          TOO_LONG_MARK = '...'.freeze
+          PLACEHOLDER = '?'
+          TOO_LONG_MARK = '...'
           VALUE_MAX_LEN = 50
           CMD_MAX_LEN = 500
 
+          AUTH_COMMANDS = %w[AUTH auth].freeze
+
           MULTI_VERB_COMMANDS = Set.new(
             %w[
               ACL
@@ -29,8 +33,7 @@ module Datadog
           module_function
 
           def format_arg(arg)
-            str = arg.is_a?(Symbol) ? arg.to_s.upcase : arg.to_s
-            str = Core::Utils.utf8_encode(str, binary: true, placeholder: PLACEHOLDER)
+            str = Core::Utils.utf8_encode(arg, binary: true, placeholder: PLACEHOLDER)
             Core::Utils.truncate(str, VALUE_MAX_LEN, TOO_LONG_MARK)
           rescue => e
             Datadog.logger.debug("non formattable Redis arg #{str}: #{e}")
@@ -41,8 +44,8 @@ module Datadog
             command_args = resolve_command_args(command_args)
             return 'AUTH ?' if auth_command?(command_args)
 
-            cmd = command_args.map { |x| format_arg(x) }.join(' ')
-            Core::Utils.truncate(cmd, CMD_MAX_LEN, TOO_LONG_MARK)
+            verb, *args = command_args.map { |x| format_arg(x) }
+            Core::Utils.truncate("#{verb.upcase} #{args.join(' ')}", CMD_MAX_LEN, TOO_LONG_MARK)
           end
 
           def get_verb(command_args)
@@ -50,8 +53,7 @@ module Datadog
 
             return get_verb(command_args.first) if command_args.first.is_a?(Array)
 
-            arg = command_args.first
-            verb = arg.is_a?(Symbol) ? arg.to_s.upcase : arg.to_s
+            verb = command_args.first.to_s.upcase
             return verb unless MULTI_VERB_COMMANDS.include?(verb) && command_args[1]
 
             "#{verb} #{command_args[1]}"
@@ -60,7 +62,8 @@ module Datadog
           def auth_command?(command_args)
             return false unless command_args.is_a?(Array) && !command_args.empty?
 
-            command_args.first.to_sym == :auth
+            verb = command_args.first.to_s
+            AUTH_COMMANDS.include?(verb)
           end
 
           # Unwraps command array when Redis is called with the following syntax:

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/redis/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -12,7 +12,7 @@ module Datadog
         # Tags handles generic common tags assignment.
         module Tags
           class << self
-            def set_common_tags(client, span)
+            def set_common_tags(client, span, show_command_args)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
@@ -20,13 +20,19 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, client.host)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
+              span.set_tag Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM
+
               span.set_tag Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, client.host
               span.set_tag Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, client.port
+
+              span.set_tag Ext::TAG_DATABASE_INDEX, client.db.to_s
               span.set_tag Ext::TAG_DB, client.db
-              span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args?
+              span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args
             end
 
             private
@@ -42,10 +48,6 @@ module Datadog
             def analytics_sample_rate
               datadog_configuration[:analytics_sample_rate]
             end
-
-            def show_command_args?
-              datadog_configuration[:command_args]
-            end
           end
         end
       end

data/lib/datadog/tracing/contrib/redis/trace_middleware.rb

@@ -0,0 +1,72 @@
+# typed: false
+
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'quantize'
+require_relative 'tags'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Redis
+        # Instrumentation for Redis 5+
+        module TraceMiddleware
+          def call(commands, redis_config)
+            Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
+              datadog_configuration = resolve(redis_config)
+              resource = get_command(commands, datadog_configuration[:command_args])
+
+              span.service = datadog_configuration[:service_name]
+              span.span_type = Contrib::Redis::Ext::TYPE
+              span.resource = resource
+
+              Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args])
+
+              super
+            end
+          end
+
+          def call_pipelined(commands, redis_config)
+            Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
+              datadog_configuration = resolve(redis_config)
+              pipelined_commands = get_pipeline_commands(commands, datadog_configuration[:command_args])
+
+              span.service = datadog_configuration[:service_name]
+              span.span_type = Contrib::Redis::Ext::TYPE
+              span.resource = pipelined_commands.join("\n")
+              span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, pipelined_commands.length
+
+              Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args])
+
+              super
+            end
+          end
+
+          private
+
+          def get_command(commands, boolean)
+            if boolean
+              Contrib::Redis::Quantize.format_command_args(commands)
+            else
+              Contrib::Redis::Quantize.get_verb(commands)
+            end
+          end
+
+          def get_pipeline_commands(commands, boolean)
+            if boolean
+              commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) }
+            else
+              commands.map { |c| Contrib::Redis::Quantize.get_verb(c) }
+            end
+          end
+
+          def resolve(redis_config)
+            custom = redis_config.custom[:datadog] || {}
+
+            Datadog.configuration.tracing[:redis, redis_config.server_url].to_h.merge(custom)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/contrib/resque/configuration/settings.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/resque/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/resque/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/resque/configuration/settings'
-require 'datadog/tracing/contrib/resque/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/resque/patcher.rb

@@ -1,8 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/resque/integration'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../patcher'
+require_relative '../sidekiq/ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/resque/resque_job.rb

@@ -2,10 +2,9 @@
 
 require 'resque'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative '../sidekiq/ext'
 
 module Datadog
   module Tracing
@@ -42,6 +41,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])

data/lib/datadog/tracing/contrib/rest_client/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/rest_client/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -27,7 +27,13 @@ module Datadog
             end
 
             option :distributed_tracing, default: true
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
+
+            option :split_by_domain, default: false
           end
         end
       end

data/lib/datadog/tracing/contrib/rest_client/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'rest_client'.freeze

data/lib/datadog/tracing/contrib/rest_client/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/rest_client/configuration/settings'
-require 'datadog/tracing/contrib/rest_client/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/rest_client/patcher.rb

@@ -1,7 +1,6 @@
 # typed: true
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/rest_client/integration'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -19,7 +18,7 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/rest_client/request_patch'
+            require_relative 'request_patch'
 
             ::RestClient::Request.include(RequestPatch)
           end

data/lib/datadog/tracing/contrib/rest_client/request_patch.rb

@@ -2,11 +2,10 @@
 
 require 'uri'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/rest_client/ext'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -35,6 +34,8 @@ module Datadog
             def datadog_tag_request(uri, span)
               span.resource = method.to_s.upcase
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
@@ -54,7 +55,7 @@ module Datadog
             def datadog_trace_request(uri)
               span = Tracing.trace(
                 Ext::SPAN_REQUEST,
-                service: datadog_configuration[:service_name],
+                service: datadog_configuration[:split_by_domain] ? uri.host : datadog_configuration[:service_name],
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
               )
 

data/lib/datadog/tracing/contrib/semantic_logger/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/semantic_logger/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/semantic_logger/instrumentation.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/tracing'
+require_relative '../../../core/logging/ext'
 
 module Datadog
   module Tracing
@@ -33,7 +33,7 @@ module Datadog
                   service: correlation.service.to_s,
                   version: correlation.version.to_s
                 },
-                ddsource: ['ruby']
+                ddsource: Core::Logging::Ext::DD_SOURCE
               }
 
               # # if the user already has conflicting log_tags

data/lib/datadog/tracing/contrib/semantic_logger/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/semantic_logger/configuration/settings'
-require 'datadog/tracing/contrib/semantic_logger/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/semantic_logger/patcher.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/semantic_logger/instrumentation'
+require_relative '../patcher'
+require_relative 'instrumentation'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/configuration/settings.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/sequel/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/database.rb

@@ -1,10 +1,9 @@
 # typed: false
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sequel/ext'
-require 'datadog/tracing/contrib/sequel/utils'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'utils'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/dataset.rb

@@ -1,10 +1,9 @@
 # typed: false
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sequel/ext'
-require 'datadog/tracing/contrib/sequel/utils'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'utils'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sequel/configuration/settings'
-require 'datadog/tracing/contrib/sequel/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/patcher.rb

@@ -1,8 +1,8 @@
 # typed: true
 
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/sequel/database'
-require 'datadog/tracing/contrib/sequel/dataset'
+require_relative '../patcher'
+require_relative 'database'
+require_relative 'dataset'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sequel/utils.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/utils/database'
+require_relative '../../metadata/ext'
+require_relative '../utils/database'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/shoryuken/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/shoryuken/integration.rb

@@ -1,9 +1,9 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/shoryuken/ext'
-require 'datadog/tracing/contrib/shoryuken/configuration/settings'
-require 'datadog/tracing/contrib/shoryuken/patcher'
+require_relative '../integration'
+require_relative 'ext'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/shoryuken/patcher.rb

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'datadog/tracing/contrib/shoryuken/tracer'
+require_relative 'tracer'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/shoryuken/tracer.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/tracing/contrib/analytics'
+require_relative '../analytics'
 
 module Datadog
   module Tracing
@@ -37,6 +37,8 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_ATTRIBUTES, sqs_msg.attributes) if sqs_msg.respond_to?(:attributes)
               span.set_tag(Ext::TAG_JOB_BODY, body) if configuration[:tag_body]
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               yield
             end
           end

data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb

@@ -1,10 +1,9 @@
 # typed: true
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sidekiq/ext'
-require 'datadog/tracing/contrib/sidekiq/tracing'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'tracing'
 
 module Datadog
   module Tracing
@@ -29,6 +28,11 @@ module Datadog
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_PUSH)
 
+              span.set_tag(
+                Datadog::Tracing::Metadata::Ext::TAG_KIND,
+                Datadog::Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER
+              )
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

data/lib/datadog/tracing/contrib/sidekiq/configuration/settings.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -35,6 +35,7 @@ module Datadog
             option :service_name
             option :client_service_name
             option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :quantize, default: {}
           end
         end
       end

data/lib/datadog/tracing/contrib/sidekiq/ext.rb

@@ -16,8 +16,11 @@ module Datadog
           SPAN_PUSH = 'sidekiq.push'.freeze
           SPAN_JOB = 'sidekiq.job'.freeze
           SPAN_JOB_FETCH = 'sidekiq.job_fetch'.freeze
+          SPAN_REDIS_INFO = 'sidekiq.redis_info'.freeze
           SPAN_HEARTBEAT = 'sidekiq.heartbeat'.freeze
           SPAN_SCHEDULED_PUSH = 'sidekiq.scheduled_push'.freeze
+          SPAN_SCHEDULED_WAIT = 'sidekiq.scheduled_poller_wait'.freeze
+          SPAN_STOP = 'sidekiq.stop'.freeze
           TAG_JOB_DELAY = 'sidekiq.job.delay'.freeze
           TAG_JOB_ID = 'sidekiq.job.id'.freeze
           TAG_JOB_QUEUE = 'sidekiq.job.queue'.freeze
@@ -29,8 +32,11 @@ module Datadog
           TAG_OPERATION_PUSH = 'push'.freeze
           TAG_OPERATION_JOB = 'job'.freeze
           TAG_OPERATION_JOB_FETCH = 'job_fetch'.freeze
+          TAG_OPERATION_REDIS_INFO = 'redis_info'.freeze
           TAG_OPERATION_HEARTBEAT = 'heartbeat'.freeze
           TAG_OPERATION_SCHEDULED_PUSH = 'scheduled_push'.freeze
+          TAG_OPERATION_SCHEDULED_WAIT = 'scheduled_poller_wait'.freeze
+          TAG_OPERATION_STOP = 'stop'.freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/sidekiq/integration.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/sidekiq/configuration/settings'
-require 'datadog/tracing/contrib/sidekiq/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing