datadog 2.12.0 → 2.22.0

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

@@ -55,59 +55,57 @@ module Datadog
                 service: service,
                 on_error: on_error
               ) do |span|
-                begin
-                  connection = transport.connections.first
-                  host = connection.host[:host] if connection
-                  port = connection.host[:port] if connection
-
-                  if datadog_configuration[:peer_service]
-                    span.set_tag(
-                      Tracing::Metadata::Ext::TAG_PEER_SERVICE,
-                      datadog_configuration[:peer_service]
-                    )
-                  end
-
-                  # Tag original global service name if not used
-                  if span.service != Datadog.configuration.service
-                    span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                  end
-
-                  span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
-
-                  span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                  span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
-                  span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
-
-                  span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
-
-                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
-
-                  # Set analytics sample rate
-                  if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
-                    Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
-                  end
-
-                  span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
-                  tag_params(params, span)
-                  tag_body(body, span)
-                  span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
-                  span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
-                  span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
-
-                  quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
-                  span.resource = "#{method} #{quantized_url}"
-                  Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-                rescue StandardError => e
-                  # TODO: Refactor the code to streamline the execution without ensure
-                  Datadog.logger.error(e.message)
-                  Datadog::Core::Telemetry::Logger.report(e)
-                ensure
-                  # the call is still executed
-                  response = super
-
-                  if response && response.respond_to?(:status)
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
-                  end
+                connection = transport.connections.first
+                host = connection.host[:host] if connection
+                port = connection.host[:port] if connection
+
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_service]
+                  )
+                end
+
+                # Tag original global service name if not used
+                if span.service != Datadog.configuration.service
+                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
+                end
+
+                span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
+                span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
+                end
+
+                span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_METHOD, method)
+                tag_params(params, span)
+                tag_body(body, span)
+                span.set_tag(Datadog::Tracing::Contrib::Elasticsearch::Ext::TAG_URL, url)
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, host) if host
+                span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port) if port
+
+                quantized_url = Datadog::Tracing::Contrib::Elasticsearch::Quantize.format_url(url)
+                span.resource = "#{method} #{quantized_url}"
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+              rescue => e
+                # TODO: Refactor the code to streamline the execution without ensure
+                Datadog.logger.error(e.message)
+                Datadog::Core::Telemetry::Logger.report(e)
+              ensure
+                # the call is still executed
+                response = super
+
+                if response&.respond_to?(:status)
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                 end
               end
               response

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

@@ -27,7 +27,7 @@ module Datadog
 
           def format_body(body, options = {})
             format_body!(body, options)
-          rescue StandardError
+          rescue
             options[:placeholder] || PLACEHOLDER
           end
 
@@ -50,10 +50,10 @@ module Datadog
               # Show
               # If either is :all, value becomes :all
               options[:show] = if original[:show] == :all || additional[:show] == :all
-                                 :all
-                               else
-                                 (original[:show] || []).dup.concat(additional[:show] || []).uniq
-                               end
+                :all
+              else
+                (original[:show] || []).dup.concat(additional[:show] || []).uniq
+              end
 
               # Exclude
               options[:exclude] = (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq

data/lib/datadog/tracing/contrib/ethon/easy_patch.rb

@@ -97,7 +97,7 @@ module Datadog
             def datadog_before_request(continue_from: nil)
               load_datadog_configuration_for(url)
 
-              trace_options = continue_from ? { continue_from: continue_from } : {}
+              trace_options = continue_from ? {continue_from: continue_from} : {}
               uri = try_parse_uri
 
               @datadog_span = Tracing.trace(
@@ -110,11 +110,10 @@ module Datadog
 
               datadog_tag_request
 
-              if Datadog::AppSec::Utils::TraceOperation.appsec_standalone_reject?(datadog_trace)
-                datadog_trace.sampling_priority = Tracing::Sampling::Ext::Priority::AUTO_REJECT
-              end
-
-              if datadog_configuration[:distributed_tracing]
+              if Tracing::Distributed::PropagationPolicy.enabled?(
+                global_config: datadog_configuration,
+                trace: datadog_trace
+              )
                 @datadog_original_headers ||= {}
                 Contrib::HTTP.inject(datadog_trace, @datadog_original_headers)
                 self.headers = @datadog_original_headers
@@ -216,7 +215,7 @@ module Datadog
               # Find only well-behaved HTTP headers.
               lines.map do |line|
                 header = line.split(':', 2)
-                header.size != 2 ? nil : header
+                (header.size != 2) ? nil : header
               end.compact.to_h
             end
           end

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

@@ -21,10 +21,11 @@ module Datadog
           TAG_COMPONENT = 'ethon'
           TAG_OPERATION_REQUEST = 'request'
           TAG_OPERATION_MULTI_REQUEST = 'multi.request'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :ethon
 
           def self.version
-            Gem.loaded_specs['ethon'] && Gem.loaded_specs['ethon'].version
+            Gem.loaded_specs['ethon']&.version
           end
 
           def self.loaded?

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

@@ -19,10 +19,11 @@ module Datadog
           SPAN_REQUEST = 'excon.request'
           TAG_COMPONENT = 'excon'
           TAG_OPERATION_REQUEST = 'request'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :excon
 
           def self.version
-            Gem.loaded_specs['excon'] && Gem.loaded_specs['excon'].version
+            Gem.loaded_specs['excon']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/excon/middleware.rb

@@ -30,14 +30,16 @@ module Datadog
                 trace = Tracing.active_trace
                 datum[:datadog_span] = span
                 annotate!(span, datum)
-                if Datadog::AppSec::Utils::TraceOperation.appsec_standalone_reject?(trace)
-                  trace.sampling_priority = Tracing::Sampling::Ext::Priority::AUTO_REJECT
+                if Tracing::Distributed::PropagationPolicy.enabled?(
+                  global_config: @options,
+                  trace: trace
+                )
+                  propagate!(trace, span, datum)
                 end
-                propagate!(trace, span, datum) if distributed_tracing?
 
                 span
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
 
@@ -177,7 +179,7 @@ module Datadog
                 datum.delete(:datadog_span)
               end
             end
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug(e.message)
           end
 

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

@@ -26,7 +26,7 @@ module Datadog
           TAG_SYSTEM = 'db.system'
           TAG_STATEMENT = 'db.statement'
           TAG_ROW_COUNT = 'db.row_count'
-          PEER_SERVICE_SOURCES = Array[TAG_INSTANCE,
+          PEER_SERVICE_SOURCES = [TAG_INSTANCE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -36,7 +36,7 @@ module Datadog
           TAG_SYSTEM = 'rpc.system'
           TAG_SERVICE = 'rpc.service'
           TAG_METHOD = 'rpc.method'
-          PEER_SERVICE_SOURCES = Array[TAG_SERVICE,
+          PEER_SERVICE_SOURCES = [TAG_SERVICE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
@@ -48,7 +48,8 @@ module Datadog
 
         module Messaging
           TAG_SYSTEM = 'messaging.system'
-          PEER_SERVICE_SOURCES = Array[Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+          TAG_DESTINATION = 'messaging.destination'
+          PEER_SERVICE_SOURCES = [Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end

data/lib/datadog/tracing/contrib/extensions.rb

@@ -63,17 +63,17 @@ module Datadog
           # TODO: We should promote most of this logic to core parts of datadog.
           def configure(&block)
             # Reconfigure core settings
-            super(&block)
+            super
 
             # Activate integrations
             configuration = self.configuration.tracing
 
             if configuration.respond_to?(:integrations_pending_activation)
               ignore_integration_load_errors = if configuration.respond_to?(:ignore_integration_load_errors?)
-                                                 configuration.ignore_integration_load_errors?
-                                               else
-                                                 false
-                                               end
+                configuration.ignore_integration_load_errors?
+              else
+                false
+              end
 
               configuration.integrations_pending_activation.each do |integration|
                 next unless integration.respond_to?(:patch)
@@ -85,9 +85,9 @@ module Datadog
 
                 # if patching failed, only log output if verbosity is unset
                 # or if patching failure is due to compatibility or integration specific reasons
-                next unless !ignore_integration_load_errors ||
-                  ((patch_results[:available] && patch_results[:loaded]) &&
-                  (!patch_results[:compatible] || !patch_results[:patchable]))
+                next if ignore_integration_load_errors &&
+                  (!patch_results[:available] || !patch_results[:loaded] ||
+                  (patch_results[:compatible] && patch_results[:patchable]))
 
                 desc = "Available?: #{patch_results[:available]}"
                 desc += ", Loaded? #{patch_results[:loaded]}"
@@ -208,7 +208,7 @@ module Datadog
             # @return [Datadog::Tracing::Contrib::Configuration::Settings]
             def [](integration_name, key = :default)
               integration = fetch_integration(integration_name)
-              integration.resolve(key) unless integration.nil?
+              integration&.resolve(key)
             end
 
             # @!visibility private

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

@@ -19,10 +19,11 @@ module Datadog
           SPAN_REQUEST = 'faraday.request'
           TAG_COMPONENT = 'faraday'
           TAG_OPERATION_REQUEST = 'request'
-          PEER_SERVICE_SOURCES = Array[
+          PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,
+          ].freeze
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :faraday, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['faraday'] && Gem.loaded_specs['faraday'].version
+            Gem.loaded_specs['faraday']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/faraday/middleware.rb

@@ -29,10 +29,12 @@ module Datadog
 
             Tracing.trace(Ext::SPAN_REQUEST, on_error: request_options[:on_error]) do |span, trace|
               annotate!(span, env, request_options)
-              if Datadog::AppSec::Utils::TraceOperation.appsec_standalone_reject?(trace)
-                trace.sampling_priority = Tracing::Sampling::Ext::Priority::AUTO_REJECT
+              if Tracing::Distributed::PropagationPolicy.enabled?(
+                global_config: request_options,
+                trace: trace
+              )
+                propagate!(trace, span, env)
               end
-              propagate!(trace, span, env) if request_options[:distributed_tracing] && Tracing.enabled?
               app.call(env).on_complete { |resp| handle_response(span, resp, request_options) }
             end
           end
@@ -80,12 +82,13 @@ module Datadog
             )
 
             Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.error(e.message)
             Datadog::Core::Telemetry::Logger.report(e)
           end
           # rubocop:enable Metrics/AbcSize
 
+          # rubocop:disable Metrics/AbcSize
           def handle_response(span, env, options)
             span.set_error(["Error #{env[:status]}", env[:body]]) if options[:error_status_codes].include? env[:status]
 
@@ -94,10 +97,11 @@ module Datadog
             span.set_tags(
               Datadog.configuration.tracing.header_tags.response_tags(env[:response_headers])
             )
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.error(e.message)
             Datadog::Core::Telemetry::Logger.report(e)
           end
+          # rubocop:enable Metrics/AbcSize
 
           def propagate!(trace, span, env)
             Contrib::HTTP.inject(trace, env[:request_headers])

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -76,7 +76,7 @@ module Datadog
               end
 
               Thread.current[KEY_RUN] = true
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -120,7 +120,7 @@ module Datadog
                 span.start(start)
                 span.finish(finish)
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -164,7 +164,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RENDER)
 
               Thread.current[KEY_RENDER] = true
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -189,7 +189,7 @@ module Datadog
                 span.start(start)
                 span.finish(finish)
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -228,7 +228,7 @@ module Datadog
                 span.start(start)
                 span.finish(finish)
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -265,7 +265,7 @@ module Datadog
 
             def endpoint_expand_path(endpoint)
               route_path = endpoint.options[:path]
-              namespace = endpoint.routes.first && endpoint.routes.first.namespace || ''
+              namespace = endpoint.routes.first&.namespace || ''
 
               path = (namespace.split('/') + route_path)
                 .reject { |p| p.blank? || p.eql?('/') }
@@ -297,11 +297,11 @@ module Datadog
               matcher = datadog_configuration[:error_statuses]
               return true unless matcher
 
-              matcher.include?(status) if matcher
+              matcher&.include?(status)
             end
 
             def enabled?
-              Datadog.configuration.tracing.enabled && \
+              Datadog.configuration.tracing.enabled &&
                 datadog_configuration[:enabled] == true
             end
 

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :grape, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['grape'] && Gem.loaded_specs['grape'].version
+            Gem.loaded_specs['grape']&.version
           end
 
           def self.loaded?

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

@@ -58,6 +58,13 @@ module Datadog
               o.default []
               o.env_parser { |v| ErrorExtensionEnvParser.call(v) }
             end
+
+            # Surface GraphQL errors in Error Tracking.
+            option :error_tracking do |o|
+              o.env Ext::ENV_ERROR_TRACKING
+              o.type :bool
+              o.default false
+            end
           end
         end
       end

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

@@ -13,6 +13,7 @@ module Datadog
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPHQL_ANALYTICS_SAMPLE_RATE'
           ENV_WITH_UNIFIED_TRACER = 'DD_TRACE_GRAPHQL_WITH_UNIFIED_TRACER'
           ENV_ERROR_EXTENSIONS = 'DD_TRACE_GRAPHQL_ERROR_EXTENSIONS'
+          ENV_ERROR_TRACKING = 'DD_TRACE_GRAPHQL_ERROR_TRACKING'
           SERVICE_NAME = 'graphql'
           TAG_COMPONENT = 'graphql'
 

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

@@ -16,7 +16,7 @@ module Datadog
           register_as :graphql, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version
+            Gem.loaded_specs['graphql']&.version
           end
 
           def self.loaded?

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

@@ -36,8 +36,8 @@ module Datadog
               end
             else
               Datadog.logger.warn(
-                "GraphQL version (#{target_version}) does not support GraphQL::Tracing::DataDogTrace"\
-                'or Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.'\
+                "GraphQL version (#{target_version}) does not support GraphQL::Tracing::DataDogTrace" \
+                'or Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.' \
                 'Falling back to GraphQL::Tracing::DataDogTracing.'
               )
               TracingPatcher.patch!(schemas)