datadog 2.36.0 → 2.40.0

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -13,12 +13,12 @@ module Datadog
           include Contrib::Integration
 
           # WaterDrop added class-level instrumentation in version 2.8.8.rc1
-          MINIMUM_VERSION = Gem::Version.new('2.8.8.rc1')
+          MINIMUM_VERSION = Gem::Version.new("2.8.8.rc1")
 
           register_as :waterdrop, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['waterdrop']&.version
+            Gem.loaded_specs["waterdrop"]&.version
           end
 
           def self.loaded?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -21,7 +21,7 @@ module Datadog
 
               if Datadog::DataStreams.enabled?
                 Datadog::DataStreams.set_produce_checkpoint(
-                  type: 'kafka',
+                  type: "kafka",
                   destination: message[:topic],
                   auto_instrumentation: true
                 ) do |key, value|

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'distributed/propagation'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "distributed/propagation"
 
 module Datadog
   module Tracing
@@ -19,16 +19,16 @@ module Datadog
           end
 
           def patch
-            require_relative 'producer'
-            require_relative 'middleware'
+            require_relative "producer"
+            require_relative "middleware"
 
             ::WaterDrop::Producer.prepend(Producer)
-            ::WaterDrop.instrumentation.subscribe('producer.configured') do |event|
+            ::WaterDrop.instrumentation.subscribe("producer.configured") do |event|
               producer = event[:producer]
               add_middleware(producer)
 
               if Datadog.configuration.data_streams.enabled
-                producer.monitor.subscribe('message.acknowledged') do |ack_event|
+                producer.monitor.subscribe("message.acknowledged") do |ack_event|
                   if Datadog::DataStreams.enabled?
                     payload = ack_event.payload
                     Datadog::DataStreams.track_kafka_produce(payload[:topic], payload[:partition], payload[:offset])

data/lib/datadog/tracing/contrib/waterdrop/producer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -40,8 +40,8 @@ module Datadog
             span.set_tag(Contrib::Karafka::Ext::TAG_MESSAGE_COUNT, messages.size)
             span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Contrib::Karafka::Ext::TAG_SYSTEM)
 
-            span.set_tag(Contrib::Ext::Messaging::TAG_DESTINATION, topics.uniq.sort.join(','))
-            span.set_tag(Contrib::Karafka::Ext::TAG_PARTITION, partitions.uniq.sort.join(',')) if partitions.any?
+            span.set_tag(Contrib::Ext::Messaging::TAG_DESTINATION, topics.uniq.sort.join(","))
+            span.set_tag(Contrib::Karafka::Ext::TAG_PARTITION, partitions.uniq.sort.join(",")) if partitions.any?
           end
         end
       end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'component'
-require_relative 'waterdrop/integration'
-require_relative 'waterdrop/distributed/propagation'
+require_relative "component"
+require_relative "waterdrop/integration"
+require_relative "waterdrop/distributed/propagation"
 
 module Datadog
   module Tracing
@@ -10,7 +10,7 @@ module Datadog
       # `WaterDrop` integration public API
       module WaterDrop
         def self.inject(digest, data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           # Steep: https://github.com/soutaro/steep/issues/477
           # @type ivar @propagation: WaterDrop::Distributed::Propagation
@@ -18,14 +18,14 @@ module Datadog
         end
 
         def self.extract(data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           # Steep: https://github.com/soutaro/steep/issues/477
           # @type ivar @propagation: WaterDrop::Distributed::Propagation
           @propagation.extract(data)
         end
 
-        Contrib::Component.register('waterdrop') do |config|
+        Contrib::Component.register("waterdrop") do |config|
           tracing = config.tracing
           tracing.propagation_style
 

data/lib/datadog/tracing/contrib.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../tracing'
-require_relative 'contrib/registry'
-require_relative 'contrib/extensions'
+require_relative "../tracing"
+require_relative "contrib/registry"
+require_relative "contrib/extensions"
 
 module Datadog
   module Tracing
@@ -30,57 +30,57 @@ module Datadog
   end
 end
 
-require_relative 'contrib/action_cable/integration'
-require_relative 'contrib/action_mailer/integration'
-require_relative 'contrib/action_pack/integration'
-require_relative 'contrib/action_view/integration'
-require_relative 'contrib/active_model_serializers/integration'
-require_relative 'contrib/active_job/integration'
-require_relative 'contrib/active_record/integration'
-require_relative 'contrib/active_support/integration'
-require_relative 'contrib/aws/integration'
-require_relative 'contrib/concurrent_ruby/integration'
-require_relative 'contrib/dalli/integration'
-require_relative 'contrib/delayed_job/integration'
-require_relative 'contrib/elasticsearch/integration'
-require_relative 'contrib/ethon/integration'
-require_relative 'contrib/excon/integration'
-require_relative 'contrib/faraday/integration'
-require_relative 'contrib/grape/integration'
-require_relative 'contrib/graphql/integration'
-require_relative 'contrib/grpc'
-require_relative 'contrib/hanami/integration'
-require_relative 'contrib/http'
-require_relative 'contrib/httpclient/integration'
-require_relative 'contrib/httprb/integration'
-require_relative 'contrib/integration'
-require_relative 'contrib/kafka/integration'
-require_relative 'contrib/waterdrop'
-require_relative 'contrib/karafka'
-require_relative 'contrib/lograge/integration'
-require_relative 'contrib/mongodb/integration'
-require_relative 'contrib/mysql2/integration'
-require_relative 'contrib/opensearch/integration'
-require_relative 'contrib/pg/integration'
-require_relative 'contrib/presto/integration'
-require_relative 'contrib/que/integration'
-require_relative 'contrib/racecar/integration'
-require_relative 'contrib/rack/integration'
-require_relative 'contrib/rails/integration'
-require_relative 'contrib/rake/integration'
-require_relative 'contrib/redis/integration'
-require_relative 'contrib/resque/integration'
-require_relative 'contrib/rest_client/integration'
-require_relative 'contrib/roda/integration'
-require_relative 'contrib/semantic_logger/integration'
-require_relative 'contrib/sequel/integration'
-require_relative 'contrib/shoryuken/integration'
-require_relative 'contrib/sidekiq'
-require_relative 'contrib/sinatra/integration'
-require_relative 'contrib/sneakers/integration'
-require_relative 'contrib/stripe/integration'
-require_relative 'contrib/sucker_punch/integration'
-require_relative 'contrib/trilogy/integration'
+require_relative "contrib/action_cable/integration"
+require_relative "contrib/action_mailer/integration"
+require_relative "contrib/action_pack/integration"
+require_relative "contrib/action_view/integration"
+require_relative "contrib/active_model_serializers/integration"
+require_relative "contrib/active_job/integration"
+require_relative "contrib/active_record/integration"
+require_relative "contrib/active_support/integration"
+require_relative "contrib/aws/integration"
+require_relative "contrib/concurrent_ruby/integration"
+require_relative "contrib/dalli/integration"
+require_relative "contrib/delayed_job/integration"
+require_relative "contrib/elasticsearch/integration"
+require_relative "contrib/ethon/integration"
+require_relative "contrib/excon/integration"
+require_relative "contrib/faraday/integration"
+require_relative "contrib/grape/integration"
+require_relative "contrib/graphql/integration"
+require_relative "contrib/grpc"
+require_relative "contrib/hanami/integration"
+require_relative "contrib/http"
+require_relative "contrib/httpclient/integration"
+require_relative "contrib/httprb/integration"
+require_relative "contrib/integration"
+require_relative "contrib/kafka/integration"
+require_relative "contrib/waterdrop"
+require_relative "contrib/karafka"
+require_relative "contrib/lograge/integration"
+require_relative "contrib/mongodb/integration"
+require_relative "contrib/mysql2/integration"
+require_relative "contrib/opensearch/integration"
+require_relative "contrib/pg/integration"
+require_relative "contrib/presto/integration"
+require_relative "contrib/que/integration"
+require_relative "contrib/racecar/integration"
+require_relative "contrib/rack/integration"
+require_relative "contrib/rails/integration"
+require_relative "contrib/rake/integration"
+require_relative "contrib/redis/integration"
+require_relative "contrib/resque/integration"
+require_relative "contrib/rest_client/integration"
+require_relative "contrib/roda/integration"
+require_relative "contrib/semantic_logger/integration"
+require_relative "contrib/sequel/integration"
+require_relative "contrib/shoryuken/integration"
+require_relative "contrib/sidekiq"
+require_relative "contrib/sinatra/integration"
+require_relative "contrib/sneakers/integration"
+require_relative "contrib/stripe/integration"
+require_relative "contrib/sucker_punch/integration"
+require_relative "contrib/trilogy/integration"
 
 # This list is used to determine if an integration is a built-in integration,
 # and prevent sending telemetry for custom integrations.

data/lib/datadog/tracing/correlation.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'utils'
-require_relative '../core/logging/ext'
+require_relative "utils"
+require_relative "../core/logging/ext"
 
 module Datadog
   module Tracing
@@ -13,12 +13,12 @@ module Datadog
       # Represents current trace state with key identifiers
       # @public_api
       class Identifier
-        LOG_ATTR_ENV = 'dd.env'
-        LOG_ATTR_SERVICE = 'dd.service'
-        LOG_ATTR_SPAN_ID = 'dd.span_id'
-        LOG_ATTR_TRACE_ID = 'dd.trace_id'
-        LOG_ATTR_VERSION = 'dd.version'
-        LOG_ATTR_SOURCE = 'ddsource'
+        LOG_ATTR_ENV = "dd.env"
+        LOG_ATTR_SERVICE = "dd.service"
+        LOG_ATTR_SPAN_ID = "dd.span_id"
+        LOG_ATTR_TRACE_ID = "dd.trace_id"
+        LOG_ATTR_VERSION = "dd.version"
+        LOG_ATTR_SOURCE = "ddsource"
 
         attr_reader \
           :env,
@@ -68,7 +68,7 @@ module Datadog
             attributes << "#{LOG_ATTR_TRACE_ID}=#{trace_id}"
             attributes << "#{LOG_ATTR_SPAN_ID}=#{span_id}"
             attributes << "#{LOG_ATTR_SOURCE}=#{Core::Logging::Ext::DD_SOURCE}"
-            attributes.join(' ')
+            attributes.join(" ")
           end
         end
 
@@ -103,7 +103,7 @@ module Datadog
 
       def format_trace_id_128(trace_id)
         if !Tracing::Utils::TraceId.to_high_order(trace_id).zero?
-          Kernel.format('%032x', trace_id)
+          Kernel.format("%032x", trace_id)
         else
           Tracing::Utils::TraceId.to_low_order(trace_id).to_s
         end

data/lib/datadog/tracing/diagnostics/environment_logger.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require 'date'
-require 'json'
-require 'rbconfig'
-require_relative '../../core/diagnostics/environment_logger'
+require "date"
+require "json"
+require "rbconfig"
+require_relative "../../core/diagnostics/environment_logger"
 
 module Datadog
   module Tracing
@@ -14,13 +14,13 @@ module Datadog
 
         def self.collect_and_log!(responses: nil)
           if log?
-            log_configuration!('TRACING', EnvironmentCollector.collect_config!.to_json)
-            log_debug!('TRACING INTEGRATIONS', EnvironmentCollector.collect_integrations_settings!.to_json)
+            log_configuration!("TRACING", EnvironmentCollector.collect_config!.to_json)
+            log_debug!("TRACING INTEGRATIONS", EnvironmentCollector.collect_integrations_settings!.to_json)
 
             if responses
               err_data = EnvironmentCollector.collect_errors!(responses)
               err_data.reject! { |_, v| v.nil? } # Remove empty values from hash output
-              log_error!('TRACING', 'Agent Error', err_data.to_json) unless err_data.empty?
+              log_error!("TRACING", "Agent Error", err_data.to_json) unless err_data.empty?
             end
           end
         rescue => e
@@ -75,7 +75,7 @@ module Datadog
 
             return nil if error_responses.empty?
 
-            error_responses.map(&:inspect).join(',')
+            error_responses.map(&:inspect).join(",")
           end
 
           # @return [Boolean, nil] analytics enabled in configuration
@@ -127,7 +127,7 @@ module Datadog
             integrations = instrumented_integrations
             return if integrations.empty?
 
-            integrations.map { |name, integration| "#{name}@#{integration.class.version}" }.join(',')
+            integrations.map { |name, integration| "#{name}@#{integration.class.version}" }.join(",")
           end
 
           # @return [Boolean, nil] partial flushing enabled in configuration

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

@@ -9,25 +9,25 @@ module Datadog
         module Health
           # Metrics
           module Metrics
-            METRIC_API_ERRORS = 'datadog.tracer.api.errors'
-            METRIC_API_REQUESTS = 'datadog.tracer.api.requests'
-            METRIC_API_RESPONSES = 'datadog.tracer.api.responses'
-            METRIC_ERROR_CONTEXT_OVERFLOW = 'datadog.tracer.error.context_overflow'
-            METRIC_ERROR_INSTRUMENTATION_PATCH = 'datadog.tracer.error.instrumentation_patch'
-            METRIC_ERROR_SPAN_FINISH = 'datadog.tracer.error.span_finish'
-            METRIC_ERROR_UNFINISHED_SPANS = 'datadog.tracer.error.unfinished_spans'
-            METRIC_INSTRUMENTATION_PATCHED = 'datadog.tracer.instrumentation_patched'
-            METRIC_QUEUE_ACCEPTED = 'datadog.tracer.queue.accepted'
-            METRIC_QUEUE_ACCEPTED_LENGTHS = 'datadog.tracer.queue.accepted_lengths'
-            METRIC_QUEUE_DROPPED = 'datadog.tracer.queue.dropped'
-            METRIC_QUEUE_LENGTH = 'datadog.tracer.queue.length'
-            METRIC_QUEUE_MAX_LENGTH = 'datadog.tracer.queue.max_length'
-            METRIC_QUEUE_SPANS = 'datadog.tracer.queue.spans'
-            METRIC_SAMPLING_SERVICE_CACHE_LENGTH = 'datadog.tracer.sampling.service_cache_length'
-            METRIC_TRACES_FILTERED = 'datadog.tracer.traces.filtered'
-            METRIC_TRANSPORT_CHUNKED = 'datadog.tracer.transport.chunked'
-            METRIC_TRANSPORT_TRACE_TOO_LARGE = 'datadog.tracer.transport.trace_too_large'
-            METRIC_WRITER_CPU_TIME = 'datadog.tracer.writer.cpu_time'
+            METRIC_API_ERRORS = "datadog.tracer.api.errors"
+            METRIC_API_REQUESTS = "datadog.tracer.api.requests"
+            METRIC_API_RESPONSES = "datadog.tracer.api.responses"
+            METRIC_ERROR_CONTEXT_OVERFLOW = "datadog.tracer.error.context_overflow"
+            METRIC_ERROR_INSTRUMENTATION_PATCH = "datadog.tracer.error.instrumentation_patch"
+            METRIC_ERROR_SPAN_FINISH = "datadog.tracer.error.span_finish"
+            METRIC_ERROR_UNFINISHED_SPANS = "datadog.tracer.error.unfinished_spans"
+            METRIC_INSTRUMENTATION_PATCHED = "datadog.tracer.instrumentation_patched"
+            METRIC_QUEUE_ACCEPTED = "datadog.tracer.queue.accepted"
+            METRIC_QUEUE_ACCEPTED_LENGTHS = "datadog.tracer.queue.accepted_lengths"
+            METRIC_QUEUE_DROPPED = "datadog.tracer.queue.dropped"
+            METRIC_QUEUE_LENGTH = "datadog.tracer.queue.length"
+            METRIC_QUEUE_MAX_LENGTH = "datadog.tracer.queue.max_length"
+            METRIC_QUEUE_SPANS = "datadog.tracer.queue.spans"
+            METRIC_SAMPLING_SERVICE_CACHE_LENGTH = "datadog.tracer.sampling.service_cache_length"
+            METRIC_TRACES_FILTERED = "datadog.tracer.traces.filtered"
+            METRIC_TRANSPORT_CHUNKED = "datadog.tracer.transport.chunked"
+            METRIC_TRANSPORT_TRACE_TOO_LARGE = "datadog.tracer.transport.trace_too_large"
+            METRIC_WRITER_CPU_TIME = "datadog.tracer.writer.cpu_time"
           end
         end
       end

data/lib/datadog/tracing/diagnostics/health.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/distributed/b3_multi.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'helpers'
-require_relative '../trace_digest'
-require_relative '../utils'
+require_relative "helpers"
+require_relative "../trace_digest"
+require_relative "../utils"
 
 module Datadog
   module Tracing
@@ -10,9 +10,9 @@ module Datadog
       # B3 multi header-style trace propagation.
       # @see https://github.com/openzipkin/b3-propagation#multiple-headers
       class B3Multi
-        B3_TRACE_ID_KEY = 'x-b3-traceid'
-        B3_SPAN_ID_KEY = 'x-b3-spanid'
-        B3_SAMPLED_KEY = 'x-b3-sampled'
+        B3_TRACE_ID_KEY = "x-b3-traceid"
+        B3_SPAN_ID_KEY = "x-b3-spanid"
+        B3_SAMPLED_KEY = "x-b3-sampled"
 
         def initialize(
           fetcher:,
@@ -30,8 +30,8 @@ module Datadog
           return if digest.nil?
 
           # DEV: We need these to be hex encoded
-          data[@trace_id_key] = format('%032x', digest.trace_id)
-          data[@span_id_key] = format('%016x', digest.span_id || 0) # # Fall back to zero (invalid) if not present
+          data[@trace_id_key] = format("%032x", digest.trace_id)
+          data[@span_id_key] = format("%016x", digest.span_id || 0) # # Fall back to zero (invalid) if not present
 
           if digest.trace_sampling_priority
             sampling_priority = Helpers.clamp_sampling_priority(

data/lib/datadog/tracing/distributed/b3_single.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'helpers'
-require_relative '../trace_digest'
+require_relative "helpers"
+require_relative "../trace_digest"
 
 module Datadog
   module Tracing
@@ -15,7 +15,7 @@ module Datadog
       #
       # @see https://github.com/openzipkin/b3-propagation#single-header
       class B3Single
-        B3_SINGLE_HEADER_KEY = 'b3'
+        B3_SINGLE_HEADER_KEY = "b3"
 
         def initialize(fetcher:, key: B3_SINGLE_HEADER_KEY)
           @key = key
@@ -47,7 +47,7 @@ module Datadog
 
           return unless value
 
-          parts = value.split('-')
+          parts = value.split("-")
           trace_id = Helpers.parse_hex_id(parts[0]) unless parts.empty?
           # Return early if this propagation is not valid
           return if trace_id.nil? || trace_id <= 0 || trace_id > Tracing::Utils::TraceId::MAX