ddtrace 0.45.0 → 0.47.0

data/lib/ddtrace/contrib/rest_client/request_patch.rb

@@ -54,9 +54,7 @@ module Datadog
             yield(span).tap do |response|
               # Verify return value is a response
               # If so, add additional tags.
-              if response.is_a?(::RestClient::Response)
-                span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.code)
-              end
+              span.set_tag(Datadog::Ext::HTTP::STATUS_CODE, response.code) if response.is_a?(::RestClient::Response)
             end
           rescue ::RestClient::ExceptionWithResponse => e
             span.set_error(e) if Datadog::Ext::HTTP::ERROR_RANGE.cover?(e.http_code)

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

@@ -12,16 +12,6 @@ module Datadog
             o.lazy
           end
 
-          option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, true) }
-            o.lazy
-          end
-
-          option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-            o.lazy
-          end
-
           option :service_name do |o|
             o.default { Datadog.configuration.service || Ext::SERVICE_NAME }
             o.lazy

data/lib/ddtrace/contrib/rspec/example.rb

@@ -10,30 +10,29 @@ module Datadog
         # Instance methods for configuration
         module InstanceMethods
           def run(example_group_instance, reporter)
-            configuration = Datadog.configuration[:rspec]
             return super unless configuration[:enabled]
 
-            test_name = "#{example_group.description}::#{description}"
+            test_name = full_description.strip
+            if metadata[:description].empty?
+              # for unnamed it blocks this appends something like "example at ./spec/some_spec.rb:10"
+              test_name += " #{description}"
+            end
+
             trace_options = {
               app: Ext::APP,
               resource: test_name,
               service: configuration[:service_name],
               span_type: Datadog::Ext::AppTypes::TEST,
-              tags: example_group.instance_variable_get(:@tags).merge(Datadog.configuration.tags)
+              tags: tags.merge(Datadog.configuration.tags)
             }
 
-            configuration[:tracer].trace(configuration[:operation_name], trace_options) do |span|
+            tracer.trace(configuration[:operation_name], trace_options) do |span|
               span.set_tag(Datadog::Ext::Test::TAG_FRAMEWORK, Ext::FRAMEWORK)
               span.set_tag(Datadog::Ext::Test::TAG_NAME, test_name)
-              span.set_tag(Datadog::Ext::Test::TAG_SUITE, example_group.file_path)
+              span.set_tag(Datadog::Ext::Test::TAG_SUITE, file_path)
               span.set_tag(Datadog::Ext::Test::TAG_TYPE, Ext::TEST_TYPE)
               span.set_tag(Datadog::Ext::Test::TAG_SPAN_KIND, Datadog::Ext::AppTypes::TEST)
 
-              # Set analytics sample rate
-              if Datadog::Contrib::Analytics.enabled?(configuration[:analytics_enabled])
-                Datadog::Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
-              end
-
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
@@ -51,9 +50,24 @@ module Datadog
                   span.set_tag(Datadog::Ext::Test::TAG_STATUS, Datadog::Ext::Test::Status::SKIP)
                 end
               end
+
               result
             end
           end
+
+          private
+
+          def configuration
+            Datadog.configuration[:rspec]
+          end
+
+          def tracer
+            configuration[:tracer]
+          end
+
+          def tags
+            @tags ||= Datadog::Ext::CI.tags(ENV)
+          end
         end
       end
     end

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

@@ -4,13 +4,10 @@ module Datadog
       # RSpec integration constants
       module Ext
         APP = 'rspec'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_TRACE_RSPEC_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RSPEC_ANALYTICS_SAMPLE_RATE'.freeze
         ENV_ENABLED = 'DD_TRACE_RSPEC_ENABLED'.freeze
         ENV_OPERATION_NAME = 'DD_TRACE_RSPEC_OPERATION_NAME'.freeze
         FRAMEWORK = 'rspec'.freeze
         OPERATION_NAME = 'rspec.example'.freeze
-        EXAMPLE_GROUP_OPERATION_NAME = 'rspec.example_group'.freeze
         SERVICE_NAME = 'rspec'.freeze
         TEST_TYPE = 'test'.freeze
       end

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

@@ -21,7 +21,7 @@ module Datadog
 
         def self.loaded?
           !defined?(::RSpec).nil? && !defined?(::RSpec::Core).nil? && \
-            !defined?(::RSpec::Core::Example).nil? && !defined?(::RSpec::Core::ExampleGroup).nil?
+            !defined?(::RSpec::Core::Example).nil?
         end
 
         def self.compatible?

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

@@ -1,6 +1,5 @@
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/rspec/example'
-require 'ddtrace/contrib/rspec/example_group'
 
 module Datadog
   module Contrib
@@ -17,7 +16,6 @@ module Datadog
 
         def patch
           ::RSpec::Core::Example.send(:include, Example)
-          ::RSpec::Core::ExampleGroup.send(:include, ExampleGroup)
         end
       end
     end

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

@@ -30,12 +30,11 @@ module Datadog
 
           def parse_opts(sql, opts, db_opts, dataset = nil)
             # Prepared statements don't provide their sql query in the +sql+ parameter.
-            unless sql.is_a?(String)
-              if dataset && dataset.respond_to?(:prepared_sql) && (resolved_sql = dataset.prepared_sql)
-                # The dataset contains the resolved SQL query and prepared statement name.
-                prepared_name = dataset.prepared_statement_name
-                sql = resolved_sql
-              end
+            if !sql.is_a?(String) && (dataset && dataset.respond_to?(:prepared_sql) &&
+              (resolved_sql = dataset.prepared_sql))
+              # The dataset contains the resolved SQL query and prepared statement name.
+              prepared_name = dataset.prepared_statement_name
+              sql = resolved_sql
             end
 
             {

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

@@ -14,7 +14,6 @@ module Datadog
         def call(worker_instance, queue, sqs_msg, body)
           @tracer.trace(Ext::SPAN_JOB, service: @shoryuken_service, span_type: Datadog::Ext::AppTypes::WORKER,
                                        on_error: @error_handler) do |span|
-
             # Set analytics sample rate
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

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

@@ -22,7 +22,6 @@ module Datadog
 
           @tracer.trace(Ext::SPAN_JOB, service: service, span_type: Datadog::Ext::AppTypes::WORKER,
                                        on_error: @error_handler) do |span|
-
             span.resource = resource
             # Set analytics sample rate
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
@@ -38,9 +37,7 @@ module Datadog
             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))
-            if tag_args && !job['args'].nil? && !job['args'].empty?
-              span.set_tag(Ext::TAG_JOB_ARGS, job['args'])
-            end
+            span.set_tag(Ext::TAG_JOB_ARGS, job['args']) if tag_args && !job['args'].nil? && !job['args'].empty?
 
             yield
           end
@@ -60,9 +57,7 @@ module Datadog
             nil
           end
 
-          if worker_klass.respond_to?(:datadog_tracer_config)
-            worker_klass.datadog_tracer_config[key]
-          end
+          worker_klass.datadog_tracer_config[key] if worker_klass.respond_to?(:datadog_tracer_config)
         end
       end
     end

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

@@ -31,7 +31,6 @@ module Datadog
           job['class'].to_s
         end
 
-        #
         def delay_extension_class(job)
           clazz, method = YAML.parse(job['args'].first).children.first.children
 

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

@@ -23,9 +23,7 @@ module Datadog
           {}.tap do |result|
             headers.each do |header|
               rack_header = header_to_rack_header(header)
-              if env.key?(rack_header)
-                result[Datadog::Ext::HTTP::RequestHeaders.to_tag(header)] = env[rack_header]
-              end
+              result[Datadog::Ext::HTTP::RequestHeaders.to_tag(header)] = env[rack_header] if env.key?(rack_header)
             end
           end
         end

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

@@ -18,9 +18,7 @@ module Datadog
                 # Try a case-insensitive lookup
                 uppercased_header = header.to_s.upcase
                 matching_header = headers.keys.find { |h| h.upcase == uppercased_header }
-                if matching_header
-                  result[Datadog::Ext::HTTP::ResponseHeaders.to_tag(header)] = headers[matching_header]
-                end
+                result[Datadog::Ext::HTTP::ResponseHeaders.to_tag(header)] = headers[matching_header] if matching_header
               end
             end
           end

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

@@ -110,9 +110,7 @@ module Datadog
 
               span.set_tag(Ext::TAG_APP_NAME, settings.name || settings.superclass.name)
               span.set_tag(Ext::TAG_ROUTE_PATH, @datadog_route)
-              if request.script_name && !request.script_name.empty?
-                span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
-              end
+              span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name) if request.script_name && !request.script_name.empty?
 
               rack_request_span = env[Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
               rack_request_span.resource = span.resource if rack_request_span

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

@@ -15,6 +15,8 @@ module Datadog
 
         # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
         def call(env)
           # Set the trace context (e.g. distributed tracing)
           if configuration[:distributed_tracing] && tracer.provider.context.trace_id.nil?
@@ -40,9 +42,7 @@ module Datadog
               request = ::Sinatra::Request.new(env)
               span.set_tag(Datadog::Ext::HTTP::URL, request.path)
               span.set_tag(Datadog::Ext::HTTP::METHOD, request.request_method)
-              if request.script_name && !request.script_name.empty?
-                span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
-              end
+              span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name) if request.script_name && !request.script_name.empty?
 
               span.set_tag(Ext::TAG_APP_NAME, @app_instance.settings.name)
 

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

@@ -5,17 +5,17 @@ module Datadog
     module Sneakers
       # Sneakers integration constants
       module Ext
-        APP = 'sneakers'.freeze
-        ENV_ENABLED = 'DD_TRACE_SNEAKERS_ENABLED'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_TRACE_SNEAKERS_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_ENABLED_OLD = 'DD_SNEAKERS_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_SNEAKERS_ANALYTICS_SAMPLE_RATE'.freeze
-        SERVICE_NAME = 'sneakers'.freeze
-        SPAN_JOB = 'sneakers.job'.freeze
-        TAG_JOB_ROUTING_KEY = 'sneakers.routing_key'.freeze
-        TAG_JOB_QUEUE = 'sneakers.queue'.freeze
-        TAG_JOB_BODY = 'sneakers.body'.freeze
+        APP = 'sneakers'
+        ENV_ENABLED = 'DD_TRACE_SNEAKERS_ENABLED'
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_SNEAKERS_ANALYTICS_ENABLED'
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_SNEAKERS_ANALYTICS_ENABLED'
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SNEAKERS_ANALYTICS_SAMPLE_RATE'
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_SNEAKERS_ANALYTICS_SAMPLE_RATE'
+        SERVICE_NAME = 'sneakers'
+        SPAN_JOB = 'sneakers.job'
+        TAG_JOB_ROUTING_KEY = 'sneakers.routing_key'
+        TAG_JOB_QUEUE = 'sneakers.queue'
+        TAG_JOB_BODY = 'sneakers.body'
       end
     end
   end

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

@@ -14,7 +14,7 @@ module Datadog
 
         def call(deserialized_msg, delivery_info, metadata, handler)
           trace_options = {
-            service:   configuration[:service_name],
+            service: configuration[:service_name],
             span_type: Datadog::Ext::AppTypes::WORKER,
             on_error: configuration[:error_handler]
           }
@@ -32,9 +32,7 @@ module Datadog
             request_span.set_tag(Ext::TAG_JOB_ROUTING_KEY, delivery_info.routing_key)
             request_span.set_tag(Ext::TAG_JOB_QUEUE, delivery_info.consumer.queue.name)
 
-            if configuration[:tag_body]
-              request_span.set_tag(Ext::TAG_JOB_BODY, deserialized_msg)
-            end
+            request_span.set_tag(Ext::TAG_JOB_BODY, deserialized_msg) if configuration[:tag_body]
 
             @app.call(deserialized_msg, delivery_info, metadata, handler)
           end

data/lib/ddtrace/contrib/status_code_matcher.rb

@@ -5,7 +5,7 @@ module Datadog
   module Contrib
     # Contains methods helpful for tracing/annotating HTTP request libraries
     class StatusCodeMatcher
-      REGEX_PARSER = /^\d{3}(?:-\d{3})?(?:,\d{3}(?:-\d{3})?)*$/
+      REGEX_PARSER = /^\d{3}(?:-\d{3})?(?:,\d{3}(?:-\d{3})?)*$/.freeze
 
       def initialize(range)
         @error_response_range = range
@@ -27,9 +27,10 @@ module Datadog
           set = Set.new
           handle_statuses.each do |statuses|
             status = statuses.to_s.split('-')
-            if status.length == 1
+            case status.length
+            when 1
               set.add(Integer(status[0]))
-            elsif status.length == 2
+            when 2
               min, max = status.minmax
               Array(min..max).each do |i|
                 set.add(Integer(i))
@@ -43,6 +44,7 @@ module Datadog
 
       def error_responses
         return @error_response_range if @error_response_range.is_a?(String) && !@error_response_range.nil?
+
         @error_response_range.join(',') if @error_response_range.is_a?(Array) && !@error_response_range.empty?
       end
 

data/lib/ddtrace/correlation.rb

@@ -32,6 +32,7 @@ module Datadog
     # Produces a CorrelationIdentifier from the Context provided
     def identifier_from_context(context)
       return Identifier.new.freeze if context.nil?
+
       Identifier.new(context.trace_id, context.span_id).freeze
     end
   end

data/lib/ddtrace/diagnostics/environment_logger.rb

@@ -7,13 +7,13 @@ module Datadog
     # A holistic collection of the environment in which ddtrace is running.
     # This logger should allow for easy reporting by users to Datadog support.
     #
-    # rubocop:disable Style/DoubleNegation
     module EnvironmentLogger
       class << self
         # Outputs environment information to {Datadog.logger}.
         # Executes only for the lifetime of the program.
         def log!(transport_responses)
           return if @executed || !log?
+
           @executed = true
 
           data = EnvironmentCollector.new.collect!(transport_responses)
@@ -165,6 +165,7 @@ module Datadog
       def tags
         tags = Datadog.configuration.tags
         return nil if tags.empty?
+
         hash_serializer(tags)
       end
 

data/lib/ddtrace/distributed_tracing/headers/headers.rb

@@ -36,6 +36,7 @@ module Datadog
 
           # Zero or greater than max allowed value of 2**64
           return if id.zero? || id > Span::EXTERNAL_MAX_ID
+
           id < 0 ? id + (2**64) : id
         end
 

data/lib/ddtrace/distributed_tracing/headers/helpers.rb

@@ -35,9 +35,7 @@ module Datadog
           #      for us so we want to make sure the comparision will work as expected
           # DEV: regex, remove all leading zeros up until we find the last 0 in the string
           #      or we find the first non-zero, this allows `'0000' -> '0'` and `'00001' -> '1'`
-          value = value.sub(/^0*(?=(0$)|[^0])/, '')
-
-          value
+          value.sub(/^0*(?=(0$)|[^0])/, '')
         end
       end
     end

data/lib/ddtrace/ext/ci.rb

@@ -75,7 +75,7 @@ module Datadog
 
         {
           TAG_PROVIDER_NAME => 'appveyor',
-          Git::TAG_REPOSITORY_URL =>  repository,
+          Git::TAG_REPOSITORY_URL => repository,
           Git::TAG_COMMIT_SHA => commit,
           TAG_WORKSPACE_PATH => env['APPVEYOR_BUILD_FOLDER'],
           TAG_PIPELINE_ID => env['APPVEYOR_BUILD_ID'],
@@ -260,7 +260,7 @@ module Datadog
         {
           Git::TAG_BRANCH => (env['TRAVIS_PULL_REQUEST_BRANCH'] || env['TRAVIS_BRANCH']),
           Git::TAG_COMMIT_SHA => env['TRAVIS_COMMIT'],
-          Git::TAG_REPOSITORY_URL =>  "https://github.com/#{env['TRAVIS_REPO_SLUG']}.git",
+          Git::TAG_REPOSITORY_URL => "https://github.com/#{env['TRAVIS_REPO_SLUG']}.git",
           Git::TAG_TAG => env['TRAVIS_TAG'],
           TAG_JOB_URL => env['TRAVIS_JOB_WEB_URL'],
           TAG_PIPELINE_ID => env['TRAVIS_BUILD_ID'],

data/lib/ddtrace/ext/distributed.rb

@@ -22,7 +22,7 @@ module Datadog
       PROPAGATION_STYLE_B3_SINGLE_HEADER = 'B3 single header'.freeze
       PROPAGATION_STYLE_INJECT_ENV = 'DD_PROPAGATION_STYLE_INJECT'.freeze
       PROPAGATION_STYLE_EXTRACT_ENV = 'DD_PROPAGATION_STYLE_EXTRACT'.freeze
-      # Note: the below inject/extract values are deprecated and were defined erronously
+      # NOTE: the below inject/extract values are deprecated and were defined erronously
       # they were never part of the datadog language client standard or documentation
       # some users may already be relying on them, but we should look to remove these in the future
       # or before 1.0.

data/lib/ddtrace/ext/http.rb

@@ -2,7 +2,7 @@ module Datadog
   module Ext
     module HTTP
       BASE_URL = 'http.base_url'.freeze
-      ERROR_RANGE = 500...600
+      ERROR_RANGE = (500...600).freeze
       METHOD = 'http.method'.freeze
       STATUS_CODE = 'http.status_code'.freeze
       TEMPLATE = 'template'.freeze

data/lib/ddtrace/ext/runtime.rb

@@ -5,7 +5,9 @@ module Datadog
     module Runtime
       # Identity
       LANG = 'ruby'.freeze
-      LANG_INTERPRETER = (RUBY_ENGINE + '-' + RUBY_PLATFORM).freeze
+      LANG_ENGINE = RUBY_ENGINE
+      LANG_INTERPRETER = "#{RUBY_ENGINE}-#{RUBY_PLATFORM}".freeze
+      LANG_PLATFORM = RUBY_PLATFORM
       LANG_VERSION = RUBY_VERSION
       RUBY_ENGINE =  ::RUBY_ENGINE # e.g. 'ruby', 'jruby', 'truffleruby'
       TRACER_VERSION = Datadog::VERSION::STRING