ddtrace 0.52.0 → 0.54.2

data/lib/ddtrace/transport/http/adapters/unix_socket.rb

@@ -1,5 +1,6 @@
 # typed: false
 require 'net/http'
+require 'ddtrace/ext/transport'
 require 'ddtrace/transport/http/adapters/net'
 
 module Datadog
@@ -8,21 +9,29 @@ module Datadog
       module Adapters
         # Adapter for Unix sockets
         class UnixSocket < Adapters::Net
-          DEFAULT_TIMEOUT = 1
-
           attr_reader \
-            :filepath,
+            :filepath, # DEV(1.0): Rename to `uds_path`
             :timeout
 
-          def initialize(filepath, options = {})
-            @filepath = filepath
-            @timeout = options.fetch(:timeout, DEFAULT_TIMEOUT)
+          alias_method :uds_path, :filepath
+
+          # @deprecated Positional parameters are deprecated. Use named parameters instead.
+          def initialize(uds_path = nil, **options)
+            @filepath = uds_path || options.fetch(:uds_path)
+            @timeout = options[:timeout] || Ext::Transport::UnixSocket::DEFAULT_TIMEOUT_SECONDS
+          end
+
+          def self.build(agent_settings)
+            new(
+              uds_path: agent_settings.uds_path,
+              timeout: agent_settings.timeout_seconds,
+            )
           end
 
           def open(&block)
             # Open connection
             connection = HTTP.new(
-              filepath,
+              uds_path,
               read_timeout: timeout,
               continue_timeout: timeout
             )
@@ -31,7 +40,7 @@ module Datadog
           end
 
           def url
-            "http+unix://#{filepath}?timeout=#{timeout}"
+            "http+unix://#{uds_path}?timeout=#{timeout}"
           end
 
           # Re-implements Net:HTTP with underlying Unix socket
@@ -39,19 +48,21 @@ module Datadog
             DEFAULT_TIMEOUT = 1
 
             attr_reader \
-              :filepath,
+              :filepath, # DEV(1.0): Rename to `uds_path`
               :unix_socket
 
-            def initialize(filepath, options = {})
+            alias_method :uds_path, :filepath
+
+            def initialize(uds_path, options = {})
               super('localhost', 80)
-              @filepath = filepath
+              @filepath = uds_path
               @read_timeout = options.fetch(:read_timeout, DEFAULT_TIMEOUT)
               @continue_timeout = options.fetch(:continue_timeout, DEFAULT_TIMEOUT)
               @debug_output = options[:debug_output] if options.key?(:debug_output)
             end
 
             def connect
-              @unix_socket = UNIXSocket.open(filepath)
+              @unix_socket = UNIXSocket.open(uds_path)
               @socket = ::Net::BufferedIO.new(@unix_socket).tap do |socket|
                 socket.read_timeout = @read_timeout
                 socket.continue_timeout = @continue_timeout

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

@@ -1,4 +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'
@@ -33,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.rb

@@ -30,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
@@ -80,7 +74,7 @@ module Datadog
       end
 
       def default_adapter
-        :net_http
+        Ext::Transport::HTTP::ADAPTER
       end
 
       def default_hostname(logger: Datadog.logger)
@@ -111,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/utils/time.rb

@@ -7,13 +7,12 @@ module Datadog
 
       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.
@@ -41,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/version.rb

@@ -2,8 +2,8 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 52
-    PATCH = 0
+    MINOR = 54
+    PATCH = 2
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/ddtrace/workers/{loop.rb → interval_loop.rb}

@@ -60,15 +60,6 @@ module Datadog
         @loop_wait_time = value
       end
 
-      def reset_loop_wait_time
-        self.loop_wait_time = loop_base_interval
-      end
-
-      # Should the loop "back off" when there's no work?
-      def loop_back_off?
-        false
-      end
-
       def loop_back_off!
         self.loop_wait_time = [loop_wait_time * BACK_OFF_RATIO, BACK_OFF_MAX].min
       end
@@ -106,13 +97,6 @@ module Datadog
             # There's work to do...
             # Run the task
             yield
-
-            # Reset the wait interval
-            reset_loop_wait_time if loop_back_off?
-          elsif loop_back_off?
-            # There's no work to do...
-            # Back off the wait interval a bit
-            loop_back_off!
           end
 
           # Wait for an interval, unless shutdown has been signaled.

data/lib/ddtrace/workers/polling.rb

@@ -1,6 +1,6 @@
 # typed: false
 require 'ddtrace/workers/async'
-require 'ddtrace/workers/loop'
+require 'ddtrace/workers/interval_loop'
 
 module Datadog
   module Workers

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.54.2
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: debase-ruby_core_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.10.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.10.14
 description: |
   ddtrace is Datadog’s tracing client for Ruby. It is used to trace requests
   as they flow across web servers, databases and microservices so that developers
@@ -66,7 +66,13 @@ files:
 - docs/DevelopmentGuide.md
 - docs/GettingStarted.md
 - docs/ProfilingDevelopment.md
+- ext/ddtrace_profiling_native_extension/NativeExtensionDesign.md
+- ext/ddtrace_profiling_native_extension/clock_id.h
+- ext/ddtrace_profiling_native_extension/clock_id_from_pthread.c
+- ext/ddtrace_profiling_native_extension/clock_id_noop.c
 - ext/ddtrace_profiling_native_extension/extconf.rb
+- ext/ddtrace_profiling_native_extension/private_vm_api_access.c
+- ext/ddtrace_profiling_native_extension/private_vm_api_access.h
 - ext/ddtrace_profiling_native_extension/profiling.c
 - lib/datadog/ci.rb
 - lib/datadog/ci/configuration/components.rb
@@ -99,6 +105,7 @@ files:
 - lib/datadog/core/environment/socket.rb
 - lib/datadog/core/environment/thread_count.rb
 - lib/datadog/core/environment/variable_helpers.rb
+- lib/datadog/core/environment/vm_cache.rb
 - lib/ddtrace.rb
 - lib/ddtrace/analytics.rb
 - lib/ddtrace/auto_instrument.rb
@@ -130,6 +137,14 @@ files:
 - lib/ddtrace/contrib/action_cable/instrumentation.rb
 - lib/ddtrace/contrib/action_cable/integration.rb
 - lib/ddtrace/contrib/action_cable/patcher.rb
+- lib/ddtrace/contrib/action_mailer/configuration/settings.rb
+- lib/ddtrace/contrib/action_mailer/event.rb
+- lib/ddtrace/contrib/action_mailer/events.rb
+- lib/ddtrace/contrib/action_mailer/events/deliver.rb
+- lib/ddtrace/contrib/action_mailer/events/process.rb
+- lib/ddtrace/contrib/action_mailer/ext.rb
+- lib/ddtrace/contrib/action_mailer/integration.rb
+- lib/ddtrace/contrib/action_mailer/patcher.rb
 - lib/ddtrace/contrib/action_pack/action_controller/instrumentation.rb
 - lib/ddtrace/contrib/action_pack/action_controller/patcher.rb
 - lib/ddtrace/contrib/action_pack/configuration/settings.rb
@@ -148,6 +163,19 @@ files:
 - lib/ddtrace/contrib/action_view/integration.rb
 - lib/ddtrace/contrib/action_view/patcher.rb
 - lib/ddtrace/contrib/action_view/utils.rb
+- lib/ddtrace/contrib/active_job/configuration/settings.rb
+- lib/ddtrace/contrib/active_job/event.rb
+- lib/ddtrace/contrib/active_job/events.rb
+- lib/ddtrace/contrib/active_job/events/discard.rb
+- lib/ddtrace/contrib/active_job/events/enqueue.rb
+- lib/ddtrace/contrib/active_job/events/enqueue_at.rb
+- lib/ddtrace/contrib/active_job/events/enqueue_retry.rb
+- lib/ddtrace/contrib/active_job/events/perform.rb
+- lib/ddtrace/contrib/active_job/events/retry_stopped.rb
+- lib/ddtrace/contrib/active_job/ext.rb
+- lib/ddtrace/contrib/active_job/integration.rb
+- lib/ddtrace/contrib/active_job/log_injection.rb
+- lib/ddtrace/contrib/active_job/patcher.rb
 - lib/ddtrace/contrib/active_model_serializers/configuration/settings.rb
 - lib/ddtrace/contrib/active_model_serializers/event.rb
 - lib/ddtrace/contrib/active_model_serializers/events.rb
@@ -352,6 +380,7 @@ files:
 - lib/ddtrace/contrib/redis/configuration/resolver.rb
 - lib/ddtrace/contrib/redis/configuration/settings.rb
 - lib/ddtrace/contrib/redis/ext.rb
+- lib/ddtrace/contrib/redis/instrumentation.rb
 - lib/ddtrace/contrib/redis/integration.rb
 - lib/ddtrace/contrib/redis/patcher.rb
 - lib/ddtrace/contrib/redis/quantize.rb
@@ -392,6 +421,9 @@ files:
 - lib/ddtrace/contrib/sidekiq/ext.rb
 - lib/ddtrace/contrib/sidekiq/integration.rb
 - lib/ddtrace/contrib/sidekiq/patcher.rb
+- lib/ddtrace/contrib/sidekiq/server_internal_tracer/heartbeat.rb
+- lib/ddtrace/contrib/sidekiq/server_internal_tracer/job_fetch.rb
+- lib/ddtrace/contrib/sidekiq/server_internal_tracer/scheduled_push.rb
 - lib/ddtrace/contrib/sidekiq/server_tracer.rb
 - lib/ddtrace/contrib/sidekiq/tracing.rb
 - lib/ddtrace/contrib/sinatra/configuration/settings.rb
@@ -480,8 +512,6 @@ files:
 - lib/ddtrace/profiling/event.rb
 - lib/ddtrace/profiling/events/stack.rb
 - lib/ddtrace/profiling/exporter.rb
-- lib/ddtrace/profiling/ext/cpu.rb
-- lib/ddtrace/profiling/ext/cthread.rb
 - lib/ddtrace/profiling/ext/forking.rb
 - lib/ddtrace/profiling/flush.rb
 - lib/ddtrace/profiling/native_extension.rb
@@ -581,7 +611,7 @@ files:
 - lib/ddtrace/worker.rb
 - lib/ddtrace/workers.rb
 - lib/ddtrace/workers/async.rb
-- lib/ddtrace/workers/loop.rb
+- lib/ddtrace/workers/interval_loop.rb
 - lib/ddtrace/workers/polling.rb
 - lib/ddtrace/workers/queue.rb
 - lib/ddtrace/workers/runtime_metrics.rb

data/lib/ddtrace/profiling/ext/cpu.rb

@@ -1,67 +0,0 @@
-# typed: true
-module Datadog
-  module Profiling
-    module Ext
-      # Monkey patches Ruby's `Thread` with our `Ext::CThread` to enable CPU-time profiling
-      module CPU
-        # We cannot apply our CPU extension if a broken rollbar is around because that can cause customer apps to fail
-        # with a SystemStackError: stack level too deep.
-        #
-        # This occurs whenever our extensions to Thread are applied BEFORE rollbar applies its own. This happens
-        # because a loop forms: our extension tries to call Thread#initialize, but it's intercepted by rollbar, which
-        # then tries to call the original Thread#initialize as well, but instead alls our extension, leading to stack
-        # exhaustion.
-        #
-        # See https://github.com/rollbar/rollbar-gem/pull/1018 for more details on the issue
-        ROLLBAR_INCOMPATIBLE_VERSIONS = Gem::Requirement.new('<= 3.1.1')
-
-        def self.supported?
-          unsupported_reason.nil?
-        end
-
-        def self.apply!
-          return false unless supported?
-
-          # Applying CThread to Thread will ensure any new threads
-          # will provide a thread/clock ID for CPU timing.
-          require 'ddtrace/profiling/ext/cthread'
-          ::Thread.prepend(Profiling::Ext::CThread)
-          ::Thread.singleton_class.prepend(Datadog::Profiling::Ext::WrapThreadStartFork)
-        end
-
-        def self.unsupported_reason
-          # NOTE: Only the first matching reason is returned, so try to keep a nice order on reasons -- e.g. tell users
-          # first that they can't use this on macOS before telling them that they have the wrong ffi version
-
-          if RUBY_ENGINE == 'jruby'
-            'JRuby is not supported'
-          elsif RUBY_PLATFORM.include?('darwin')
-            'Feature requires Linux; macOS is not supported'
-          elsif RUBY_PLATFORM =~ /(mswin|mingw)/
-            'Feature requires Linux; Windows is not supported'
-          elsif !RUBY_PLATFORM.include?('linux')
-            "Feature requires Linux; #{RUBY_PLATFORM} is not supported"
-          elsif Gem::Specification.find_all_by_name('rollbar', ROLLBAR_INCOMPATIBLE_VERSIONS).any?
-            'You have an incompatible rollbar gem version installed; ensure that you have rollbar >= 3.1.2 by ' \
-            "adding `gem 'rollbar', '>= 3.1.2'` to your Gemfile or gems.rb file. " \
-            'See https://github.com/rollbar/rollbar-gem/pull/1018 for details'
-          elsif Gem::Specification.find_all_by_name('logging').any? && logging_inherit_context_enabled?
-            'The `logging` gem is installed and its thread inherit context feature is enabled. ' \
-            "Please add LOGGING_INHERIT_CONTEXT=false to your application's environment variables to disable the " \
-            'conflicting `logging` gem feature. ' \
-            'See https://github.com/TwP/logging/pull/230 for details'
-          end
-        end
-
-        private_class_method def self.logging_inherit_context_enabled?
-          # The logging gem provides a mechanism to disable the conflicting behavior, see
-          # https://github.com/TwP/logging/blob/ae9872d093833b2a5a34cbe1faa4e895a81f6845/lib/logging/diagnostic_context.rb#L418
-          # Here we check if the behavior is enabled
-          inherit_context_configuration = ENV['LOGGING_INHERIT_CONTEXT']
-
-          inherit_context_configuration.nil? || !%w[false no 0].include?(inherit_context_configuration.downcase)
-        end
-      end
-    end
-  end
-end

data/lib/ddtrace/profiling/ext/cthread.rb

@@ -1,156 +0,0 @@
-# typed: false
-require 'ffi'
-
-module Datadog
-  module Profiling
-    module Ext
-      # C-struct for retrieving clock ID from pthread
-      class CClockId < FFI::Struct
-        layout :value, :int
-      end
-
-      # Enables interfacing with pthread via FFI
-      module NativePthread
-        extend FFI::Library
-        ffi_lib ['pthread', 'libpthread.so.0']
-        attach_function :pthread_self, [], :ulong
-        attach_function :pthread_getcpuclockid, [:ulong, CClockId], :int
-
-        # NOTE: Only returns thread ID for thread that evaluates this call.
-        #       a.k.a. evaluating `get_pthread_thread_id(thread_a)` from within
-        #       `thread_b` will return `thread_b`'s thread ID, not `thread_a`'s.
-        def self.get_pthread_thread_id(thread)
-          return unless ::Thread.current == thread
-
-          pthread_self
-        end
-
-        def self.get_clock_id(thread, pthread_id)
-          return unless ::Thread.current == thread && pthread_id
-
-          clock = CClockId.new
-          clock[:value] = 0
-          pthread_getcpuclockid(pthread_id, clock).zero? ? clock[:value] : nil
-        end
-      end
-
-      # Extension used to enable CPU-time profiling via use of pthread's `getcpuclockid`.
-      module CThread
-        def self.prepended(base)
-          # Threads that have already been created, will not have resolved
-          # a thread/clock ID. This is because these IDs can only be resolved
-          # from within the thread's execution context, which we do not control.
-          #
-          # We can mitigate this for the current thread via #update_native_ids,
-          # since we are currently running within its execution context. We cannot
-          # do this for any other threads that may have been created already.
-          # (This is why it's important that CThread is applied before anything else runs.)
-          base.current.send(:update_native_ids) if base.current.is_a?(CThread)
-        end
-
-        # Process::Waiter crash workaround:
-        #
-        # This is a workaround for a Ruby VM segfault (usually something like
-        # "[BUG] Segmentation fault at 0x0000000000000008") in the affected Ruby versions.
-        # See https://bugs.ruby-lang.org/issues/17807 and the regression tests added to this module's specs for details.
-        #
-        # In those Ruby versions, there's a very special subclass of `Thread` called `Process::Waiter` that causes VM
-        # crashes whenever something tries to read its instance variables. This subclass of thread only shows up when
-        # the `Process.detach` API gets used.
-        # In this module's specs you can find crash regression tests that include a way of reproducing it.
-        #
-        # The workaround is to use `defined?` to check first if the instance variable exists. This seems to be fine
-        # with Ruby.
-        # Note that this crash doesn't affect `@foo ||=` nor instance variable writes (after the first write ever of any
-        # instance variable on a `Process::Waiter`, then further reads and writes to that or any other instance are OK;
-        # it looks like there's some lazily-created structure that is missing and did not get created).
-        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3') &&
-           Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
-          attr_reader :pthread_thread_id
-        else
-          def pthread_thread_id
-            defined?(@pthread_thread_id) && @pthread_thread_id
-          end
-        end
-
-        def initialize(*args)
-          @pid = ::Process.pid
-          @pthread_thread_id = nil
-          @clock_id = nil
-
-          # Wrap the work block with our own
-          # so we can retrieve the native thread ID within the thread's context.
-          wrapped_block = proc do |*t_args|
-            # Set native thread ID & clock ID
-            update_native_ids
-            yield(*t_args)
-          end
-          wrapped_block.ruby2_keywords if wrapped_block.respond_to?(:ruby2_keywords, true)
-
-          super(*args, &wrapped_block)
-        end
-        ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
-
-        def cpu_time(unit = :float_second)
-          ::Process.clock_gettime(clock_id, unit) if clock_id
-        end
-
-        def cpu_time_instrumentation_installed?
-          # If this thread was started before this module was added to Thread OR if something caused the initialize
-          # method above not to be properly called on new threads, this instance variable is never defined (never set to
-          # any value at all, including nil).
-          #
-          # Thus, we can use @clock_id as a canary to detect a thread that has missing instrumentation, because we
-          # know that in initialize above we always set this variable to nil.
-          defined?(@clock_id) != nil
-        end
-
-        private
-
-        def clock_id
-          update_native_ids if forked?
-          defined?(@clock_id) && @clock_id
-        end
-
-        def forked?
-          ::Process.pid != (@pid ||= nil)
-        end
-
-        def update_native_ids
-          # Can only resolve if invoked from same thread
-          return unless ::Thread.current == self
-
-          @pid = ::Process.pid
-          @pthread_thread_id = NativePthread.get_pthread_thread_id(self)
-          @clock_id = NativePthread.get_clock_id(self, @pthread_thread_id)
-        end
-      end
-
-      # Threads in Ruby can be started by creating a new instance of `Thread` (or a subclass) OR by calling
-      # `start`/`fork` on `Thread` (or a subclass).
-      #
-      # This module intercepts calls to `start`/`fork`, ensuring that the `update_native_ids` operation is correctly
-      # called once the new thread starts.
-      #
-      # Note that unlike CThread above, this module should be prepended to the `Thread`'s singleton class, not to
-      # the class.
-      module WrapThreadStartFork
-        def start(*args)
-          # Wrap the work block with our own
-          # so we can retrieve the native thread ID within the thread's context.
-          wrapped_block = proc do |*t_args|
-            # Set native thread ID & clock ID
-            ::Thread.current.send(:update_native_ids)
-            yield(*t_args)
-          end
-          wrapped_block.ruby2_keywords if wrapped_block.respond_to?(:ruby2_keywords, true)
-
-          super(*args, &wrapped_block)
-        end
-        ruby2_keywords :start if respond_to?(:ruby2_keywords, true)
-
-        alias fork start
-      end
-    end
-  end
-end