ddtrace 0.51.1 → 0.54.1

data/lib/ddtrace/transport/http/builder.rb

@@ -1,3 +1,5 @@
+# typed: true
+require 'ddtrace/configuration/agent_settings_resolver'
 require 'ddtrace/transport/http/adapters/registry'
 require 'ddtrace/transport/http/api/map'
 require 'ddtrace/transport/http/api/instance'
@@ -32,14 +34,20 @@ module Datadog
           yield(self) if block_given?
         end
 
-        def adapter(type, *args)
-          @default_adapter = if type.is_a?(Symbol)
-                               registry_klass = REGISTRY.get(type)
-                               raise UnknownAdapterError, type if registry_klass.nil?
+        def adapter(config, *args, **kwargs)
+          @default_adapter = case config
+                             when Configuration::AgentSettingsResolver::AgentSettings
+                               registry_klass = REGISTRY.get(config.adapter)
+                               raise UnknownAdapterError, config.adapter if registry_klass.nil?
 
-                               registry_klass.new(*args)
+                               registry_klass.build(config)
+                             when Symbol
+                               registry_klass = REGISTRY.get(config)
+                               raise UnknownAdapterError, config if registry_klass.nil?
+
+                               registry_klass.new(*args, **kwargs)
                              else
-                               type
+                               config
                              end
         end
 

data/lib/ddtrace/transport/http/client.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/transport/http/statistics'
 require 'ddtrace/transport/http/env'
 
@@ -26,7 +27,8 @@ module Datadog
 
           response
         rescue StandardError => e
-          message = "Internal error during HTTP transport request. Cause: #{e.message} Location: #{e.backtrace.first}"
+          message =
+            "Internal error during HTTP transport request. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
 
           # Log error
           if stats.consecutive_errors > 0

data/lib/ddtrace/transport/http/env.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Transport
     module HTTP

data/lib/ddtrace/transport/http/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'forwardable'
 require 'ddtrace/transport/response'
 

data/lib/ddtrace/transport/http/statistics.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/transport/statistics'
 
 module Datadog

data/lib/ddtrace/transport/http/traces.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'json'
 
 require 'ddtrace/transport/traces'

data/lib/ddtrace/transport/http.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/version'
 require 'datadog/core/environment/ext'
 require 'ddtrace/ext/transport'
@@ -16,6 +17,8 @@ module Datadog
   module Transport
     # Namespace for HTTP transport components
     module HTTP
+      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
       module_function
 
       # Builds a new Transport::HTTP::Client
@@ -27,13 +30,7 @@ module Datadog
       # Pass a block to override any settings.
       def default(agent_settings: Datadog::Configuration::AgentSettingsResolver::ENVIRONMENT_AGENT_SETTINGS, **options)
         new do |transport|
-          transport.adapter(
-            default_adapter,
-            agent_settings.hostname,
-            agent_settings.port,
-            timeout: agent_settings.timeout_seconds,
-            ssl: agent_settings.ssl
-          )
+          transport.adapter(agent_settings)
           transport.headers default_headers
 
           if agent_settings.deprecated_for_removal_transport_configuration_options
@@ -77,7 +74,7 @@ module Datadog
       end
 
       def default_adapter
-        :net_http
+        Ext::Transport::HTTP::ADAPTER
       end
 
       def default_hostname(logger: Datadog.logger)
@@ -108,9 +105,9 @@ module Datadog
       end
 
       # Add adapters to registry
-      Builder::REGISTRY.set(Adapters::Net, :net_http)
-      Builder::REGISTRY.set(Adapters::Test, :test)
-      Builder::REGISTRY.set(Adapters::UnixSocket, :unix)
+      Builder::REGISTRY.set(Adapters::Net, Ext::Transport::HTTP::ADAPTER)
+      Builder::REGISTRY.set(Adapters::Test, Ext::Transport::Test::ADAPTER)
+      Builder::REGISTRY.set(Adapters::UnixSocket, Ext::Transport::UnixSocket::ADAPTER)
     end
   end
 end

data/lib/ddtrace/transport/io/client.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/transport/statistics'
 require 'ddtrace/transport/io/response'
 
@@ -38,7 +39,7 @@ module Datadog
           # Return response
           response
         rescue StandardError => e
-          message = "Internal error during IO transport request. Cause: #{e.message} Location: #{e.backtrace.first}"
+          message = "Internal error during IO transport request. Cause: #{e.message} Location: #{Array(e.backtrace).first}"
 
           # Log error
           if stats.consecutive_errors > 0

data/lib/ddtrace/transport/io/response.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/transport/response'
 
 module Datadog

data/lib/ddtrace/transport/io/traces.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/transport/traces'
 
 require 'ddtrace/transport/io/response'
@@ -20,6 +21,8 @@ module Datadog
 
         # Extensions for HTTP client
         module Client
+          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
           def send_traces(traces)
             # Build a request
             req = Transport::Traces::Request.new(Parcel.new(traces))

data/lib/ddtrace/transport/io.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/encoding'
 require 'ddtrace/transport/io/client'
 require 'ddtrace/transport/io/traces'

data/lib/ddtrace/transport/parcel.rb

@@ -1,7 +1,10 @@
+# typed: true
 module Datadog
   module Transport
     # Data transfer object for generic data
     module Parcel
+      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
       attr_reader \
         :data
 

data/lib/ddtrace/transport/request.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Transport
     # Defines request for transport operations

data/lib/ddtrace/transport/response.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module Transport
     # Defines abstract response for transport operations

data/lib/ddtrace/transport/statistics.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/diagnostics/health'
 
 module Datadog

data/lib/ddtrace/transport/traces.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/transport/parcel'
 require 'ddtrace/transport/request'
 require 'ddtrace/chunker'
@@ -7,7 +8,7 @@ module Datadog
     module Traces
       # Data transfer object for encoded traces
       class EncodedParcel
-        include Transport::Parcel
+        include Datadog::Transport::Parcel
 
         attr_reader :trace_count
 
@@ -22,7 +23,7 @@ module Datadog
       end
 
       # Traces request
-      class Request < Transport::Request
+      class Request < Datadog::Transport::Request
       end
 
       # Traces response

data/lib/ddtrace/utils/compression.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'zlib'
 
 module Datadog

data/lib/ddtrace/utils/database.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Utils
     # Common database-related utility functions.

data/lib/ddtrace/utils/forking.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module Utils
     # Helper methods for managing forking behavior

data/lib/ddtrace/utils/object_set.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/utils/sequence'
 
 module Datadog

data/lib/ddtrace/utils/only_once.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Datadog

data/lib/ddtrace/utils/sequence.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   module Utils
     # Generates values from a consistent sequence

data/lib/ddtrace/utils/string_table.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/utils/sequence'
 
 module Datadog

data/lib/ddtrace/utils/time.rb

@@ -1,16 +1,18 @@
+# typed: true
 module Datadog
   module Utils
     # Common database-related utility functions.
     module Time
+      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
+
       module_function
 
-      # Current monotonic time.
-      # Falls back to `now` if monotonic clock
-      # is not available.
+      # Current monotonic time
       #
-      # @return [Float] in seconds, since some unspecified starting point
-      def get_time
-        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      # @param unit [Symbol] unit for the resulting value, same as ::Process#clock_gettime, defaults to :float_second
+      # @return [Numeric] timestamp in the requested unit, since some unspecified starting point
+      def get_time(unit = :float_second)
+        Process.clock_gettime(Process::CLOCK_MONOTONIC, unit)
       end
 
       # Current wall time.
@@ -38,6 +40,12 @@ module Datadog
         after = get_time
         after - before
       end
+
+      def as_utc_epoch_ns(time)
+        # we use #to_r instead of #to_f because Float doesn't have enough precision to represent exact nanoseconds, see
+        # https://rubyapi.org/3.0/o/time#method-i-to_f
+        (time.to_r * 1_000_000_000).to_i
+      end
     end
   end
 end

data/lib/ddtrace/utils.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'ddtrace/utils/database'
 require 'ddtrace/utils/forking'
 
@@ -11,10 +12,11 @@ module Datadog
     # with the default one. Using the default prng, we could break code that
     # would rely on srand/rand sequences.
 
-    # Return a span id
+    # Return a randomly generated integer, valid as a Span ID or Trace ID.
+    # This method is thread-safe and fork-safe.
     def self.next_id
       after_fork! { reset! }
-      id_rng.rand(Datadog::Span::RUBY_MAX_ID)
+      id_rng.rand(Datadog::Span::RUBY_MAX_ID) # TODO: This should never return zero
     end
 
     def self.id_rng
@@ -27,6 +29,14 @@ module Datadog
 
     private_class_method :id_rng, :reset!
 
+    # Stringifies `value` and ensures the outcome is
+    # string is no longer than `size`.
+    # `omission` replaces the end of the output if
+    # `value.to_s` does not fit in `size`, to signify
+    # truncation.
+    #
+    # If `omission.size` is larger than `size`, the output
+    # will still be `omission.size` in length.
     def self.truncate(value, size, omission = '...'.freeze)
       string = value.to_s
 
@@ -43,6 +53,8 @@ module Datadog
       string
     end
 
+    # Ensure `str` is a valid UTF-8, ready to be
+    # sent through the tracer transport.
     def self.utf8_encode(str, options = {})
       str = str.to_s
 

data/lib/ddtrace/vendor/active_record/connection_specification.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'uri'
 
 # NOTE: This code is copied directly from ActiveRecord.

data/lib/ddtrace/vendor/multipart-post/multipart/post/composite_read_io.rb

@@ -1,3 +1,4 @@
+# typed: false
 #--
 # Copyright (c) 2007-2012 Nick Sieger.
 # See the file README.txt included with the distribution for

data/lib/ddtrace/vendor/multipart-post/multipart/post/multipartable.rb

@@ -1,3 +1,4 @@
+# typed: false
 #--
 # Copyright (c) 2007-2013 Nick Sieger.
 # See the file README.txt included with the distribution for

data/lib/ddtrace/vendor/multipart-post/multipart/post/parts.rb

@@ -1,3 +1,4 @@
+# typed: true
 #--
 # Copyright (c) 2007-2013 Nick Sieger.
 # See the file README.txt included with the distribution for

data/lib/ddtrace/vendor/multipart-post/multipart/post/version.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Datadog
   module Vendor
     module Multipart

data/lib/ddtrace/vendor/multipart-post/multipart/post.rb

@@ -1,3 +1,4 @@
+# typed: strict
 module Datadog
   module Vendor
     module Multipart

data/lib/ddtrace/vendor/multipart-post/multipart.rb

@@ -1,3 +1,4 @@
+# typed: strict
 #--
 # Copyright (c) 2007-2013 Nick Sieger.
 # See the file README.txt included with the distribution for

data/lib/ddtrace/vendor/multipart-post/net/http/post/multipart.rb

@@ -1,3 +1,4 @@
+# typed: strict
 #--
 # Copyright (c) 2007-2012 Nick Sieger.
 # See the file README.txt included with the distribution for

data/lib/ddtrace/version.rb

@@ -1,7 +1,8 @@
+# typed: true
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 51
+    MINOR = 54
     PATCH = 1
     PRE = nil
 

data/lib/ddtrace/worker.rb

@@ -1,3 +1,4 @@
+# typed: true
 module Datadog
   # Base class for work tasks
   class Worker

data/lib/ddtrace/workers/async.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/logger'
 
 module Datadog
@@ -135,7 +136,7 @@ module Datadog
             # rubocop:disable Lint/RescueException
             rescue Exception => e
               @error = e
-              Datadog.logger.debug("Worker thread error. Cause #{e.message} Location: #{e.backtrace.first}")
+              Datadog.logger.debug("Worker thread error. Cause #{e.message} Location: #{Array(e.backtrace).first}")
               raise
             end
           end

data/lib/ddtrace/workers/loop.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module Workers
     # Adds looping behavior to workers, with a sleep

data/lib/ddtrace/workers/polling.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/workers/async'
 require 'ddtrace/workers/loop'
 

data/lib/ddtrace/workers/queue.rb

@@ -1,3 +1,4 @@
+# typed: false
 module Datadog
   module Workers
     # Adds queue behavior to workers, with a buffer

data/lib/ddtrace/workers/runtime_metrics.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'forwardable'
 
 require 'ddtrace/runtime/metrics'

data/lib/ddtrace/workers/trace_writer.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'ddtrace/logger'
 require 'ddtrace/transport/http'
 
@@ -36,7 +37,7 @@ module Datadog
         flush_traces(traces)
       rescue StandardError => e
         Datadog.logger.error(
-          "Error while writing traces: dropped #{traces.length} items. Cause: #{e} Location: #{e.backtrace.first}"
+          "Error while writing traces: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
         )
       end
 

data/lib/ddtrace/workers.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'time'
 
 require 'ddtrace/workers/trace_writer'
@@ -58,7 +59,7 @@ module Datadog
           # TODO[manu]: findout the reason and reschedule the send if it's not
           # a fatal exception
           Datadog.logger.error(
-            "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{e.backtrace.first}"
+            "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
           )
         end
       end

data/lib/ddtrace/writer.rb

@@ -1,3 +1,4 @@
+# typed: true
 require 'json'
 
 require 'ddtrace/ext/net'

data/lib/ddtrace.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # During development, we load `ddtrace` by through `ddtrace.gemspec`,
 # which in turn eager loads 'ddtrace/version'.
 #
@@ -17,68 +18,35 @@ require 'ddtrace/metrics'
 require 'ddtrace/auto_instrument_base'
 require 'ddtrace/profiling'
 
+require 'datadog/contrib'
+require 'ddtrace/contrib/auto_instrument'
+require 'ddtrace/contrib/extensions'
+
+require 'ddtrace/opentelemetry/extensions'
+
 # \Datadog global namespace that includes all tracing functionality for Tracer and Span classes.
 module Datadog
   extend Configuration
   extend AutoInstrumentBase
 
-  # Load and extend Contrib by default
-  require 'ddtrace/contrib/extensions'
+  # Load built-in Datadog integrations
   extend Contrib::Extensions
+  # Load Contrib auto instrumentation
+  extend Contrib::AutoInstrument
+  # Load Contrib extension to global Datadog objects
+  Configuration::Settings.include Contrib::Extensions::Configuration::Settings
 
   # Load and extend OpenTelemetry compatibility by default
-  require 'ddtrace/opentelemetry/extensions'
   extend OpenTelemetry::Extensions
 
-  # Load and extend AutoInstrument
-  require 'ddtrace/contrib/auto_instrument'
-  extend Contrib::AutoInstrument
-
   # Add shutdown hook:
   # Ensures the tracer has an opportunity to flush traces
   # and cleanup before terminating the process.
-  at_exit { Datadog.shutdown! }
+  at_exit do
+    if Interrupt === $! # rubocop:disable Style/SpecialGlobalVars is process terminating due to a ctrl+c or similar?
+      Datadog.send(:handle_interrupt_shutdown!)
+    else
+      Datadog.shutdown!
+    end
+  end
 end
-
-require 'ddtrace/contrib/action_cable/integration'
-require 'ddtrace/contrib/action_pack/integration'
-require 'ddtrace/contrib/action_view/integration'
-require 'ddtrace/contrib/active_model_serializers/integration'
-require 'ddtrace/contrib/active_record/integration'
-require 'ddtrace/contrib/active_support/integration'
-require 'ddtrace/contrib/aws/integration'
-require 'ddtrace/contrib/concurrent_ruby/integration'
-require 'ddtrace/contrib/dalli/integration'
-require 'ddtrace/contrib/delayed_job/integration'
-require 'ddtrace/contrib/elasticsearch/integration'
-require 'ddtrace/contrib/ethon/integration'
-require 'ddtrace/contrib/excon/integration'
-require 'ddtrace/contrib/faraday/integration'
-require 'ddtrace/contrib/grape/integration'
-require 'ddtrace/contrib/graphql/integration'
-require 'ddtrace/contrib/grpc/integration'
-require 'ddtrace/contrib/http/integration'
-require 'ddtrace/contrib/httpclient/integration'
-require 'ddtrace/contrib/httprb/integration'
-require 'ddtrace/contrib/integration'
-require 'ddtrace/contrib/kafka/integration'
-require 'ddtrace/contrib/lograge/integration'
-require 'ddtrace/contrib/presto/integration'
-require 'ddtrace/contrib/que/integration'
-require 'ddtrace/contrib/mysql2/integration'
-require 'ddtrace/contrib/mongodb/integration'
-require 'ddtrace/contrib/qless/integration'
-require 'ddtrace/contrib/racecar/integration'
-require 'ddtrace/contrib/rack/integration'
-require 'ddtrace/contrib/rails/integration'
-require 'ddtrace/contrib/rake/integration'
-require 'ddtrace/contrib/redis/integration'
-require 'ddtrace/contrib/resque/integration'
-require 'ddtrace/contrib/rest_client/integration'
-require 'ddtrace/contrib/semantic_logger/integration'
-require 'ddtrace/contrib/sequel/integration'
-require 'ddtrace/contrib/shoryuken/integration'
-require 'ddtrace/contrib/sidekiq/integration'
-require 'ddtrace/contrib/sinatra/integration'
-require 'ddtrace/contrib/sneakers/integration'
-require 'ddtrace/contrib/sucker_punch/integration'