ddtrace 0.52.0 → 0.53.0

data/lib/ddtrace/configuration/agent_settings_resolver.rb

@@ -20,25 +20,49 @@ module Datadog
     class AgentSettingsResolver
       AgentSettings = \
         Struct.new(
+          :adapter,
           :ssl,
           :hostname,
           :port,
+          :uds_path,
           :timeout_seconds,
           :deprecated_for_removal_transport_configuration_proc,
           :deprecated_for_removal_transport_configuration_options
         ) do
           def initialize(
+            adapter:,
             ssl:,
             hostname:,
             port:,
+            uds_path:,
             timeout_seconds:,
             deprecated_for_removal_transport_configuration_proc:,
             deprecated_for_removal_transport_configuration_options:
           )
-            super(ssl, hostname, port, timeout_seconds, deprecated_for_removal_transport_configuration_proc, \
-              deprecated_for_removal_transport_configuration_options)
+            super(
+              adapter,
+              ssl,
+              hostname,
+              port,
+              uds_path,
+              timeout_seconds,
+              deprecated_for_removal_transport_configuration_proc,
+              deprecated_for_removal_transport_configuration_options,
+            )
             freeze
           end
+
+          # Returns a frozen copy of this struct
+          # with the provided +member_values+ modified.
+          def merge(**member_values)
+            new_struct = dup
+
+            member_values.each do |member, value|
+              new_struct[member] = value
+            end
+
+            new_struct.freeze
+          end
         end
 
       def self.call(settings, logger: Datadog.logger)
@@ -58,9 +82,11 @@ module Datadog
 
       def call
         AgentSettings.new(
+          adapter: adapter,
           ssl: ssl?,
           hostname: hostname,
           port: port,
+          uds_path: uds_path,
           timeout_seconds: timeout_seconds,
           # NOTE: When provided, the deprecated_for_removal_transport_configuration_proc can override all
           # values above (ssl, hostname, port, timeout), or even make them irrelevant (by using an unix socket or
@@ -72,27 +98,38 @@ module Datadog
         )
       end
 
-      def hostname
-        pick_from(
-          configurations_in_priority_order: [
-            DetectedConfiguration.new(
-              friendly_name: "'c.tracer.hostname'",
-              value: settings.tracer.hostname
-            ),
-            DetectedConfiguration.new(
-              friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_URL} environment variable",
-              value: parsed_url && parsed_url.hostname
-            ),
-            DetectedConfiguration.new(
-              friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_HOST} environment variable",
-              value: ENV[Datadog::Ext::Transport::HTTP::ENV_DEFAULT_HOST]
-            )
-          ],
-          or_use_default: Datadog::Ext::Transport::HTTP::DEFAULT_HOST
+      def adapter
+        # If no agent settings have been provided, we try to connect using a local unix socket.
+        # We only do so if the socket is present when `ddtrace` runs.
+        if should_use_uds_fallback?
+          Ext::Transport::UnixSocket::ADAPTER
+        else
+          Ext::Transport::HTTP::ADAPTER
+        end
+      end
+
+      def configured_hostname
+        return @configured_hostname if defined?(@configured_hostname)
+
+        @configured_hostname = pick_from(
+          DetectedConfiguration.new(
+            friendly_name: "'c.tracer.hostname'",
+            value: settings.tracer.hostname
+          ),
+          DetectedConfiguration.new(
+            friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_URL} environment variable",
+            value: parsed_url && parsed_url.hostname
+          ),
+          DetectedConfiguration.new(
+            friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_HOST} environment variable",
+            value: ENV[Datadog::Ext::Transport::HTTP::ENV_DEFAULT_HOST]
+          )
         )
       end
 
-      def port
+      def configured_port
+        return @configured_port if defined?(@configured_port)
+
         port_from_env = ENV[Datadog::Ext::Transport::HTTP::ENV_DEFAULT_PORT]
         parsed_port_from_env =
           if port_from_env
@@ -106,22 +143,19 @@ module Datadog
             end
           end
 
-        pick_from(
-          configurations_in_priority_order: [
-            DetectedConfiguration.new(
-              friendly_name: '"c.tracer.port"',
-              value: settings.tracer.port
-            ),
-            DetectedConfiguration.new(
-              friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_URL} environment variable",
-              value: parsed_url && parsed_url.port
-            ),
-            DetectedConfiguration.new(
-              friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_PORT} environment variable",
-              value: parsed_port_from_env
-            )
-          ],
-          or_use_default: Datadog::Ext::Transport::HTTP::DEFAULT_PORT
+        @configured_port = pick_from(
+          DetectedConfiguration.new(
+            friendly_name: '"c.tracer.port"',
+            value: settings.tracer.port
+          ),
+          DetectedConfiguration.new(
+            friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_URL} environment variable",
+            value: parsed_url && parsed_url.port
+          ),
+          DetectedConfiguration.new(
+            friendly_name: "#{Datadog::Ext::Transport::HTTP::ENV_DEFAULT_PORT} environment variable",
+            value: parsed_port_from_env
+          )
         )
       end
 
@@ -129,8 +163,23 @@ module Datadog
         !parsed_url.nil? && parsed_url.scheme == 'https'
       end
 
+      def hostname
+        configured_hostname || (should_use_uds_fallback? ? nil : Datadog::Ext::Transport::HTTP::DEFAULT_HOST)
+      end
+
+      def port
+        configured_port || (should_use_uds_fallback? ? nil : Datadog::Ext::Transport::HTTP::DEFAULT_PORT)
+      end
+
+      # Unix socket path in the file system
+      def uds_path
+        uds_fallback
+      end
+
+      # Defaults to +nil+, letting the adapter choose what default
+      # works best in their case.
       def timeout_seconds
-        Datadog::Ext::Transport::HTTP::DEFAULT_TIMEOUT_SECONDS
+        nil
       end
 
       def deprecated_for_removal_transport_configuration_proc
@@ -150,6 +199,26 @@ module Datadog
         end
       end
 
+      # We only use the default unix socket if it is already present.
+      # This is by design, as we still want to use the default host:port if no unix socket is present.
+      def uds_fallback
+        return @uds_fallback if defined?(@uds_fallback)
+
+        @uds_fallback =
+          if configured_hostname.nil? &&
+             configured_port.nil? &&
+             deprecated_for_removal_transport_configuration_proc.nil? &&
+             deprecated_for_removal_transport_configuration_options.nil? &&
+             File.exist?(Ext::Transport::UnixSocket::DEFAULT_PATH)
+
+            Ext::Transport::UnixSocket::DEFAULT_PATH
+          end
+      end
+
+      def should_use_uds_fallback?
+        uds_fallback != nil
+      end
+
       def parsed_url
         return @parsed_url if defined?(@parsed_url)
 
@@ -177,7 +246,7 @@ module Datadog
         @unparsed_url_from_env ||= ENV[Datadog::Ext::Transport::HTTP::ENV_DEFAULT_URL]
       end
 
-      def pick_from(configurations_in_priority_order:, or_use_default:)
+      def pick_from(*configurations_in_priority_order)
         detected_configurations_in_priority_order = configurations_in_priority_order.select(&:value?)
 
         if detected_configurations_in_priority_order.any?
@@ -186,8 +255,6 @@ module Datadog
           # The configurations are listed in priority, so we only need to look at the first; if there's more than
           # one, we emit a warning above
           detected_configurations_in_priority_order.first.value
-        else
-          or_use_default
         end
       end
 

data/lib/ddtrace/configuration/components.rb

@@ -117,7 +117,7 @@ module Datadog
 
           trace_identifiers_helper = Datadog::Profiling::TraceIdentifiers::Helper.new(
             tracer: tracer,
-            extract_trace_resource: settings.profiling.advanced.extract_trace_resource
+            endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled
           )
 
           recorder = build_profiler_recorder(settings)

data/lib/ddtrace/configuration/settings.rb

@@ -161,6 +161,9 @@ module Datadog
         end
 
         settings :advanced do
+          # This should never be reduced, as it can cause the resulting profiles to become biased.
+          # The current default should be enough for most services, allowing 16 threads to be sampled around 30 times
+          # per second for a 60 second period.
           option :max_events, default: 32768
 
           # Controls the maximum number of frames for each thread sampled. Can be tuned to avoid omitted frames in the
@@ -170,9 +173,16 @@ module Datadog
             o.lazy
           end
 
-          # When using profiling together with tracing, this controls if trace resources (usually the endpoint names)
-          # are gathered and reported together with profiles.
-          option :extract_trace_resource, default: true
+          settings :endpoint do
+            settings :collection do
+              # When using profiling together with tracing, this controls if endpoint names
+              # are gathered and reported together with profiles.
+              option :enabled do |o|
+                o.default { env_to_bool(Ext::Profiling::ENV_ENDPOINT_COLLECTION_ENABLED, true) }
+                o.lazy
+              end
+            end
+          end
         end
 
         settings :upload do

data/lib/ddtrace/contrib/action_cable/instrumentation.rb

@@ -26,6 +26,52 @@ module Datadog
             end
           end
         end
+
+        # Instrumentation for when a Channel is subscribed to/unsubscribed from.
+        module ActionCableChannel
+          def self.included(base)
+            base.class_eval do
+              set_callback(
+                :subscribe,
+                :around,
+                ->(channel, block) { Tracer.trace(channel, :subscribe, &block) },
+                prepend: true
+              )
+
+              set_callback(
+                :unsubscribe,
+                :around,
+                ->(channel, block) { Tracer.trace(channel, :unsubscribe, &block) },
+                prepend: true
+              )
+            end
+          end
+
+          # Instrumentation for Channel hooks.
+          class Tracer
+            def self.trace(channel, hook)
+              configuration = Datadog.configuration[:action_cable]
+
+              Datadog.tracer.trace("action_cable.#{hook}") do |span|
+                span.service = configuration[:service_name]
+                span.resource = "#{channel.class}##{hook}"
+                span.span_type = Datadog::Ext::AppTypes::WEB
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                # Measure service stats
+                Contrib::Analytics.set_measured(span)
+
+                span.set_tag(Ext::TAG_CHANNEL_CLASS, channel.class.to_s)
+
+                yield
+              end
+            end
+          end
+        end
       end
     end
   end

data/lib/ddtrace/contrib/action_cable/patcher.rb

@@ -21,6 +21,7 @@ module Datadog
         def patch
           Events.subscribe!
           ::ActionCable::Connection::Base.prepend(Instrumentation::ActionCableConnection)
+          ::ActionCable::Channel::Base.include(Instrumentation::ActionCableChannel)
         end
       end
     end

data/lib/ddtrace/contrib/action_mailer/configuration/settings.rb

@@ -0,0 +1,32 @@
+# typed: false
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/action_mailer/ext'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      module Configuration
+        # Custom settings for the ActionMailer integration
+        class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
+          option :analytics_enabled do |o|
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
+            o.lazy
+          end
+
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
+            o.lazy
+          end
+
+          option :service_name, default: Ext::SERVICE_NAME
+          option :email_data, default: false
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/event.rb

@@ -0,0 +1,50 @@
+# typed: false
+require 'ddtrace/contrib/analytics'
+require 'ddtrace/contrib/active_support/notifications/event'
+require 'ddtrace/contrib/action_mailer/ext'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      # Defines basic behaviors for an ActionMailer event.
+      module Event
+        def self.included(base)
+          base.send(:include, ActiveSupport::Notifications::Event)
+          base.send(:extend, ClassMethods)
+        end
+
+        # Class methods for ActionMailer events.
+        module ClassMethods
+          def span_options
+            { service: configuration[:service_name] }
+          end
+
+          def tracer
+            -> { configuration[:tracer] }
+          end
+
+          def configuration
+            Datadog.configuration[:action_mailer]
+          end
+
+          def process(span, event, _id, payload)
+            span.service = configuration[:service_name]
+            span.resource = payload[:mailer]
+
+            # Set analytics sample rate
+            if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+              Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+            end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
+            report_if_exception(span, payload)
+          rescue StandardError => e
+            Datadog.logger.debug(e.message)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/events/deliver.rb

@@ -0,0 +1,54 @@
+# typed: false
+require 'ddtrace/contrib/action_mailer/ext'
+require 'ddtrace/contrib/action_mailer/event'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      module Events
+        # Defines instrumentation for process.action_mailer event
+        module Deliver
+          include ActionMailer::Event
+
+          EVENT_NAME = 'deliver.action_mailer'.freeze
+
+          module_function
+
+          def event_name
+            self::EVENT_NAME
+          end
+
+          def span_name
+            Ext::SPAN_DELIVER
+          end
+
+          def span_type
+            # deliver.action_mailer sends emails
+            Datadog::Ext::AppTypes::WORKER
+          end
+
+          def process(span, event, _id, payload)
+            super
+
+            span.span_type = span_type
+            span.set_tag(Ext::TAG_MAILER, payload[:mailer])
+            span.set_tag(Ext::TAG_MSG_ID, payload[:message_id])
+
+            # Since email date can contain PII we disable by default
+            # Some of these fields can be either strings or arrays, so we try to normalize
+            # https://github.com/rails/rails/blob/18707ab17fa492eb25ad2e8f9818a320dc20b823/actionmailer/lib/action_mailer/base.rb#L742-L754
+            if configuration[:email_data] == true
+              span.set_tag(Ext::TAG_SUBJECT, payload[:subject].to_s) if payload[:subject]
+              span.set_tag(Ext::TAG_TO, payload[:to].join(',')) if payload[:to]
+              span.set_tag(Ext::TAG_FROM, payload[:from].join(',')) if payload[:from]
+              span.set_tag(Ext::TAG_BCC, payload[:bcc].join(',')) if payload[:bcc]
+              span.set_tag(Ext::TAG_CC, payload[:cc].join(',')) if payload[:cc]
+              span.set_tag(Ext::TAG_DATE, payload[:date].to_s) if payload[:date]
+              span.set_tag(Ext::TAG_PERFORM_DELIVERIES, payload[:perform_deliveries]) if payload[:perform_deliveries]
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/events/process.rb

@@ -0,0 +1,41 @@
+# typed: false
+require 'ddtrace/contrib/action_mailer/ext'
+require 'ddtrace/contrib/action_mailer/event'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      module Events
+        # Defines instrumentation for process.action_mailer event
+        module Process
+          include ActionMailer::Event
+
+          EVENT_NAME = 'process.action_mailer'.freeze
+
+          module_function
+
+          def event_name
+            self::EVENT_NAME
+          end
+
+          def span_name
+            Ext::SPAN_PROCESS
+          end
+
+          def span_type
+            # process.action_mailer processes email and renders partial templates
+            Datadog::Ext::HTTP::TEMPLATE
+          end
+
+          def process(span, event, _id, payload)
+            super
+
+            span.span_type = span_type
+            span.set_tag(Ext::TAG_ACTION, payload[:action])
+            span.set_tag(Ext::TAG_MAILER, payload[:mailer])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/events.rb

@@ -0,0 +1,31 @@
+# typed: false
+require 'ddtrace/contrib/action_mailer/events/process'
+require 'ddtrace/contrib/action_mailer/events/deliver'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      # Defines collection of instrumented ActionMailer events
+      module Events
+        ALL = [
+          Events::Process,
+          Events::Deliver
+        ].freeze
+
+        module_function
+
+        def all
+          self::ALL
+        end
+
+        def subscriptions
+          all.collect(&:subscriptions).collect(&:to_a).flatten
+        end
+
+        def subscribe!
+          all.each(&:subscribe!)
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/ext.rb

@@ -0,0 +1,32 @@
+# typed: true
+module Datadog
+  module Contrib
+    module ActionMailer
+      # ActionMailer integration constants
+      module Ext
+        APP = 'action_mailer'.freeze
+        ENV_ENABLED = 'DD_TRACE_ACTION_MAILER_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_MAILER_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_MAILER_ANALYTICS_SAMPLE_RATE'.freeze
+
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ACTION_MAILER_ANALYTICS_ENABLED'.freeze
+
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ACTION_MAILER_ANALYTICS_SAMPLE_RATE'.freeze
+        SERVICE_NAME = 'action_mailer'.freeze
+        SPAN_PROCESS = 'action_mailer.process'.freeze
+        SPAN_DELIVER = 'action_mailer.deliver'.freeze
+        TAG_ACTION = 'action_mailer.action'.freeze
+        TAG_MAILER = 'action_mailer.mailer'.freeze
+        TAG_MSG_ID = 'action_mailer.message_id'.freeze
+
+        TAG_SUBJECT = 'action_mailer.subject'.freeze
+        TAG_TO = 'action_mailer.to'.freeze
+        TAG_FROM = 'action_mailer.from'.freeze
+        TAG_BCC = 'action_mailer.bcc'.freeze
+        TAG_CC = 'action_mailer.cc'.freeze
+        TAG_DATE = 'action_mailer.date'.freeze
+        TAG_PERFORM_DELIVERIES = 'action_mailer.perform_deliveries'.freeze
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/integration.rb

@@ -0,0 +1,45 @@
+# typed: false
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/action_mailer/configuration/settings'
+require 'ddtrace/contrib/action_mailer/patcher'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      # Description of ActionMailer integration
+      class Integration
+        include Contrib::Integration
+
+        MINIMUM_VERSION = Gem::Version.new('5.0.0')
+
+        register_as :action_mailer, auto_patch: false
+
+        def self.version
+          Gem.loaded_specs['actionmailer'] && Gem.loaded_specs['actionmailer'].version
+        end
+
+        def self.loaded?
+          !defined?(::ActionMailer).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION && !defined?(::ActiveSupport::Notifications).nil?
+        end
+
+        # enabled by rails integration so should only auto instrument
+        # if detected that it is being used without rails
+        def auto_instrument?
+          !Datadog::Contrib::Rails::Utils.railtie_supported?
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          ActionMailer::Patcher
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/action_mailer/patcher.rb

@@ -0,0 +1,27 @@
+# typed: true
+require 'ddtrace/contrib/patcher'
+require 'ddtrace/ext/app_types'
+require 'ddtrace/contrib/action_mailer/ext'
+require 'ddtrace/contrib/action_mailer/events'
+
+module Datadog
+  module Contrib
+    module ActionMailer
+      # Patcher enables patching of 'action_mailer' module.
+      module Patcher
+        include Contrib::Patcher
+
+        module_function
+
+        def target_version
+          Integration.version
+        end
+
+        def patch
+          # Subscribe to ActionMailer events
+          Events.subscribe!
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/active_job/configuration/settings.rb

@@ -0,0 +1,33 @@
+# typed: false
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/active_job/ext'
+
+module Datadog
+  module Contrib
+    module ActiveJob
+      module Configuration
+        # Custom settings for the DelayedJob integration
+        class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
+          option :analytics_enabled do |o|
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
+            o.lazy
+          end
+
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
+            o.lazy
+          end
+
+          option :service_name, default: Ext::SERVICE_NAME
+          option :error_handler, default: Datadog::Tracer::DEFAULT_ON_ERROR
+          option :log_injection, default: false
+        end
+      end
+    end
+  end
+end