ddtrace 0.43.0 → 0.45.0

data/lib/ddtrace/contrib/qless/tracer_cleaner.rb

@@ -0,0 +1,32 @@
+module Datadog
+  module Contrib
+    module Qless
+      # Shutdown Tracer in forks for performance reasons
+      module TracerCleaner
+        def around_perform(job)
+          return super unless datadog_configuration && tracer
+
+          super.tap do
+            tracer.shutdown! if forked?
+          end
+        end
+
+        private
+
+        def forked?
+          pin = Datadog::Pin.get_from(::Qless)
+          return false unless pin
+          pin.config[:forked] == true
+        end
+
+        def tracer
+          datadog_configuration.tracer
+        end
+
+        def datadog_configuration
+          Datadog.configuration[:qless]
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,7 @@
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/rack/configuration/settings'
 require 'ddtrace/contrib/rack/patcher'
+require 'ddtrace/contrib/rails/utils'
 
 module Datadog
   module Contrib
@@ -25,6 +26,12 @@ module Datadog
           super && version >= MINIMUM_VERSION
         end
 
+        # enabled by rails integration so should only auto instrument
+        # if detected that it is being used without rails
+        def auto_instrument?
+          !Datadog::Contrib::Rails::Utils.railtie_supported?
+        end
+
         def default_configuration
           Configuration::Settings.new
         end

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

@@ -53,7 +53,7 @@ module Datadog
             tracer.provider.context = context if context.trace_id
           end
 
-          # [experimental] create a root Span to keep track of frontend web servers
+          # Create a root Span to keep track of frontend web servers
           # (i.e. Apache, nginx) if the header is properly set
           frontend_span = compute_queue_time(env, tracer)
 

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

@@ -1,7 +1,12 @@
 module Datadog
   module Contrib
     module Rack
-      # QueueTime simply...
+      # Retrieves the time spent in an upstream proxy
+      # for the current Rack request.
+      #
+      # This time captures the request delay introduced but
+      # such proxy before the request made it to the Ruby
+      # process.
       module QueueTime
         REQUEST_START = 'HTTP_X_REQUEST_START'.freeze
         QUEUE_START = 'HTTP_X_QUEUE_START'.freeze

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

@@ -0,0 +1,10 @@
+require 'ddtrace'
+
+# Railtie to include AutoInstrumentation in rails loading
+class DatadogAutoInstrumentRailtie < Rails::Railtie
+  # we want to load before config initializers so that any user supplied config
+  # in config/initializers/datadog.rb will take precedence
+  initializer 'datadog.start_tracer', before: :load_config_initializers do
+    Datadog::Contrib::AutoInstrument.patch_all
+  end
+end

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

@@ -14,6 +14,10 @@ module Datadog
             ::Rails.application.class.to_s.underscore
           end
         end
+
+        def self.railtie_supported?
+          !(defined?(::Rails::VERSION::MAJOR) && ::Rails::VERSION::MAJOR >= 3 && defined?(::Rails::Railtie)).nil?
+        end
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Datadog
         end
 
         def self.loaded?
-          !defined?(::Rake).nil?
+          !defined?(::Rake::Task).nil?
         end
 
         def self.compatible?

data/lib/ddtrace/contrib/redis/configuration/resolver.rb

@@ -4,6 +4,8 @@ module Datadog
   module Contrib
     module Redis
       module Configuration
+        UNIX_SCHEME = 'unix'.freeze
+
         # Converts Symbols, Strings, and Hashes to a normalized connection settings Hash.
         class Resolver < Contrib::Configuration::Resolver
           def resolve(key_or_hash)
@@ -13,7 +15,7 @@ module Datadog
           end
 
           def normalize(hash)
-            return { url: hash[:url] } if hash[:scheme] == 'unix'
+            return { url: hash[:url] } if hash[:scheme] == UNIX_SCHEME
 
             # Connexion strings are always converted to host, port, db and scheme
             # but the host, port, db and scheme will generate the :url only after

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

@@ -22,6 +22,11 @@ module Datadog
             o.lazy
           end
 
+          option :command_args do |o|
+            o.default { env_to_bool(Ext::ENV_COMMAND_ARGS, true) }
+            o.lazy
+          end
+
           option :service_name, default: Ext::SERVICE_NAME
         end
       end

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

@@ -9,6 +9,7 @@ module Datadog
         ENV_ANALYTICS_ENABLED_OLD = 'DD_REDIS_ANALYTICS_ENABLED'.freeze
         ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'.freeze
         ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_REDIS_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'.freeze
         METRIC_PIPELINE_LEN = 'redis.pipeline_length'.freeze
         SERVICE_NAME = 'redis'.freeze
         SPAN_COMMAND = 'redis.command'.freeze

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

@@ -28,6 +28,7 @@ module Datadog
 
         # rubocop:disable Metrics/MethodLength
         # rubocop:disable Metrics/BlockLength
+        # rubocop:disable Metrics/AbcSize
         def patch_redis_client
           ::Redis::Client.class_eval do
             alias_method :call_without_datadog, :call
@@ -40,7 +41,7 @@ module Datadog
               pin.tracer.trace(Datadog::Contrib::Redis::Ext::SPAN_COMMAND) do |span|
                 span.service = pin.service
                 span.span_type = Datadog::Contrib::Redis::Ext::TYPE
-                span.resource = Datadog::Contrib::Redis::Quantize.format_command_args(*args)
+                span.resource = get_command(args)
                 Datadog::Contrib::Redis::Tags.set_common_tags(self, span)
 
                 response = call_without_datadog(*args, &block)
@@ -59,10 +60,10 @@ module Datadog
               pin.tracer.trace(Datadog::Contrib::Redis::Ext::SPAN_COMMAND) do |span|
                 span.service = pin.service
                 span.span_type = Datadog::Contrib::Redis::Ext::TYPE
-                commands = args[0].commands.map { |c| Datadog::Contrib::Redis::Quantize.format_command_args(c) }
+                commands = get_pipeline_commands(args)
                 span.resource = commands.join("\n")
-                Datadog::Contrib::Redis::Tags.set_common_tags(self, span)
                 span.set_metric Datadog::Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
+                Datadog::Contrib::Redis::Tags.set_common_tags(self, span)
 
                 response = call_pipeline_without_datadog(*args, &block)
               end
@@ -84,6 +85,22 @@ module Datadog
 
             private
 
+            def get_command(args)
+              if datadog_configuration[:command_args]
+                Datadog::Contrib::Redis::Quantize.format_command_args(*args)
+              else
+                Datadog::Contrib::Redis::Quantize.get_verb(*args)
+              end
+            end
+
+            def get_pipeline_commands(args)
+              if datadog_configuration[:command_args]
+                args[0].commands.map { |c| Datadog::Contrib::Redis::Quantize.format_command_args(c) }
+              else
+                args[0].commands.map { |c| Datadog::Contrib::Redis::Quantize.get_verb(c) }
+              end
+            end
+
             def datadog_configuration
               Datadog.configuration[:redis, options]
             end

data/lib/ddtrace/contrib/redis/quantize.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Datadog
   module Contrib
     module Redis
@@ -8,6 +10,19 @@ module Datadog
         VALUE_MAX_LEN = 50
         CMD_MAX_LEN = 500
 
+        MULTI_VERB_COMMANDS = Set.new(
+          %w[
+            ACL
+            CLIENT
+            CLUSTER
+            COMMAND
+            CONFIG
+            DEBUG
+            LATENCY
+            MEMORY
+          ]
+        ).freeze
+
         module_function
 
         def format_arg(arg)
@@ -27,6 +42,18 @@ module Datadog
           Utils.truncate(cmd, CMD_MAX_LEN, TOO_LONG_MARK)
         end
 
+        def get_verb(command_args)
+          return unless command_args.is_a?(Array)
+
+          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
+          return verb unless MULTI_VERB_COMMANDS.include?(verb) && command_args[1]
+
+          "#{verb} #{command_args[1]}"
+        end
+
         def auth_command?(command_args)
           return false unless command_args.is_a?(Array) && !command_args.empty?
           command_args.first.to_sym == :auth

data/lib/ddtrace/contrib/redis/tags.rb

@@ -19,7 +19,7 @@ module Datadog
             span.set_tag Datadog::Ext::NET::TARGET_HOST, client.host
             span.set_tag Datadog::Ext::NET::TARGET_PORT, client.port
             span.set_tag Ext::TAG_DB, client.db
-            span.set_tag Ext::TAG_RAW_COMMAND, span.resource
+            span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args?
           end
 
           private
@@ -35,6 +35,10 @@ 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/ddtrace/contrib/rspec/integration.rb

@@ -28,6 +28,11 @@ module Datadog
           super && version >= MINIMUM_VERSION
         end
 
+        # test environments should not auto instrument test libraries
+        def auto_instrument?
+          false
+        end
+
         def default_configuration
           Configuration::Settings.new
         end

data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb

@@ -8,9 +8,9 @@ module Datadog
     module Sinatra
       # Middleware used for automatically tagging configured headers and handle request span
       class TracerMiddleware
-        def initialize(app, app_instance: nil)
+        def initialize(app, opt = {})
           @app = app
-          @app_instance = app_instance
+          @app_instance = opt[:app_instance]
         end
 
         # rubocop:disable Metrics/AbcSize

data/lib/ddtrace/ext/ci.rb

@@ -5,6 +5,8 @@ module Datadog
     # Defines constants for CI tags
     # rubocop:disable Metrics/ModuleLength:
     module CI
+      TAG_STAGE_NAME = 'ci.stage.name'.freeze
+      TAG_JOB_NAME = 'ci.job.name'.freeze
       TAG_JOB_URL = 'ci.job.url'.freeze
       TAG_PIPELINE_ID = 'ci.pipeline.id'.freeze
       TAG_PIPELINE_NAME = 'ci.pipeline.name'.freeze
@@ -23,7 +25,8 @@ module Datadog
         ['GITLAB_CI'.freeze, :extract_gitlab],
         ['JENKINS_URL'.freeze, :extract_jenkins],
         ['TEAMCITY_VERSION'.freeze, :extract_teamcity],
-        ['TRAVIS'.freeze, :extract_travis]
+        ['TRAVIS'.freeze, :extract_travis],
+        ['BITRISE_BUILD_SLUG'.freeze, :extract_bitrise]
       ].freeze
 
       module_function
@@ -37,7 +40,6 @@ module Datadog
         tags[Git::TAG_TAG] = normalize_ref(tags[Git::TAG_TAG])
         tags.delete(Git::TAG_BRANCH) unless tags[Git::TAG_TAG].nil?
         tags[Git::TAG_BRANCH] = normalize_ref(tags[Git::TAG_BRANCH])
-        tags[Git::TAG_DEPRECATED_COMMIT_SHA] = tags[Git::TAG_COMMIT_SHA]
         tags[Git::TAG_REPOSITORY_URL] = filter_sensitive_info(tags[Git::TAG_REPOSITORY_URL])
 
         # Expand ~
@@ -63,26 +65,34 @@ module Datadog
 
       def extract_appveyor(env)
         url = "https://ci.appveyor.com/project/#{env['APPVEYOR_REPO_NAME']}/builds/#{env['APPVEYOR_BUILD_ID']}"
+
+        if env['APPVEYOR_REPO_PROVIDER'] == 'github'
+          repository = "https://github.com/#{env['APPVEYOR_REPO_NAME']}.git"
+          commit = env['APPVEYOR_REPO_COMMIT']
+          branch = (env['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'] || env['APPVEYOR_REPO_BRANCH'])
+          tag = env['APPVEYOR_REPO_TAG_NAME']
+        end
+
         {
           TAG_PROVIDER_NAME => 'appveyor',
-          Git::TAG_REPOSITORY_URL =>  "https://github.com/#{env['APPVEYOR_REPO_NAME']}.git",
-          Git::TAG_COMMIT_SHA => env['APPVEYOR_REPO_COMMIT'],
+          Git::TAG_REPOSITORY_URL =>  repository,
+          Git::TAG_COMMIT_SHA => commit,
           TAG_WORKSPACE_PATH => env['APPVEYOR_BUILD_FOLDER'],
           TAG_PIPELINE_ID => env['APPVEYOR_BUILD_ID'],
           TAG_PIPELINE_NAME => env['APPVEYOR_REPO_NAME'],
           TAG_PIPELINE_NUMBER => env['APPVEYOR_BUILD_NUMBER'],
           TAG_PIPELINE_URL => url,
           TAG_JOB_URL => url,
-          Git::TAG_BRANCH => (env['APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH'] || env['APPVEYOR_REPO_BRANCH']),
-          Git::TAG_TAG => env['APPVEYOR_REPO_TAG_NAME']
+          Git::TAG_BRANCH => branch,
+          Git::TAG_TAG => tag
         }
       end
 
       def extract_azure_pipelines(env)
-        if env['SYSTEM_TEAMFOUNDATIONSERVERURI'] && env['SYSTEM_TEAMPROJECT'] && env['BUILD_BUILDID']
-          base_url = "#{env['SYSTEM_TEAMFOUNDATIONSERVERURI']}#{env['SYSTEM_TEAMPROJECT']}" \
+        if env['SYSTEM_TEAMFOUNDATIONSERVERURI'] && env['SYSTEM_TEAMPROJECTID'] && env['BUILD_BUILDID']
+          base_url = "#{env['SYSTEM_TEAMFOUNDATIONSERVERURI']}#{env['SYSTEM_TEAMPROJECTID']}" \
             "/_build/results?buildId=#{env['BUILD_BUILDID']}"
-          pipeline_url = base_url + '&_a=summary'
+          pipeline_url = base_url
           job_url = base_url + "&view=logs&j=#{env['SYSTEM_JOBID']}&t=#{env['SYSTEM_TASKINSTANCEID']}"
         else
           pipeline_url = job_url = nil
@@ -194,6 +204,8 @@ module Datadog
           Git::TAG_COMMIT_SHA => env['CI_COMMIT_SHA'],
           Git::TAG_REPOSITORY_URL => env['CI_REPOSITORY_URL'],
           Git::TAG_TAG => env['CI_COMMIT_TAG'],
+          TAG_STAGE_NAME => env['CI_JOB_STAGE'],
+          TAG_JOB_NAME => env['CI_JOB_NAME'],
           TAG_JOB_URL => env['CI_JOB_URL'],
           TAG_PIPELINE_ID => env['CI_PIPELINE_ID'],
           TAG_PIPELINE_NAME => env['CI_PROJECT_PATH'],
@@ -221,7 +233,6 @@ module Datadog
           Git::TAG_COMMIT_SHA => env['GIT_COMMIT'],
           Git::TAG_REPOSITORY_URL => env['GIT_URL'],
           Git::TAG_TAG => tag,
-          TAG_JOB_URL => env['JOB_URL'],
           TAG_PIPELINE_ID => env['BUILD_TAG'],
           TAG_PIPELINE_NAME => name,
           TAG_PIPELINE_NUMBER => env['BUILD_NUMBER'],
@@ -260,6 +271,27 @@ module Datadog
           TAG_WORKSPACE_PATH => env['TRAVIS_BUILD_DIR']
         }
       end
+
+      def extract_bitrise(env)
+        commit = (
+          env['BITRISE_GIT_COMMIT'] || env['GIT_CLONE_COMMIT_HASH']
+        )
+        branch = (
+          env['BITRISEIO_GIT_BRANCH_DEST'] || env['BITRISE_GIT_BRANCH']
+        )
+        {
+          TAG_PROVIDER_NAME => 'bitrise',
+          TAG_PIPELINE_ID => env['BITRISE_BUILD_SLUG'],
+          TAG_PIPELINE_NAME => env['BITRISE_APP_TITLE'],
+          TAG_PIPELINE_NUMBER => env['BITRISE_BUILD_NUMBER'],
+          TAG_PIPELINE_URL => env['BITRISE_BUILD_URL'],
+          TAG_WORKSPACE_PATH => env['BITRISE_SOURCE_DIR'],
+          Git::TAG_REPOSITORY_URL => env['GIT_REPOSITORY_URL'],
+          Git::TAG_COMMIT_SHA => commit,
+          Git::TAG_BRANCH => branch,
+          Git::TAG_TAG => env['BITRISE_GIT_TAG']
+        }
+      end
     end
   end
 end

data/lib/ddtrace/ext/git.rb

@@ -4,7 +4,6 @@ module Datadog
     module Git
       TAG_BRANCH = 'git.branch'.freeze
       TAG_COMMIT_SHA = 'git.commit.sha'.freeze
-      TAG_DEPRECATED_COMMIT_SHA = 'git.commit_sha'.freeze
       TAG_REPOSITORY_URL = 'git.repository_url'.freeze
       TAG_TAG = 'git.tag'.freeze
     end

data/lib/ddtrace/propagation/http_propagator.rb

@@ -26,7 +26,14 @@ module Datadog
       # Inject all configured propagation styles
       ::Datadog.configuration.distributed_tracing.propagation_inject_style.each do |style|
         propagator = PROPAGATION_STYLES[style]
-        propagator.inject!(context, env) unless propagator.nil?
+        begin
+          propagator.inject!(context, env) unless propagator.nil?
+        rescue => e
+          Datadog.logger.error(
+            'Error injecting propagated context into the environment. ' \
+            "Cause: #{e} Location: #{e.backtrace.first}"
+          )
+        end
       end
     end
 
@@ -42,7 +49,15 @@ module Datadog
 
         # Extract context
         # DEV: `propagator.extract` will return `nil`, where `HTTPPropagator#extract` will not
-        extracted_context = propagator.extract(env)
+        begin
+          extracted_context = propagator.extract(env)
+        rescue => e
+          Datadog.logger.error(
+            'Error extracting propagated context from the environment. ' \
+            "Cause: #{e} Location: #{e.backtrace.first}"
+          )
+        end
+
         # Skip this style if no valid headers were found
         next if extracted_context.nil?