ddtrace 0.52.0 → 0.53.0

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

@@ -64,22 +64,10 @@ module Datadog
           end
         end
 
-        private_class_method def self.default_adapter
-          :net_http
-        end
-
         private_class_method def self.configure_for_agent(transport, profiling_upload_timeout_seconds:, agent_settings:)
           apis = API.agent_defaults
 
-          transport.adapter(
-            default_adapter,
-            agent_settings.hostname,
-            agent_settings.port,
-            # We explictly use profiling_upload_timeout_seconds instead of agent_settings.timeout because profile
-            # uploads are bigger and thus we employ a separate configuration.
-            timeout: profiling_upload_timeout_seconds,
-            ssl: agent_settings.ssl
-          )
+          transport.adapter(agent_settings.merge(timeout_seconds: profiling_upload_timeout_seconds))
           transport.api(API::V1, apis[API::V1], default: true)
 
           # NOTE: This proc, when it exists, usually overrides the transport specified above
@@ -96,7 +84,7 @@ module Datadog
           port = site_uri.port
 
           transport.adapter(
-            default_adapter,
+            Datadog::Ext::Transport::HTTP::ADAPTER,
             hostname,
             port,
             timeout: profiling_upload_timeout_seconds,
@@ -111,9 +99,12 @@ module Datadog
         end
 
         # Add adapters to registry
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::Net, :net_http)
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::Test, :test)
-        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::UnixSocket, :unix)
+        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::Net,
+                                                        Datadog::Ext::Transport::HTTP::ADAPTER)
+        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::Test,
+                                                        Datadog::Ext::Transport::Test::ADAPTER)
+        Datadog::Transport::HTTP::Builder::REGISTRY.set(Datadog::Transport::HTTP::Adapters::UnixSocket,
+                                                        Datadog::Ext::Transport::UnixSocket::ADAPTER)
       end
     end
   end

data/lib/ddtrace/runtime/metrics.rb

@@ -7,6 +7,7 @@ require 'datadog/core/environment/class_count'
 require 'datadog/core/environment/gc'
 require 'datadog/core/environment/identity'
 require 'datadog/core/environment/thread_count'
+require 'datadog/core/environment/vm_cache'
 
 module Datadog
   module Runtime
@@ -58,12 +59,25 @@ module Datadog
             gauge(Ext::Runtime::Metrics::METRIC_CLASS_COUNT, Core::Environment::ClassCount.value)
           end
         end
+
         try_flush do
           if Core::Environment::ThreadCount.available?
             gauge(Ext::Runtime::Metrics::METRIC_THREAD_COUNT, Core::Environment::ThreadCount.value)
           end
         end
+
         try_flush { gc_metrics.each { |metric, value| gauge(metric, value) } if Core::Environment::GC.available? }
+
+        try_flush do
+          if Core::Environment::VMCache.available?
+            gauge(Ext::Runtime::Metrics::METRIC_GLOBAL_CONSTANT_STATE, Core::Environment::VMCache.global_constant_state)
+
+            # global_method_state is not available since Ruby >= 3.0,
+            # as method caching was moved to a per-class basis.
+            global_method_state = Core::Environment::VMCache.global_method_state
+            gauge(Ext::Runtime::Metrics::METRIC_GLOBAL_METHOD_STATE, global_method_state) if global_method_state
+          end
+        end
       end
 
       def gc_metrics

data/lib/ddtrace/span.rb

@@ -53,12 +53,7 @@ module Datadog
       Ext::NET::TAG_HOSTNAME => true
     }.freeze
 
-    # Simple indirection used to contain the latest resource name for a span.
-    # The profiler keeps a reference to these objects while sampling so it can extract the latest resource after the
-    # fact, as some integrations only set the correct name at the end of the span.
-    ResourceContainer = Struct.new(:latest)
-
-    attr_accessor :name, :service, :span_type,
+    attr_accessor :name, :service, :resource, :span_type,
                   :span_id, :trace_id, :parent_id,
                   :status, :sampled,
                   :tracer, :context
@@ -71,7 +66,8 @@ module Datadog
     # and then <tt>finish()</tt> once the tracer operation is over.
     #
     # * +service+: the service name for this span
-    # * +resource+: the resource this span refers, or +name+ if it's missing
+    # * +resource+: the resource this span refers, or +name+ if it's missing.
+    #     +nil+ can be used as a placeholder, when the resource value is not yet known at +#initialize+ time.
     # * +span_type+: the type of the span (such as +http+, +db+ and so on)
     # * +parent_id+: the identifier of the parent span
     # * +trace_id+: the identifier of the root span for this trace
@@ -81,7 +77,7 @@ module Datadog
 
       @name = name
       @service = options.fetch(:service, nil)
-      @resource_container = ResourceContainer.new(options.fetch(:resource, name))
+      @resource = options.fetch(:resource, name)
       @span_type = options.fetch(:span_type, nil)
 
       @span_id = Datadog::Utils.next_id
@@ -289,7 +285,7 @@ module Datadog
         trace_id: @trace_id,
         name: @name,
         service: @service,
-        resource: resource,
+        resource: @resource,
         type: @span_type,
         meta: @meta,
         metrics: @metrics,
@@ -343,7 +339,7 @@ module Datadog
       packer.write('service')
       packer.write(@service)
       packer.write('resource')
-      packer.write(resource)
+      packer.write(@resource)
       packer.write('type')
       packer.write(@span_type)
       packer.write('meta')
@@ -375,7 +371,7 @@ module Datadog
         q.text "Trace ID: #{@trace_id}\n"
         q.text "Type: #{@span_type}\n"
         q.text "Service: #{@service}\n"
-        q.text "Resource: #{resource}\n"
+        q.text "Resource: #{@resource}\n"
         q.text "Error: #{@status}\n"
         q.text "Start: #{start_time}\n"
         q.text "End: #{end_time}\n"
@@ -414,14 +410,6 @@ module Datadog
       end
     end
 
-    def resource
-      @resource_container.latest
-    end
-
-    def resource=(resource)
-      @resource_container.latest = resource
-    end
-
     private
 
     def duration_marker

data/lib/ddtrace/tracer.rb

@@ -200,7 +200,7 @@ module Datadog
       if parent.nil?
         # root span
         @sampler.sample!(span)
-        span.set_tag('system.pid', Process.pid)
+        span.set_tag(Datadog::Ext::Runtime::TAG_PID, Process.pid)
         span.set_tag(Datadog::Ext::Runtime::TAG_ID, Datadog::Core::Environment::Identity.id)
 
         if ctx && ctx.trace_id

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

@@ -16,13 +16,23 @@ module Datadog
 
           DEFAULT_TIMEOUT = 30
 
-          def initialize(hostname, port, options = {})
-            @hostname = hostname
-            @port = port
+          # @deprecated Positional parameters are deprecated. Use named parameters instead.
+          def initialize(hostname = nil, port = nil, **options)
+            @hostname = hostname || options.fetch(:hostname)
+            @port = port || options.fetch(:port)
             @timeout = options[:timeout] || DEFAULT_TIMEOUT
             @ssl = options.key?(:ssl) ? options[:ssl] == true : false
           end
 
+          def self.build(agent_settings)
+            new(
+              hostname: agent_settings.hostname,
+              port: agent_settings.port,
+              timeout: agent_settings.timeout_seconds,
+              ssl: agent_settings.ssl
+            )
+          end
+
           def open(&block)
             # DEV Initializing +Net::HTTP+ directly help us avoid expensive
             # options processing done in +Net::HTTP.start+:

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

@@ -11,8 +11,10 @@ module Datadog
             :buffer,
             :status
 
-          def initialize(buffer = nil)
-            @buffer = buffer
+          # @param buffer [Array] an optional array that will capture all spans sent to this adapter, defaults to +nil+
+          # @deprecated Positional parameters are deprecated. Use named parameters instead.
+          def initialize(buffer = nil, **options)
+            @buffer = buffer || options[:buffer]
             @mutex = Mutex.new
             @status = 200
           end

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.

data/lib/ddtrace/version.rb

@@ -2,7 +2,7 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 52
+    MINOR = 53
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.52.0
+  version: 0.53.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -99,6 +99,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 +131,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 +157,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
@@ -392,6 +414,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