datadog 2.19.0 → 2.20.0

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

@@ -11,6 +11,7 @@ module Datadog
         ENV_ENABLED = 'DD_TRACE_ENABLED'
         ENV_OTEL_TRACES_EXPORTER = 'OTEL_TRACES_EXPORTER'
         ENV_HEADER_TAGS = 'DD_TRACE_HEADER_TAGS'
+        ENV_BAGGAGE_TAG_KEYS = 'DD_TRACE_BAGGAGE_TAG_KEYS'
         ENV_TRACE_ID_128_BIT_GENERATION_ENABLED = 'DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED'
         ENV_NATIVE_SPAN_EVENTS = 'DD_TRACE_NATIVE_SPAN_EVENTS'
 
@@ -47,8 +48,8 @@ module Datadog
           PROPAGATION_STYLE_BAGGAGE = 'baggage'
 
           PROPAGATION_STYLE_SUPPORTED = [PROPAGATION_STYLE_DATADOG, PROPAGATION_STYLE_B3_MULTI_HEADER,
-                                         PROPAGATION_STYLE_B3_SINGLE_HEADER, PROPAGATION_STYLE_TRACE_CONTEXT,
-                                         PROPAGATION_STYLE_BAGGAGE].freeze
+            PROPAGATION_STYLE_B3_SINGLE_HEADER, PROPAGATION_STYLE_TRACE_CONTEXT,
+            PROPAGATION_STYLE_BAGGAGE].freeze
 
           # Sets both extract and inject propagation style tho the provided value.
           # Has lower precedence than `DD_TRACE_PROPAGATION_STYLE_INJECT` or

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

@@ -170,6 +170,23 @@ module Datadog
                 o.setter { |header_tags, _| Configuration::HTTP::HeaderTags.new(header_tags) }
               end
 
+              # Comma-separated list of baggage keys that should be converted to span tags.
+              #
+              # Baggage keys matching the exact, case-sensitive names in this list will be converted
+              # to span tags with the prefix "baggage.".
+              #
+              # Special values:
+              # * Empty string ("") disables baggage tag conversion
+              # * Wildcard ("*") converts all baggage keys to span tags
+              #
+              # @default `DD_TRACE_BAGGAGE_TAG_KEYS` environment variable, otherwise `"user.id,session.id,account.id"`
+              # @return [Array<String>, Symbol, nil] processed baggage tag keys configuration
+              option :baggage_tag_keys do |o|
+                o.env Configuration::Ext::ENV_BAGGAGE_TAG_KEYS
+                o.type :array
+                o.default ['user.id', 'session.id', 'account.id']
+              end
+
               # Enable 128 bit trace id generation.
               #
               # @default `DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED` environment variable, otherwise `true`

data/lib/datadog/tracing/context.rb

@@ -53,7 +53,7 @@ module Datadog
 
       # Creates a copy of the context, when forked.
       def fork_clone
-        forked_trace = @active_trace && @active_trace.fork_clone
+        forked_trace = @active_trace&.fork_clone
         self.class.new(trace: forked_trace)
       end
 
@@ -61,7 +61,7 @@ module Datadog
 
       def set_active_trace!(trace)
         # Don't retain finished traces
-        @active_trace = trace && !trace.finished? ? trace : nil
+        @active_trace = (trace && !trace.finished?) ? trace : nil
       end
     end
   end

data/lib/datadog/tracing/contrib/action_cable/event.rb

@@ -20,7 +20,7 @@ module Datadog
           module ClassMethods
             def span_options
               if configuration[:service_name]
-                { service: configuration[:service_name] }
+                {service: configuration[:service_name]}
               else
                 {}
               end

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

@@ -22,7 +22,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actioncable'] && Gem.loaded_specs['actioncable'].version
+            Gem.loaded_specs['actioncable']&.version
           end
 
           def self.loaded?

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

@@ -23,7 +23,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actionmailer'] && Gem.loaded_specs['actionmailer'].version
+            Gem.loaded_specs['actionmailer']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb

@@ -42,7 +42,7 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CONTROLLER)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -87,7 +87,7 @@ module Datadog
               ensure
                 span.finish
               end
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end
@@ -115,7 +115,7 @@ module Datadog
                 begin
                   # process and catch request exceptions
                   Instrumentation.start_processing(payload)
-                  result = super(*args)
+                  result = super
                   status = datadog_response_status
                   payload[:status] = status unless status.nil?
                   result
@@ -146,7 +146,7 @@ module Datadog
                 when Array
                   # Likely a Rack response array: first element is the status.
                   status = response.first
-                  status.class <= Integer ? status : nil
+                  (status.class <= Integer) ? status : nil
                 end
               end
             end

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

@@ -23,7 +23,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['actionpack'] && Gem.loaded_specs['actionpack'].version
+            Gem.loaded_specs['actionpack']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/action_view/events/render_template.rb

@@ -46,7 +46,7 @@ module Datadog
               Contrib::Analytics.set_measured(span)
 
               record_exception(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/event.rb

@@ -29,10 +29,10 @@ module Datadog
 
             def set_common_tags(span, payload)
               adapter_name = if payload[:adapter].is_a?(Class)
-                               payload[:adapter].name
-                             else
-                               payload[:adapter].class.name
-                             end
+                payload[:adapter].name
+              else
+                payload[:adapter].class.name
+              end
               span.set_tag(Ext::TAG_ADAPTER, adapter_name)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -44,10 +44,10 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_EXECUTIONS, job.executions) if job.respond_to?(:executions)
 
               job_scheduled_at = if job.respond_to?(:scheduled_at)
-                                   job.scheduled_at
-                                 elsif job.respond_to?(:enqueued_at)
-                                   job.enqueued_at
-                                 end
+                job.scheduled_at
+              elsif job.respond_to?(:enqueued_at)
+                job.enqueued_at
+              end
               span.set_tag(Ext::TAG_JOB_SCHEDULED_AT, Time.at(job_scheduled_at)) if job_scheduled_at
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/discard.rb

@@ -39,7 +39,7 @@ module Datadog
 
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb

@@ -40,7 +40,7 @@ module Datadog
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
               span.set_tag(Ext::TAG_JOB_RETRY_WAIT, payload[:wait])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/perform.rb

@@ -38,7 +38,7 @@ module Datadog
               end
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb

@@ -39,7 +39,7 @@ module Datadog
 
               set_common_tags(span, payload)
               span.set_tag(Ext::TAG_JOB_ERROR, payload[:error])
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -22,7 +22,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activejob'] && Gem.loaded_specs['activejob'].version
+            Gem.loaded_specs['activejob']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb

@@ -34,7 +34,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb

@@ -18,9 +18,9 @@ module Datadog
 
             def supported?
               Gem.loaded_specs['active_model_serializers'] \
-                && ( \
+                && (
                   Gem.loaded_specs['active_model_serializers'].version >= Gem::Version.new('0.9') \
-                  && Gem.loaded_specs['active_model_serializers'].version < Gem::Version.new('0.10') \
+                  && Gem.loaded_specs['active_model_serializers'].version < Gem::Version.new('0.10')
                 )
             end
 
@@ -36,7 +36,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERIALIZE)
 
               set_common_tags(span, payload)
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(e.message)
             end
           end

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

@@ -18,8 +18,7 @@ module Datadog
           register_as :active_model_serializers
 
           def self.version
-            Gem.loaded_specs['active_model_serializers'] \
-              && Gem.loaded_specs['active_model_serializers'].version
+            Gem.loaded_specs['active_model_serializers']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb

@@ -75,7 +75,7 @@ module Datadog
               # hence provide a succinct summary for the error logging.
               #
               Datadog.logger.error(
-                'Failed to resolve ActiveRecord database configuration. '\
+                'Failed to resolve ActiveRecord database configuration. ' \
                 "Cause: #{e.class.name} Source: #{Array(e.backtrace).first}"
               )
               Core::Telemetry::Logger.report(e, description: 'Failed to resolve ActiveRecord database configuration')

data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb

@@ -48,7 +48,7 @@ module Datadog
 
               span.set_tag(Ext::TAG_INSTANTIATION_CLASS_NAME, payload.fetch(:class_name))
               span.set_tag(Ext::TAG_INSTANTIATION_RECORD_COUNT, payload.fetch(:record_count))
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end

data/lib/datadog/tracing/contrib/active_record/events/sql.rb

@@ -35,10 +35,10 @@ module Datadog
               settings = Datadog.configuration.tracing[:active_record, config]
               adapter_name = Contrib::Utils::Database.normalize_vendor(config[:adapter])
               service_name = if settings.service_name != Contrib::Utils::Database::VENDOR_DEFAULT
-                               settings.service_name
-                             else
-                               adapter_name
-                             end
+                settings.service_name
+              else
+                adapter_name
+              end
 
               span.name = "#{adapter_name}.query"
               span.service = service_name
@@ -68,7 +68,7 @@ module Datadog
               span.set_tag(Ext::TAG_DB_CACHED, cached) if cached
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, config[:host]) if config[:host]
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, config[:port]) if config[:port]
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.error(e.message)
               Datadog::Core::Telemetry::Logger.report(e)
             end

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

@@ -27,7 +27,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activerecord'] && Gem.loaded_specs['activerecord'].version
+            Gem.loaded_specs['activerecord']&.version
           end
 
           def self.loaded?

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

@@ -39,17 +39,17 @@ module Datadog
             return default_connection_config if connection.nil? && connection_id.nil?
 
             conn = if !connection.nil?
-                     # Since Rails 6.0, the connection object
-                     # is directly available.
-                     connection
-                   else
-                     # For Rails < 6.0, only the `connection_id`
-                     # is available. We have to find the connection
-                     # object from it.
-                     connection_from_id(connection_id)
-                   end
+              # Since Rails 6.0, the connection object
+              # is directly available.
+              connection
+            else
+              # For Rails < 6.0, only the `connection_id`
+              # is available. We have to find the connection
+              # object from it.
+              connection_from_id(connection_id)
+            end
 
-            if conn && conn.instance_variable_defined?(:@config)
+            if conn&.instance_variable_defined?(:@config)
               conn.instance_variable_get(:@config)
             else
               EMPTY_CONFIG
@@ -102,14 +102,14 @@ module Datadog
             return @default_connection_config if instance_variable_defined?(:@default_connection_config)
 
             current_connection_name = if ::ActiveRecord::Base.respond_to?(:connection_specification_name)
-                                        ::ActiveRecord::Base.connection_specification_name
-                                      else
-                                        ::ActiveRecord::Base
-                                      end
+              ::ActiveRecord::Base.connection_specification_name
+            else
+              ::ActiveRecord::Base
+            end
 
             connection_pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(current_connection_name)
             connection_pool.nil? ? EMPTY_CONFIG : (@default_connection_config = db_config(connection_pool))
-          rescue StandardError
+          rescue
             EMPTY_CONFIG
           end
 

data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb

@@ -38,11 +38,11 @@ module Datadog
 
               # DEV: Look for other uses of `ActiveSupport::Cache::Store#instrument`, to find other useful event keys.
               MAPPING = {
-                'cache_delete.active_support' => { resource: Ext::RESOURCE_CACHE_DELETE },
-                'cache_read.active_support' => { resource: Ext::RESOURCE_CACHE_GET },
-                'cache_read_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MGET, multi_key: true },
-                'cache_write.active_support' => { resource: Ext::RESOURCE_CACHE_SET },
-                'cache_write_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MSET, multi_key: true }
+                'cache_delete.active_support' => {resource: Ext::RESOURCE_CACHE_DELETE},
+                'cache_read.active_support' => {resource: Ext::RESOURCE_CACHE_GET},
+                'cache_read_multi.active_support' => {resource: Ext::RESOURCE_CACHE_MGET, multi_key: true},
+                'cache_write.active_support' => {resource: Ext::RESOURCE_CACHE_SET},
+                'cache_write_multi.active_support' => {resource: Ext::RESOURCE_CACHE_MSET, multi_key: true}
               }.freeze
 
               def trace?(event, payload)
@@ -93,7 +93,7 @@ module Datadog
                 if Datadog.configuration.tracing[:active_support][:cache_key].enabled
                   set_cache_key(span, key, mapping[:multi_key])
                 end
-              rescue StandardError => e
+              rescue => e
                 Datadog.logger.error(e.message)
                 Datadog::Core::Telemetry::Logger.report(e)
               end

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

@@ -24,7 +24,7 @@ module Datadog
           end
 
           def self.version
-            Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version
+            Gem.loaded_specs['activesupport']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/active_support/notifications/event.rb

@@ -67,7 +67,8 @@ module Datadog
                   payload[:exception] # Fallback for ActiveSupport < 5.0
               end
 
-              def on_start(_span, _event, _id, _payload); end
+              def on_start(_span, _event, _id, _payload)
+              end
 
               def on_finish(span, _event, _id, payload)
                 record_exception(span, payload)

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -122,8 +122,8 @@ module Datadog
               end
 
               def run(span, name, id, payload)
-                @block.call(span, name, id, payload) if @block
-              rescue StandardError => e
+                @block&.call(span, name, id, payload)
+              rescue => e
                 Datadog.logger.debug(
                   "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
                 )
@@ -144,13 +144,11 @@ module Datadog
 
               def run(event, key, *args)
                 blocks_for(key).each do |callback|
-                  begin
-                    callback.call(event, key, *args)
-                  rescue StandardError => e
-                    Datadog.logger.debug(
-                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
-                    )
-                  end
+                  callback.call(event, key, *args)
+                rescue => e
+                  Datadog.logger.debug(
+                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
+                  )
                 end
               end
 

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

@@ -33,7 +33,7 @@ module Datadog
           TAG_RULE_NAME = 'rulename'
           TAG_STATE_MACHINE_NAME = 'statemachinename'
           TAG_BUCKET_NAME = 'bucketname'
-          PEER_SERVICE_SOURCES = Array[TAG_QUEUE_NAME,
+          PEER_SERVICE_SOURCES = [TAG_QUEUE_NAME,
             TAG_TOPIC_NAME,
             TAG_STREAM_NAME,
             TAG_TABLE_NAME,

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

@@ -87,7 +87,7 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, context.safely(:status_code))
 
             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
@@ -123,7 +123,7 @@ module Datadog
               request.handlers.remove(Handler)
             end
 
-            super(*args, &block)
+            super
           end
 
           ruby2_keywords :sign_but_dont_send if respond_to?(:ruby2_keywords, true)

data/lib/datadog/tracing/contrib/aws/parsed_context.rb

@@ -11,7 +11,9 @@ module Datadog
           end
 
           def safely(attr, fallback = nil)
-            public_send(attr) rescue fallback
+            public_send(attr)
+          rescue
+            fallback
           end
 
           def resource

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

@@ -43,7 +43,11 @@ module Datadog
             available_services.each_with_object([]) do |service, constants|
               next if ::Aws.autoload?(service)
 
-              constants << ::Aws.const_get(service, false).const_get(:Client, false) rescue next
+              begin
+                constants << ::Aws.const_get(service, false).const_get(:Client, false)
+              rescue
+                next
+              end
             end
           end
 

data/lib/datadog/tracing/contrib/aws/service/base.rb

@@ -7,7 +7,8 @@ module Datadog
         module Service
           # Base class for all AWS service-specific tag handlers.
           class Base
-            def add_tags(span, params); end
+            def add_tags(span, params)
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/aws/service/dynamodb.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/eventbridge.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/kinesis.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/s3.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/sns.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/sqs.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/service/states.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative './base'
+require_relative 'base'
 require_relative '../ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/aws/services.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative './service/sqs'
-require_relative './service/sns'
-require_relative './service/dynamodb'
-require_relative './service/kinesis'
-require_relative './service/eventbridge'
-require_relative './service/states'
-require_relative './service/s3'
+require_relative 'service/sqs'
+require_relative 'service/sns'
+require_relative 'service/dynamodb'
+require_relative 'service/kinesis'
+require_relative 'service/eventbridge'
+require_relative 'service/states'
+require_relative 'service/s3'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/concurrent_ruby/async_patch.rb

@@ -9,7 +9,7 @@ module Datadog
         # This patches the Async - to wrap executor service using ContextCompositeExecutorService
         module AsyncPatch
           def initialize(delegate)
-            super(delegate)
+            super
 
             @executor = ContextCompositeExecutorService.new(@executor)
           end