datadog 2.8.0 → 2.39.0

data/lib/datadog/tracing/configuration/settings.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../tracing/configuration/ext'
-require_relative '../../core/environment/variable_helpers'
-require_relative 'http'
+require_relative "../../tracing/configuration/ext"
+require_relative "../../core/environment/variable_helpers"
+require_relative "../contrib/status_range_matcher"
+require_relative "../contrib/status_range_env_parser"
+require_relative "http"
 
 module Datadog
   module Tracing
@@ -42,7 +44,7 @@ module Datadog
               #
               # The tracer will try to find distributed headers in the order they are present in the list provided to this option.
               # The first format to have valid data present will be used.
-              #
+              # Baggage style is a special case, as it will always be extracted in addition if present.
               # @default `DD_TRACE_PROPAGATION_STYLE_EXTRACT` environment variable (comma-separated list),
               #   otherwise `['datadog','b3multi','b3']`.
               # @return [Array<String>]
@@ -53,6 +55,7 @@ module Datadog
                   [
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
+                    Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE,
                   ]
                 )
                 o.after_set do |styles|
@@ -74,6 +77,7 @@ module Datadog
                 o.default [
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT,
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE,
                 ]
                 o.after_set do |styles|
                   # Make values case-insensitive
@@ -91,9 +95,10 @@ module Datadog
               # @return [Array<String>]
               option :propagation_style do |o|
                 o.type :array
-                o.env [Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE, Configuration::Ext::Distributed::ENV_OTEL_PROPAGATION_STYLE]
+                # Note: Alias (DD_TRACE_PROPAGATION_STYLE) defined in supported-configurations.json
+                o.env Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
                 o.default []
-                o.after_set do |styles|
+                o.after_set do |styles, _, precedence|
                   next if styles.empty?
 
                   # Make values case-insensitive
@@ -107,8 +112,25 @@ module Datadog
                       false
                     end
                   end
-                  set_option(:propagation_style_extract, styles)
-                  set_option(:propagation_style_inject, styles)
+                  set_option(:propagation_style_extract, styles, precedence: precedence)
+                  set_option(:propagation_style_inject, styles, precedence: precedence)
+                end
+              end
+
+              # Behavior applied to a distributed-trace context extracted from incoming requests.
+              option :propagation_behavior_extract do |o|
+                o.env Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_BEHAVIOR_EXTRACT
+                o.default Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE
+                o.type :string
+                o.env_parser do |value|
+                  value = value&.downcase
+                  if Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_SUPPORTED.include?(value)
+                    value
+                  else
+                    Datadog.logger.warn("Unsupported propagation behavior extract: #{value.inspect}. " \
+                      "Set to default value (#{Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE}).")
+                    nil
+                  end
                 end
               end
 
@@ -131,17 +153,20 @@ module Datadog
               # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
               # @return [Boolean]
               option :enabled do |o|
-                o.env [Tracing::Configuration::Ext::ENV_ENABLED, Tracing::Configuration::Ext::ENV_OTEL_TRACES_EXPORTER]
+                # Note: Alias (OTEL_TRACES_EXPORTER) defined in supported-configurations.json
+                o.env Tracing::Configuration::Ext::ENV_ENABLED
                 o.default true
                 o.type :bool
                 o.env_parser do |value|
                   value = value&.downcase
                   # Tracing is disabled when OTEL_TRACES_EXPORTER is none or
                   # DD_TRACE_ENABLED is 0 or false.
-                  if ['none', 'false', '0'].include?(value)
+                  # DEV: The current implementation accepts all of the mentioned values
+                  # for both environment variables, which is incorrect.
+                  if ["none", "false", "0"].include?(value)
                     false
                   # Tracing is enabled when DD_TRACE_ENABLED is true or 1
-                  elsif ['true', '1'].include?(value)
+                  elsif ["true", "1"].include?(value)
                     true
                   else
                     Datadog.logger.warn("Unsupported value for exporting datadog traces: #{value}. Traces will be sent to Datadog.")
@@ -168,6 +193,23 @@ module Datadog
                 o.setter { |header_tags, _| Configuration::HTTP::HeaderTags.new(header_tags) }
               end
 
+              # Comma-separated list of baggage keys that should be converted to span tags.
+              #
+              # Baggage keys matching the exact, case-sensitive names in this list will be converted
+              # to span tags with the prefix "baggage.".
+              #
+              # Special values:
+              # * Empty string ("") disables baggage tag conversion
+              # * Wildcard ("*") converts all baggage keys to span tags
+              #
+              # @default `DD_TRACE_BAGGAGE_TAG_KEYS` environment variable, otherwise `"user.id,session.id,account.id"`
+              # @return [Array<String>, Symbol, nil] processed baggage tag keys configuration
+              option :baggage_tag_keys do |o|
+                o.env Configuration::Ext::ENV_BAGGAGE_TAG_KEYS
+                o.type :array
+                o.default ["user.id", "session.id", "account.id"]
+              end
+
               # Enable 128 bit trace id generation.
               #
               # @default `DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED` environment variable, otherwise `true`
@@ -186,7 +228,7 @@ module Datadog
               # It is not supported by our backend yet. Do not enable it.
               option :trace_id_128_bit_logging_enabled do |o|
                 o.env Tracing::Configuration::Ext::Correlation::ENV_TRACE_ID_128_BIT_LOGGING_ENABLED
-                o.default false
+                o.default true
                 o.type :bool
               end
 
@@ -249,6 +291,52 @@ module Datadog
                 o.type :bool
               end
 
+              settings :resource_renaming do
+                # Whether resource renaming is enabled. When enabled, http.endpoint tag
+                # containing a route will be reported in traces. If AppSec is enabled,
+                # this feature will be enabled by default.
+                #
+                # For web applications built with instrumented frameworks, http.endpoint tag
+                # will contain the route as it is defined in the application.
+                # For basic Rack applications, or applications that are mounted and are not instrumented,
+                # the route will be inferred from the request path.
+                #
+                # @default `DD_TRACE_RESOURCE_RENAMING_ENABLED` environment variable, otherwise `false`.
+                # @return [Boolean]
+                option :enabled do |o|
+                  o.type :bool, nilable: false
+                  o.env Configuration::Ext::ENV_RESOURCE_RENAMING_ENABLED
+                  o.default false
+                end
+
+                # When set to true, http.endoint is always inferred from path,
+                # instead of using http.route value when it is set.
+                #
+                # This is useful for testing purposes.
+                #
+                # @default false
+                # @return [Boolean]
+                option :always_simplified_endpoint do |o|
+                  o.type :bool, nilable: false
+                  o.env Configuration::Ext::ENV_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT
+                  o.default false
+                end
+              end
+
+              # Forces the tracer to always send span events with the native span events format
+              # regardless of the agent support. This is useful in agent-less setups.
+              #
+              # When set to `nil`, the default, the agent will be queried for
+              # native span events support.
+              #
+              # @default `DD_TRACE_NATIVE_SPAN_EVENTS` environment variable, otherwise `false`
+              # @return [Boolean,nil]
+              option :native_span_events do |o|
+                o.env Tracing::Configuration::Ext::ENV_NATIVE_SPAN_EVENTS
+                o.default nil
+                o.type :bool, nilable: true
+              end
+
               # A custom sampler instance.
               # The object must respect the {Datadog::Tracing::Sampling::Sampler} interface.
               # @default `nil`
@@ -269,13 +357,14 @@ module Datadog
                 # @return [Float, nil]
                 option :default_rate do |o|
                   o.type :float, nilable: true
-                  o.env [Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, Tracing::Configuration::Ext::Sampling::ENV_OTEL_TRACES_SAMPLER]
+                  # Note: Alias (OTEL_TRACES_SAMPLER) defined in supported-configurations.json
+                  o.env Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE
                   o.env_parser do |value|
                     # Parse the value as a float
                     next if value.nil?
 
                     value = value&.downcase
-                    if ['always_on', 'always_off', 'traceidratio'].include?(value)
+                    if ["always_on", "always_off", "traceidratio"].include?(value)
                       Datadog.logger.warn("The value '#{value}' is not yet supported. 'parentbased_#{value}' will be used instead.")
                       value = "parentbased_#{value}"
                     end
@@ -283,12 +372,12 @@ module Datadog
                     # These values are mapped to a sample rate.
                     # DD_TRACE_SAMPLE_RATE sets the sample rate to float.
                     case value
-                    when 'parentbased_always_on'
+                    when "parentbased_always_on"
                       1.0
-                    when 'parentbased_always_off'
+                    when "parentbased_always_off"
                       0.0
-                    when 'parentbased_traceidratio'
-                      ENV.fetch(Tracing::Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
+                    when "parentbased_traceidratio"
+                      DATADOG_ENV.fetch(Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
                     else
                       value.to_f
                     end
@@ -322,7 +411,7 @@ module Datadog
                 # @public_api
                 option :rules do |o|
                   o.type :string, nilable: true
-                  o.default { ENV.fetch(Configuration::Ext::Sampling::ENV_RULES, nil) }
+                  o.default { DATADOG_ENV.fetch(Configuration::Ext::Sampling::ENV_RULES, nil) }
                 end
 
                 # Single span sampling rules.
@@ -339,15 +428,15 @@ module Datadog
                 option :span_rules do |o|
                   o.type :string, nilable: true
                   o.default do
-                    rules = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES]
-                    rules_file = ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE]
+                    rules = DATADOG_ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES]
+                    rules_file = DATADOG_ENV[Tracing::Configuration::Ext::Sampling::Span::ENV_SPAN_SAMPLING_RULES_FILE]
 
                     if rules
                       if rules_file
                         Datadog.logger.warn(
-                          'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \
-                            'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \
-                            'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. ' \
+                          "Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only " \
+                            "DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when " \
+                            "also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. " \
                             "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}"
                         )
                       end
@@ -358,8 +447,8 @@ module Datadog
                       rescue => e
                         # `File#read` errors have clear and actionable messages, no need to add extra exception info.
                         Datadog.logger.warn(
-                          "Cannot read span sampling rules file `#{rules_file}`: #{e.message}." \
-                          'No span sampling rules will be applied.'
+                          "Cannot read span sampling rules file `#{rules_file}`: #{e.class}: #{e.message}." \
+                          "No span sampling rules will be applied."
                         )
                         nil
                       end
@@ -409,6 +498,7 @@ module Datadog
               # @default `{}`
               # @return [Hash]
               option :writer_options do |o|
+                o.skip_telemetry true
                 o.type :hash
                 o.default({})
               end
@@ -452,6 +542,46 @@ module Datadog
                 o.env Tracing::Configuration::Ext::Distributed::ENV_X_DATADOG_TAGS_MAX_LENGTH
                 o.default 512
               end
+
+              # HTTP error statuses configuration
+              # @public_api
+              settings :http_error_statuses do
+                # Defines the range of status codes to be considered errors on http.server span kinds.
+                # Once set, only the values within the specified range are considered errors.
+                #
+                # Format of env var: comma-separated list of values like 500,501,502 or ranges like 500-599 (e.g. `500,502,504-510`)
+                #
+                # @default `DD_TRACE_HTTP_SERVER_ERROR_STATUSES` environment variable, otherwise `500..599`.
+                # @return [Tracing::Contrib::StatusRangeMatcher]
+                option :server do |o|
+                  o.env Tracing::Configuration::Ext::HTTPErrorStatuses::ENV_SERVER_ERROR_STATUSES
+                  o.default 500..599
+                  o.setter do |v|
+                    Tracing::Contrib::StatusRangeMatcher.new(v) if v
+                  end
+                  o.env_parser do |values|
+                    Tracing::Contrib::StatusRangeEnvParser.call(values)
+                  end
+                end
+
+                # Defines the range of status codes to be considered errors on http.client span kinds.
+                # Once set, only the values within the specified range are considered errors.
+                #
+                # Format of env var: comma-separated list of values like 400,401,402 or ranges like 400-499 (e.g. `400,402,404-410`)
+                #
+                # @default `DD_TRACE_HTTP_CLIENT_ERROR_STATUSES` environment variable, otherwise `400..499`.
+                # @return [Tracing::Contrib::StatusRangeMatcher]
+                option :client do |o|
+                  o.env Tracing::Configuration::Ext::HTTPErrorStatuses::ENV_CLIENT_ERROR_STATUSES
+                  o.default 400..499
+                  o.setter do |v|
+                    Tracing::Contrib::StatusRangeMatcher.new(v) if v
+                  end
+                  o.env_parser do |values|
+                    Tracing::Contrib::StatusRangeEnvParser.call(values)
+                  end
+                end
+              end
             end
           end
         end

data/lib/datadog/tracing/context.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../core/utils/forking'
+require_relative "../core/utils/forking"
 
 module Datadog
   module Tracing
@@ -53,7 +53,7 @@ module Datadog
 
       # Creates a copy of the context, when forked.
       def fork_clone
-        forked_trace = @active_trace && @active_trace.fork_clone
+        forked_trace = @active_trace&.fork_clone
         self.class.new(trace: forked_trace)
       end
 
@@ -61,7 +61,7 @@ module Datadog
 
       def set_active_trace!(trace)
         # Don't retain finished traces
-        @active_trace = trace && !trace.finished? ? trace : nil
+        @active_trace = (trace && !trace.finished?) ? trace : nil
       end
     end
   end

data/lib/datadog/tracing/context_provider.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../core/utils/sequence'
-require_relative 'context'
+require_relative "../core/utils/sequence"
+require_relative "context"
 
 module Datadog
   module Tracing
@@ -49,7 +49,7 @@ module Datadog
       # To support multiple tracers simultaneously, each {Datadog::Tracing::FiberLocalContext}
       # instance has its own fiber-local variable.
       def initialize
-        @key = "datadog_context_#{FiberLocalContext.next_instance_id}".to_sym
+        @key = :"datadog_context_#{FiberLocalContext.next_instance_id}"
 
         self.local = Context.new
       end

data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/action_cable/event.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../context'
-require_relative '../analytics'
-require_relative '../active_support/notifications/event'
-require_relative 'ext'
+require_relative "../../context"
+require_relative "../analytics"
+require_relative "../active_support/notifications/event"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -20,7 +20,7 @@ module Datadog
           module ClassMethods
             def span_options
               if configuration[:service_name]
-                { service: configuration[:service_name] }
+                {service: configuration[:service_name]}
               else
                 {}
               end

data/lib/datadog/tracing/contrib/action_cable/events/broadcast.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../event'
-require_relative '../ext'
-require_relative '../../analytics'
+require_relative "../../../metadata/ext"
+require_relative "../event"
+require_relative "../ext"
+require_relative "../../analytics"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
           module Broadcast
             include ActionCable::Event
 
-            EVENT_NAME = 'broadcast.action_cable'
+            EVENT_NAME = "broadcast.action_cable"
 
             module_function
 
@@ -36,7 +36,10 @@ module Datadog
 
             def on_start(span, _event, _id, payload)
               channel = payload[:broadcasting] # Channel has high cardinality
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.type = span_type
 
               # Set analytics sample rate

data/lib/datadog/tracing/contrib/action_cable/events/perform_action.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../../analytics'
-require_relative '../event'
+require_relative "../../../metadata/ext"
+require_relative "../../analytics"
+require_relative "../event"
 
 module Datadog
   module Tracing
@@ -16,7 +16,7 @@ module Datadog
           module PerformAction
             include ActionCable::RootContextEvent
 
-            EVENT_NAME = 'perform_action.action_cable'
+            EVENT_NAME = "perform_action.action_cable"
 
             module_function
 
@@ -37,7 +37,10 @@ module Datadog
               channel_class = payload[:channel_class]
               action = payload[:action]
 
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = "#{channel_class}##{action}"
               span.type = span_type
 

data/lib/datadog/tracing/contrib/action_cable/events/transmit.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../../metadata/ext'
-require_relative '../event'
-require_relative '../ext'
-require_relative '../../analytics'
+require_relative "../../../metadata/ext"
+require_relative "../event"
+require_relative "../ext"
+require_relative "../../analytics"
 
 module Datadog
   module Tracing
@@ -16,7 +16,7 @@ module Datadog
           module Transmit
             include ActionCable::Event
 
-            EVENT_NAME = 'transmit.action_cable'
+            EVENT_NAME = "transmit.action_cable"
 
             module_function
 
@@ -36,7 +36,10 @@ module Datadog
             def on_start(span, _event, _id, payload)
               channel_class = payload[:channel_class]
 
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = channel_class
               span.type = span_type
 

data/lib/datadog/tracing/contrib/action_cable/events.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'event'
-require_relative 'events/broadcast'
-require_relative 'events/perform_action'
-require_relative 'events/transmit'
+require_relative "event"
+require_relative "events/broadcast"
+require_relative "events/perform_action"
+require_relative "events/transmit"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/action_cable/ext.rb

@@ -7,25 +7,25 @@ module Datadog
         # ActionCable integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTION_CABLE_ENABLED'
+          ENV_ENABLED = "DD_TRACE_ACTION_CABLE_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTION_CABLE_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTION_CABLE_ANALYTICS_SAMPLE_RATE'
-          SPAN_ACTION = 'action_cable.action'
-          SPAN_BROADCAST = 'action_cable.broadcast'
-          SPAN_ON_OPEN = 'action_cable.on_open'
-          SPAN_TRANSMIT = 'action_cable.transmit'
-          TAG_ACTION = 'action_cable.action'
-          TAG_BROADCAST_CODER = 'action_cable.broadcast.coder'
-          TAG_CHANNEL = 'action_cable.channel'
-          TAG_CHANNEL_CLASS = 'action_cable.channel_class'
-          TAG_COMPONENT = 'action_cable'
-          TAG_CONNECTION = 'action_cable.connection'
-          TAG_OPERATION_ACTION = 'action'
-          TAG_OPERATION_BROADCAST = 'broadcast'
-          TAG_OPERATION_ON_OPEN = 'on_open'
-          TAG_OPERATION_TRANSMIT = 'transmit'
-          TAG_TRANSMIT_VIA = 'action_cable.transmit.via'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ACTION_CABLE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ACTION_CABLE_ANALYTICS_SAMPLE_RATE"
+          SPAN_ACTION = "action_cable.action"
+          SPAN_BROADCAST = "action_cable.broadcast"
+          SPAN_ON_OPEN = "action_cable.on_open"
+          SPAN_TRANSMIT = "action_cable.transmit"
+          TAG_ACTION = "action_cable.action"
+          TAG_BROADCAST_CODER = "action_cable.broadcast.coder"
+          TAG_CHANNEL = "action_cable.channel"
+          TAG_CHANNEL_CLASS = "action_cable.channel_class"
+          TAG_COMPONENT = "action_cable"
+          TAG_CONNECTION = "action_cable.connection"
+          TAG_OPERATION_ACTION = "action"
+          TAG_OPERATION_BROADCAST = "broadcast"
+          TAG_OPERATION_ON_OPEN = "on_open"
+          TAG_OPERATION_TRANSMIT = "transmit"
+          TAG_TRANSMIT_VIA = "action_cable.transmit.via"
         end
       end
     end

data/lib/datadog/tracing/contrib/action_cable/instrumentation.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative 'ext'
-require_relative '../analytics'
+require_relative "../../metadata/ext"
+require_relative "ext"
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
                 span.resource = "#{self.class}#on_open"
                 span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 
-                span.set_tag(Ext::TAG_ACTION, 'on_open')
+                span.set_tag(Ext::TAG_ACTION, "on_open")
                 span.set_tag(Ext::TAG_CONNECTION, self.class.to_s)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
@@ -57,7 +57,10 @@ module Datadog
                 configuration = Datadog.configuration.tracing[:action_cable]
 
                 Tracing.trace("action_cable.#{hook}") do |span|
-                  span.service = configuration[:service_name] if configuration[:service_name]
+                  if configuration[:service_name]
+                    span.service = configuration[:service_name]
+                    span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+                  end
                   span.resource = "#{channel.class}##{hook}"
                   span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
-require_relative '../rails/utils'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+require_relative "../../../core/contrib/rails/utils"
 
 module Datadog
   module Tracing
@@ -13,13 +13,16 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('5.0.0')
+          MINIMUM_VERSION = Gem::Version.new("5.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :action_cable, auto_patch: false
+          def self.gem_name
+            "actioncable"
+          end
 
           def self.version
-            Gem.loaded_specs['actioncable'] && Gem.loaded_specs['actioncable'].version
+            Gem.loaded_specs["actioncable"]&.version
           end
 
           def self.loaded?
@@ -33,7 +36,7 @@ module Datadog
           # enabled by rails integration so should only auto instrument
           # if detected that it is being used without rails
           def auto_instrument?
-            !Contrib::Rails::Utils.railtie_supported?
+            !Core::Contrib::Rails::Utils.railtie_supported?
           end
 
           def new_configuration

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'events'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "events"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing