datadog 2.8.0 → 2.39.0

data/lib/datadog/tracing/contrib/active_record/utils.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/environment/ext'
-require_relative '../utils/database'
+require_relative "../../../core/environment/ext"
+require_relative "../utils/database"
 
 module Datadog
   module Tracing
@@ -39,17 +39,17 @@ module Datadog
             return default_connection_config if connection.nil? && connection_id.nil?
 
             conn = if !connection.nil?
-                     # Since Rails 6.0, the connection object
-                     # is directly available.
-                     connection
-                   else
-                     # For Rails < 6.0, only the `connection_id`
-                     # is available. We have to find the connection
-                     # object from it.
-                     connection_from_id(connection_id)
-                   end
+              # Since Rails 6.0, the connection object
+              # is directly available.
+              connection
+            else
+              # For Rails < 6.0, only the `connection_id`
+              # is available. We have to find the connection
+              # object from it.
+              connection_from_id(connection_id)
+            end
 
-            if conn && conn.instance_variable_defined?(:@config)
+            if conn&.instance_variable_defined?(:@config)
               conn.instance_variable_get(:@config)
             else
               EMPTY_CONFIG
@@ -58,7 +58,7 @@ module Datadog
 
           # DEV: JRuby responds to {ObjectSpace._id2ref}, despite raising an error
           # DEV: when invoked. Thus, we have to explicitly check for Ruby runtime.
-          if Core::Environment::Ext::RUBY_ENGINE != 'jruby'
+          if Core::Environment::Ext::RUBY_ENGINE != "jruby"
             # CRuby has access to {ObjectSpace._id2ref}, which allows for
             # direct look up of the connection object.
             def self.connection_from_id(connection_id)
@@ -77,7 +77,7 @@ module Datadog
               # in case.
               Datadog.logger.debug(
                 "connection_id #{connection_id} does not represent a valid object. " \
-                        "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+                        "Cause: #{e.class}: #{e.message} Source: #{Array(e.backtrace).first}"
               )
             end
           else
@@ -102,14 +102,14 @@ module Datadog
             return @default_connection_config if instance_variable_defined?(:@default_connection_config)
 
             current_connection_name = if ::ActiveRecord::Base.respond_to?(:connection_specification_name)
-                                        ::ActiveRecord::Base.connection_specification_name
-                                      else
-                                        ::ActiveRecord::Base
-                                      end
+              ::ActiveRecord::Base.connection_specification_name
+            else
+              ::ActiveRecord::Base
+            end
 
             connection_pool = ::ActiveRecord::Base.connection_handler.retrieve_connection_pool(current_connection_name)
             connection_pool.nil? ? EMPTY_CONFIG : (@default_connection_config = db_config(connection_pool))
-          rescue StandardError
+          rescue
             EMPTY_CONFIG
           end
 

data/lib/datadog/tracing/contrib/active_support/cache/event.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../notifications/event'
+require_relative "../notifications/event"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../ext'
-require_relative '../event'
-require_relative '../../../../../core/telemetry/logger'
+require_relative "../../ext"
+require_relative "../event"
+require_relative "../../../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -38,23 +38,29 @@ module Datadog
 
               # DEV: Look for other uses of `ActiveSupport::Cache::Store#instrument`, to find other useful event keys.
               MAPPING = {
-                'cache_delete.active_support' => { resource: Ext::RESOURCE_CACHE_DELETE },
-                'cache_read.active_support' => { resource: Ext::RESOURCE_CACHE_GET },
-                'cache_read_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MGET, multi_key: true },
-                'cache_write.active_support' => { resource: Ext::RESOURCE_CACHE_SET },
-                'cache_write_multi.active_support' => { resource: Ext::RESOURCE_CACHE_MSET, multi_key: true }
+                "cache_delete.active_support" => {resource: Ext::RESOURCE_CACHE_DELETE},
+                "cache_read.active_support" => {resource: Ext::RESOURCE_CACHE_GET},
+                "cache_read_multi.active_support" => {resource: Ext::RESOURCE_CACHE_MGET, multi_key: true},
+                "cache_write.active_support" => {resource: Ext::RESOURCE_CACHE_SET},
+                "cache_write_multi.active_support" => {resource: Ext::RESOURCE_CACHE_MSET, multi_key: true}
               }.freeze
 
-              def trace?(event, _payload)
+              def trace?(event, payload)
                 return false if !Tracing.enabled? || !configuration.enabled
 
+                if (cache_store = configuration[:cache_store])
+                  store = cache_backend(payload[:store])
+
+                  return false unless cache_store.include?(store)
+                end
+
                 # DEV-3.0: Backwards compatibility code for the 2.x gem series.
                 # DEV-3.0: See documentation at {Datadog::Tracing::Contrib::ActiveSupport::Cache::Instrumentation}
                 # DEV-3.0: for the complete information about this backwards compatibility code.
                 case event
-                when 'cache_read.active_support'
+                when "cache_read.active_support"
                   !ActiveSupport::Cache::Instrumentation.nested_read?
-                when 'cache_read_multi.active_support'
+                when "cache_read_multi.active_support"
                   !ActiveSupport::Cache::Instrumentation.nested_multiread?
                 else
                   true
@@ -62,28 +68,30 @@ module Datadog
               end
 
               def on_start(span, event, _id, payload)
-                key = payload[:key]
+                # Since Rails 8, `dd_original_keys` contains the denormalized key provided by the user.
+                # In previous versions, the denormalized key is stored in the official `key` attribute.
+                # We fall back to `key`, even in Rails 8, as a defensive measure.
+                key = payload[:dd_original_keys] || payload[:key]
                 store = payload[:store]
 
                 mapping = MAPPING.fetch(event)
 
                 span.service = configuration[:cache_service]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = mapping[:resource]
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, cache_backend(store))
 
-                span.set_tag('EVENT', event)
+                span.set_tag("EVENT", event)
 
-                set_cache_key(span, key, mapping[:multi_key])
-              rescue StandardError => e
-                Datadog.logger.error(e.message)
+                if Datadog.configuration.tracing[:active_support][:cache_key].enabled
+                  set_cache_key(span, key, mapping[:multi_key])
+                end
+              rescue => e
+                Datadog.logger.error("#{e.class}: #{e.message}")
                 Datadog::Core::Telemetry::Logger.report(e)
               end
 

data/lib/datadog/tracing/contrib/active_support/cache/events.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'events/cache'
+require_relative "events/cache"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../../../core/utils'
-require_relative '../../../metadata/ext'
-require_relative '../ext'
+require_relative "../../../../core/utils"
+require_relative "../../../metadata/ext"
+require_relative "../ext"
+require_relative "event"
 
 module Datadog
   module Tracing
@@ -50,15 +51,13 @@ module Datadog
                 service: Datadog.configuration.tracing[:active_support][:cache_service],
                 resource: action
               ) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
-                set_cache_key(span, key, multi_key)
+
+                set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key].enabled
 
                 yield
               end
@@ -182,6 +181,39 @@ module Datadog
                 super(operation, key, polyfill_options)
               end
             end
+
+            # Save the original, user-supplied cache key, before it gets normalized.
+            #
+            # Normalized keys can include internal implementation detail,
+            # for example FileStore keys include temp directory names, which
+            # changes on every run, making it impossible to group by the cache key afterward.
+            # Also, the user is never exposed to the normalized key, and only sets/gets using the
+            # original key.
+            module PreserveOriginalKey
+              # Stores the original keys in the options hash, as an array of keys.
+              # It's important to keep all the keys for multi-key operations.
+              # For single-key operations, the key is stored as an array of a single element.
+              def normalize_key(key, options)
+                orig_keys = options[:dd_original_keys] || []
+                orig_keys << key
+                options[:dd_original_keys] = orig_keys
+
+                super
+              end
+
+              # Ensure we don't pollute the default Store instance `options` in {PreserveOriginalKey#normalize_key}.
+              # In most cases, `merged_options` returns a new hash,
+              # but we check for cases where it reuses the instance hash.
+              def merged_options(call_options)
+                ret = super
+
+                if ret.equal?(options)
+                  ret.dup
+                else
+                  ret
+                end
+              end
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../patcher'
-require_relative 'instrumentation'
-require_relative 'events'
+require_relative "../../patcher"
+require_relative "instrumentation"
+require_relative "events"
 
 module Datadog
   module Tracing
@@ -22,8 +22,12 @@ module Datadog
             def patch
               Events.subscribe!
 
+              if Integration.version >= Gem::Version.new("8.0.0")
+                ::ActiveSupport::Cache::Store.prepend(Cache::Instrumentation::PreserveOriginalKey)
+              end
+
               # Backfill the `:store` key in the ActiveSupport event payload for older Rails.
-              if Integration.version < Gem::Version.new('6.1.0')
+              if Integration.version < Gem::Version.new("6.1.0")
                 ::ActiveSupport::Cache::Store.prepend(Cache::Instrumentation::Store)
               end
 

data/lib/datadog/tracing/contrib/active_support/cache/redis.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'patcher'
+require_relative "../../support"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -23,7 +24,7 @@ module Datadog
               # ActiveSupport includes a Redis cache store internally, and does not require these overrides.
               # https://github.com/rails/rails/blob/master/activesupport/lib/active_support/cache/redis_cache_store.rb
               def patch_redis_store?(meth)
-                !Gem.loaded_specs['redis-activesupport'].nil? \
+                !Gem.loaded_specs["redis-activesupport"].nil? \
                   && defined?(::ActiveSupport::Cache::RedisStore) \
                   && ::ActiveSupport::Cache::RedisStore.instance_methods(false).include?(meth)
               end
@@ -33,11 +34,8 @@ module Datadog
               # fails if the application is using an old version of Redis, or not using Redis at all.
               # @see https://github.com/rails/rails/blob/d0dcb8fa6073a0c4d42600c15e82e3bb386b27d3/activesupport/lib/active_support/cache/redis_cache_store.rb#L4
               def patch_redis_cache_store?(meth)
-                Gem.loaded_specs['redis'] &&
-                  # Autoload constants return `constant` for `defined?`, but that doesn't mean they are loaded...
-                  defined?(::ActiveSupport::Cache::RedisCacheStore) &&
-                  # ... to check that we need to call `autoload?` and check if it returns `nil`, meaning it's loaded.
-                  ::ActiveSupport::Cache.autoload?(:RedisCacheStore).nil? &&
+                Gem.loaded_specs["redis"] &&
+                  Support.fully_loaded?(::ActiveSupport::Cache, :RedisCacheStore) &&
                   ::ActiveSupport::Cache::RedisCacheStore.instance_methods(false).include?(meth)
               end
 

data/lib/datadog/tracing/contrib/active_support/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
@@ -34,11 +34,34 @@ module Datadog
               o.type :string, nilable: true
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(
-                  '',
+                  "",
                   Ext::SERVICE_CACHE
                 )
               end
             end
+
+            # grouped "cache_key.*" settings
+            settings :cache_key do
+              # enable or disabling the inclusion of the cache_key in the span
+              option :enabled do |o|
+                # cache_key.enabled
+                o.type :bool
+                o.default true
+              end
+            end
+
+            # Specifies which cache stores to trace.
+            # Accepts a list, with the same format as `config.cache_store`
+            # (e.g. `memory_store`, `file_store`, or symbols like `:file_store`).
+            # Defaults to `nil`, which traces all cache stores.
+            # @see https://github.com/rails/rails/blob/b7520a13adda46c0cc5f3fb4a4c1726633af2bba/guides/source/caching_with_rails.md?plain=1#L576-L582
+            option :cache_store do |o|
+              o.type :array, nilable: true
+              o.default nil
+              o.after_set do |stores|
+                stores&.map!(&:to_s) # Convert symbols to strings to match the Rails configuration format
+              end
+            end
           end
         end
       end

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

@@ -7,24 +7,24 @@ module Datadog
         # ActiveSupport integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ENABLED'
+          ENV_ENABLED = "DD_TRACE_ACTIVE_SUPPORT_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE"
           QUANTIZE_CACHE_MAX_KEY_SIZE = 300
-          RESOURCE_CACHE_DELETE = 'DELETE'
-          RESOURCE_CACHE_GET = 'GET'
-          RESOURCE_CACHE_MGET = 'MGET'
-          RESOURCE_CACHE_SET = 'SET'
-          RESOURCE_CACHE_MSET = 'MSET'
-          SERVICE_CACHE = 'active_support-cache'
-          SPAN_CACHE = 'rails.cache'
-          SPAN_TYPE_CACHE = 'cache'
-          TAG_CACHE_BACKEND = 'rails.cache.backend'
-          TAG_CACHE_KEY = 'rails.cache.key'
-          TAG_CACHE_KEY_MULTI = 'rails.cache.keys'
-          TAG_COMPONENT = 'active_support'
-          TAG_OPERATION_CACHE = 'cache'
+          RESOURCE_CACHE_DELETE = "DELETE"
+          RESOURCE_CACHE_GET = "GET"
+          RESOURCE_CACHE_MGET = "MGET"
+          RESOURCE_CACHE_SET = "SET"
+          RESOURCE_CACHE_MSET = "MSET"
+          SERVICE_CACHE = "active_support-cache"
+          SPAN_CACHE = "rails.cache"
+          SPAN_TYPE_CACHE = "cache"
+          TAG_CACHE_BACKEND = "rails.cache.backend"
+          TAG_CACHE_KEY = "rails.cache.key"
+          TAG_CACHE_KEY_MULTI = "rails.cache.keys"
+          TAG_COMPONENT = "active_support"
+          TAG_OPERATION_CACHE = "cache"
         end
       end
     end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
-require_relative 'cache/redis'
-require_relative '../rails/ext'
-require_relative '../rails/utils'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
+require_relative "cache/redis"
+require_relative "../rails/ext"
+require_relative "../../../core/contrib/rails/utils"
 
 module Datadog
   module Tracing
@@ -19,9 +19,12 @@ module Datadog
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :active_support, auto_patch: false
+          def self.gem_name
+            "activesupport"
+          end
 
           def self.version
-            Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version
+            Gem.loaded_specs["activesupport"]&.version
           end
 
           def self.loaded?
@@ -35,7 +38,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/active_support/notifications/event.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'subscriber'
+require_relative "subscriber"
 
 module Datadog
   module Tracing
@@ -67,7 +67,8 @@ module Datadog
                   payload[:exception] # Fallback for ActiveSupport < 5.0
               end
 
-              def on_start(_span, _event, _id, _payload); end
+              def on_start(_span, _event, _id, _payload)
+              end
 
               def on_finish(span, _event, _id, payload)
                 record_exception(span, payload)

data/lib/datadog/tracing/contrib/active_support/notifications/subscriber.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'set'
-require_relative 'subscription'
+require "set"
+require_relative "subscription"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -19,7 +19,7 @@ module Datadog
             #   possibly including more information in the `payload` argument.
             # @param trace [Proc] whether to trace the event. Defaults to returning `true`.
             def initialize(span_name, span_options, on_start: nil, on_finish: nil, trace: nil)
-              raise ArgumentError, 'Must be given either on_start or on_finish' unless on_start || on_finish
+              raise ArgumentError, "Must be given either on_start or on_finish" unless on_start || on_finish
 
               @span_name = span_name
               @span_options = span_options
@@ -122,10 +122,10 @@ module Datadog
               end
 
               def run(span, name, id, payload)
-                @block.call(span, name, id, payload) if @block
-              rescue StandardError => e
+                @block&.call(span, name, id, payload)
+              rescue => e
                 Datadog.logger.debug(
-                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class}: #{e.message}"
                 )
               end
             end
@@ -144,13 +144,11 @@ module Datadog
 
               def run(event, key, *args)
                 blocks_for(key).each do |callback|
-                  begin
-                    callback.call(event, key, *args)
-                  rescue StandardError => e
-                    Datadog.logger.debug(
-                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
-                    )
-                  end
+                  callback.call(event, key, *args)
+                rescue => e
+                  Datadog.logger.debug(
+                    "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class}: #{e.message}"
+                  )
                 end
               end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'cache/patcher'
+require_relative "../patcher"
+require_relative "cache/patcher"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/analytics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../analytics'
+require_relative "../analytics"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/auto_instrument.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../contrib'
-require_relative 'extensions'
+require_relative "../contrib"
+require_relative "extensions"
 
 module Datadog
   module Tracing
@@ -9,11 +9,11 @@ module Datadog
     module Contrib
       # Auto-activate instrumentation
       def self.auto_instrument!
-        require_relative 'rails/utils'
+        require_relative "../../core/contrib/rails/utils"
 
         # Defer to Rails if this is a Rails application
-        if Datadog::Tracing::Contrib::Rails::Utils.railtie_supported?
-          require_relative 'rails/auto_instrument_railtie'
+        if Datadog::Core::Contrib::Rails::Utils.railtie_supported?
+          require_relative "rails/auto_instrument_railtie"
         else
           AutoInstrument.patch_all!
         end

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

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

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

@@ -7,33 +7,33 @@ module Datadog
         # AWS integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_AWS_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_AWS_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_AWS_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_AWS_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_AWS_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_AWS_PEER_SERVICE"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'aws'
-          SPAN_COMMAND = 'aws.command'
-          TAG_AGENT = 'aws.agent'
-          TAG_COMPONENT = 'aws'
-          TAG_DEFAULT_AGENT = 'aws-sdk-ruby'
-          TAG_HOST = 'host'
-          TAG_OPERATION = 'aws.operation'
-          TAG_OPERATION_COMMAND = 'command'
-          TAG_PATH = 'path'
-          TAG_AWS_REGION = 'aws.region'
-          TAG_REGION = 'region'
-          TAG_AWS_SERVICE = 'aws_service'
-          TAG_AWS_ACCOUNT = 'aws_account'
-          TAG_QUEUE_NAME = 'queuename'
-          TAG_TOPIC_NAME = 'topicname'
-          TAG_TABLE_NAME = 'tablename'
-          TAG_STREAM_NAME = 'streamname'
-          TAG_RULE_NAME = 'rulename'
-          TAG_STATE_MACHINE_NAME = 'statemachinename'
-          TAG_BUCKET_NAME = 'bucketname'
-          PEER_SERVICE_SOURCES = Array[TAG_QUEUE_NAME,
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_AWS_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "aws"
+          SPAN_COMMAND = "aws.command"
+          TAG_AGENT = "aws.agent"
+          TAG_COMPONENT = "aws"
+          TAG_DEFAULT_AGENT = "aws-sdk-ruby"
+          TAG_HOST = "host"
+          TAG_OPERATION = "aws.operation"
+          TAG_OPERATION_COMMAND = "command"
+          TAG_PATH = "path"
+          TAG_AWS_REGION = "aws.region"
+          TAG_REGION = "region"
+          TAG_AWS_SERVICE = "aws_service"
+          TAG_AWS_ACCOUNT = "aws_account"
+          TAG_QUEUE_NAME = "queuename"
+          TAG_TOPIC_NAME = "topicname"
+          TAG_TABLE_NAME = "tablename"
+          TAG_STREAM_NAME = "streamname"
+          TAG_RULE_NAME = "rulename"
+          TAG_STATE_MACHINE_NAME = "statemachinename"
+          TAG_BUCKET_NAME = "bucketname"
+          PEER_SERVICE_SOURCES = [TAG_QUEUE_NAME,
             TAG_TOPIC_NAME,
             TAG_STREAM_NAME,
             TAG_TABLE_NAME,