ddtrace 1.7.0 → 1.9.0

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

@@ -20,67 +20,75 @@ module Datadog
 
           # PG::Connection patch methods
           module InstanceMethods
-            def exec(sql, *args)
-              trace(Ext::SPAN_EXEC, sql: sql) do |sql_statement|
-                super(sql_statement, *args)
+            def exec(sql, *args, &block)
+              trace(Ext::SPAN_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
-            def exec_params(sql, params, *args)
-              trace(Ext::SPAN_EXEC_PARAMS, sql: sql) do |sql_statement|
-                super(sql_statement, params, *args)
+            def exec_params(sql, params, *args, &block)
+              trace(Ext::SPAN_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, params, *args, &wrapped_block)
               end
             end
 
-            def exec_prepared(statement_name, params, *args)
-              trace(Ext::SPAN_EXEC_PREPARED, statement_name: statement_name) do
-                super(statement_name, params, *args)
+            def exec_prepared(statement_name, params, *args, &block)
+              trace(Ext::SPAN_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
+                super(statement_name, params, *args, &wrapped_block)
               end
             end
 
-            def async_exec(sql, *args)
-              trace(Ext::SPAN_ASYNC_EXEC, sql: sql) do |sql_statement|
-                super(sql_statement, *args)
+            # async_exec is an alias to exec
+            def async_exec(sql, *args, &block)
+              trace(Ext::SPAN_ASYNC_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
-            def async_exec_params(sql, params, *args)
-              trace(Ext::SPAN_ASYNC_EXEC_PARAMS, sql: sql) do |sql_statement|
-                super(sql_statement, params, *args)
+            # async_exec_params is an alias to exec_params
+            def async_exec_params(sql, params, *args, &block)
+              trace(Ext::SPAN_ASYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, params, *args, &wrapped_block)
               end
             end
 
-            def async_exec_prepared(statement_name, params, *args)
-              trace(Ext::SPAN_ASYNC_EXEC_PREPARED, statement_name: statement_name) do
-                super(statement_name, params, *args)
+            # async_exec_prepared is an alias to exec_prepared
+            def async_exec_prepared(statement_name, params, *args, &block)
+              trace(Ext::SPAN_ASYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
+                super(statement_name, params, *args, &wrapped_block)
               end
             end
 
-            def sync_exec(sql, *args)
-              trace(Ext::SPAN_SYNC_EXEC, sql: sql) do |sql_statement|
-                super(sql_statement, *args)
+            def sync_exec(sql, *args, &block)
+              trace(Ext::SPAN_SYNC_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, *args, &wrapped_block)
               end
             end
 
-            def sync_exec_params(sql, params, *args)
-              trace(Ext::SPAN_SYNC_EXEC_PARAMS, sql: sql) do |sql_statement|
-                super(sql_statement, params, *args)
+            def sync_exec_params(sql, params, *args, &block)
+              trace(Ext::SPAN_SYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
+                super(sql_statement, params, *args, &wrapped_block)
               end
             end
 
-            def sync_exec_prepared(statement_name, params, *args)
-              trace(Ext::SPAN_SYNC_EXEC_PREPARED, statement_name: statement_name) do
-                super(statement_name, params, *args)
+            def sync_exec_prepared(statement_name, params, *args, &block)
+              trace(Ext::SPAN_SYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
+                super(statement_name, params, *args, &wrapped_block)
               end
             end
 
             private
 
-            def trace(name, sql: nil, statement_name: nil)
+            def trace(name, sql: nil, statement_name: nil, block: nil)
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
               resource = statement_name || sql
 
-              Tracing.trace(name, service: service, resource: resource, type: Tracing::Metadata::Ext::SQL::TYPE) do |span|
+              Tracing.trace(
+                name,
+                service: service,
+                resource: resource,
+                type: Tracing::Metadata::Ext::SQL::TYPE
+              ) do |span, trace_op|
                 annotate_span_with_query!(span, service)
                 # Set analytics sample rate
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
@@ -88,12 +96,26 @@ module Datadog
                 if sql
                   propagation_mode = Contrib::Propagation::SqlComment::Mode.new(comment_propagation)
                   Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
-                  propagated_sql_statement = Contrib::Propagation::SqlComment.prepend_comment(sql, span, propagation_mode)
+                  propagated_sql_statement = Contrib::Propagation::SqlComment.prepend_comment(
+                    sql,
+                    span,
+                    trace_op,
+                    propagation_mode
+                  )
                 end
 
-                result = yield(propagated_sql_statement)
-                annotate_span_with_result!(span, result)
-                result
+                # Read metadata from PG::Result
+                if block
+                  yield(propagated_sql_statement, proc do |result|
+                    ret = block.call(result)
+                    annotate_span_with_result!(span, result)
+                    ret
+                  end)
+                else
+                  result = yield(propagated_sql_statement)
+                  annotate_span_with_result!(span, result)
+                  result
+                end
               end
             end
 
@@ -118,6 +140,7 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_PORT, port)
             end
 
+            # @param [PG::Result] result
             def annotate_span_with_result!(span, result)
               span.set_tag(Contrib::Ext::DB::TAG_ROW_COUNT, result.ntuples)
             end

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

@@ -26,7 +26,10 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_PRESTO_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_PRESTO_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_PRESTO_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PRESTO_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'presto'.freeze

data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb

@@ -24,6 +24,7 @@ module Datadog
             KEY_ENVIRONMENT = 'dde'.freeze
             KEY_PARENT_SERVICE = 'ddps'.freeze
             KEY_VERSION = 'ddpv'.freeze
+            KEY_TRACEPARENT = 'traceparent'.freeze
           end
         end
       end

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -3,6 +3,8 @@
 require_relative 'sql_comment/comment'
 require_relative 'sql_comment/ext'
 
+require_relative '../../distributed/trace_context'
+
 module Datadog
   module Tracing
     module Contrib
@@ -12,11 +14,12 @@ module Datadog
           def self.annotate!(span_op, mode)
             return unless mode.enabled?
 
-            # PENDING: Until `traceparent`` implementation in `full` mode
-            # span_op.set_tag(Ext::TAG_DBM_TRACE_INJECTED, true) if mode.full?
+            span_op.set_tag(Ext::TAG_DBM_TRACE_INJECTED, true) if mode.full?
           end
 
-          def self.prepend_comment(sql, span_op, mode)
+          # Inject span_op and trace_op instead of TraceDigest to improve memory usage
+          # for `disabled` and `service` mode
+          def self.prepend_comment(sql, span_op, trace_op, mode)
             return sql unless mode.enabled?
 
             tags = {
@@ -26,8 +29,10 @@ module Datadog
               Ext::KEY_VERSION => datadog_configuration.version
             }
 
-            # PENDING: Until `traceparent`` implementation in `full` mode
-            # tags.merge!(trace_context(span_op)) if mode.full?
+            if mode.full?
+              tags[Ext::KEY_TRACEPARENT] =
+                Tracing::Distributed::TraceContext.new(fetcher: nil).send(:build_traceparent, trace_op.to_digest)
+            end
 
             "#{Comment.new(tags)} #{sql}"
           end
@@ -35,13 +40,6 @@ module Datadog
           def self.datadog_configuration
             Datadog.configuration
           end
-
-          # TODO: Derive from trace
-          def self.trace_context(_)
-            {
-              # traceparent: '00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01'
-            }.freeze
-          end
         end
       end
     end

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

@@ -31,7 +31,10 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'.freeze
           ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'.freeze

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

@@ -10,7 +10,7 @@ module Datadog
   module Tracing
     module Contrib
       module Redis
-        # Instrumentation for Redis
+        # Instrumentation for Redis < 5
         module Instrumentation
           def self.included(base)
             base.prepend(InstanceMethods)
@@ -19,51 +19,58 @@ module Datadog
           # InstanceMethods - implementing instrumentation
           module InstanceMethods
             def call(*args, &block)
-              response = nil
+              show_command_args = command_args?
+
               Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
-                span.service = Datadog.configuration_for(redis_instance, :service_name) ||
-                  datadog_configuration[:service_name]
+                span.service = service_name
                 span.span_type = Contrib::Redis::Ext::TYPE
-                span.resource = get_command(args)
-                Contrib::Redis::Tags.set_common_tags(self, span)
-                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+                span.resource = get_command(args, show_command_args)
+                Contrib::Redis::Tags.set_common_tags(self, span, show_command_args)
 
-                response = super
+                super
               end
-
-              response
             end
 
             def call_pipeline(*args, &block)
-              response = nil
+              show_command_args = command_args?
+
               Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
-                span.service = Datadog.configuration_for(redis_instance, :service_name) ||
-                  datadog_configuration[:service_name]
+                span.service = service_name
                 span.span_type = Contrib::Redis::Ext::TYPE
-                commands = get_pipeline_commands(args)
+                commands = get_pipeline_commands(args, show_command_args)
                 span.resource = commands.any? ? commands.join("\n") : '(none)'
                 span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
-                Contrib::Redis::Tags.set_common_tags(self, span)
-                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+                Contrib::Redis::Tags.set_common_tags(self, span, show_command_args)
 
-                response = super
+                super
               end
-
-              response
             end
 
             private
 
-            def get_command(args)
-              if datadog_configuration[:command_args]
+            def command_args?
+              pinned = Datadog.configuration_for(redis_instance, :command_args)
+
+              return pinned unless pinned.nil?
+
+              datadog_configuration[:command_args]
+            end
+
+            def service_name
+              Datadog.configuration_for(redis_instance, :service_name) ||
+                datadog_configuration[:service_name]
+            end
+
+            def get_command(args, show_command_args)
+              if show_command_args
                 Contrib::Redis::Quantize.format_command_args(*args)
               else
                 Contrib::Redis::Quantize.get_verb(*args)
               end
             end
 
-            def get_pipeline_commands(args)
-              if datadog_configuration[:command_args]
+            def get_pipeline_commands(args, show_command_args)
+              if show_command_args
                 args[0].commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) }
               else
                 args[0].commands.map { |c| Contrib::Redis::Quantize.get_verb(c) }

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

@@ -13,21 +13,53 @@ module Datadog
           include Contrib::Integration
 
           MINIMUM_VERSION = Gem::Version.new('3.2')
-          MAX_VERSION = Gem::Version.new('5')
+
+          # Support `Config#custom`
+          # https://github.com/redis-rb/redis-client/blob/master/CHANGELOG.md#0110
+          REDISCLIENT_MINIMUM_VERSION = Gem::Version.new('0.11.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :redis, auto_patch: true
 
+          # Until Redis 4, all instrumentation happened in one gem: redis.
+          # Since Redis 5, instrumentation happens in a separate gem: redis-client.
+          # Because Redis 4 does not depend on redis-client, it's possible for both gems to be installed at the same time.
+          # For example, if Sidekiq 7 and Redis 4 are installed: both redis and redis-client will be installed.
+          # If redis-client and redis > 5 are installed, than they will be in sync, and only redis-client will be installed.
           def self.version
+            redis_version || redis_client_version
+          end
+
+          def self.redis_version
             Gem.loaded_specs['redis'] && Gem.loaded_specs['redis'].version
           end
 
+          def self.redis_client_version
+            Gem.loaded_specs['redis-client'] && Gem.loaded_specs['redis-client'].version
+          end
+
           def self.loaded?
+            redis_loaded? || redis_client_loaded?
+          end
+
+          def self.redis_loaded?
             !defined?(::Redis).nil?
           end
 
+          def self.redis_client_loaded?
+            !defined?(::RedisClient).nil?
+          end
+
           def self.compatible?
-            super && version >= MINIMUM_VERSION && version < MAX_VERSION
+            super && (redis_compatible? || redis_client_compatible?)
+          end
+
+          def self.redis_compatible?
+            !!(redis_version && redis_version >= MINIMUM_VERSION)
+          end
+
+          def self.redis_client_compatible?
+            !!(redis_client_version && redis_client_version >= REDISCLIENT_MINIMUM_VERSION)
           end
 
           def new_configuration

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

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 
 require_relative '../patcher'
 require_relative 'ext'
@@ -49,24 +49,28 @@ module Datadog
 
           module_function
 
-          def target_version
-            Integration.version
+          def default_tags
+            [].tap do |tags|
+              tags << "target_redis_version:#{Integration.redis_version}"               if Integration.redis_version
+              tags << "target_redis_client_version:#{Integration.redis_client_version}" if Integration.redis_client_version
+            end
           end
 
-          # patch applies our patch if needed
           def patch
-            # do not require these by default, but only when actually patching
-            require 'redis'
-            require_relative 'tags'
-            require_relative 'quantize'
-            require_relative 'instrumentation'
+            # Redis 5+ extracts RedisClient to its own gem and provide instrumentation interface
+            if Integration.redis_client_compatible?
+              require_relative 'trace_middleware'
+
+              ::RedisClient.register(TraceMiddleware)
+            end
 
-            # InstancePatch and ClientPatch allows the client object to access pin on redis instance
-            ::Redis.include(InstancePatch)
-            ::Redis::Client.include(ClientPatch)
+            if Integration.redis_compatible? && Integration.redis_version < Gem::Version.new('5.0.0')
+              require_relative 'instrumentation'
 
-            # TODO: To support redis-rb 5.x, Redis::Client -> RedisClient
-            ::Redis::Client.include(Instrumentation)
+              ::Redis.include(InstancePatch)
+              ::Redis::Client.include(ClientPatch)
+              ::Redis::Client.include(Instrumentation)
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/redis/quantize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # typed: true
 
 require 'set'
@@ -8,11 +10,13 @@ module Datadog
       module Redis
         # Quantize contains Redis-specific resource quantization tools.
         module Quantize
-          PLACEHOLDER = '?'.freeze
-          TOO_LONG_MARK = '...'.freeze
+          PLACEHOLDER = '?'
+          TOO_LONG_MARK = '...'
           VALUE_MAX_LEN = 50
           CMD_MAX_LEN = 500
 
+          AUTH_COMMANDS = %w[AUTH auth].freeze
+
           MULTI_VERB_COMMANDS = Set.new(
             %w[
               ACL
@@ -29,8 +33,7 @@ module Datadog
           module_function
 
           def format_arg(arg)
-            str = arg.is_a?(Symbol) ? arg.to_s.upcase : arg.to_s
-            str = Core::Utils.utf8_encode(str, binary: true, placeholder: PLACEHOLDER)
+            str = Core::Utils.utf8_encode(arg, binary: true, placeholder: PLACEHOLDER)
             Core::Utils.truncate(str, VALUE_MAX_LEN, TOO_LONG_MARK)
           rescue => e
             Datadog.logger.debug("non formattable Redis arg #{str}: #{e}")
@@ -41,8 +44,8 @@ module Datadog
             command_args = resolve_command_args(command_args)
             return 'AUTH ?' if auth_command?(command_args)
 
-            cmd = command_args.map { |x| format_arg(x) }.join(' ')
-            Core::Utils.truncate(cmd, CMD_MAX_LEN, TOO_LONG_MARK)
+            verb, *args = command_args.map { |x| format_arg(x) }
+            Core::Utils.truncate("#{verb.upcase} #{args.join(' ')}", CMD_MAX_LEN, TOO_LONG_MARK)
           end
 
           def get_verb(command_args)
@@ -50,8 +53,7 @@ module Datadog
 
             return get_verb(command_args.first) if command_args.first.is_a?(Array)
 
-            arg = command_args.first
-            verb = arg.is_a?(Symbol) ? arg.to_s.upcase : arg.to_s
+            verb = command_args.first.to_s.upcase
             return verb unless MULTI_VERB_COMMANDS.include?(verb) && command_args[1]
 
             "#{verb} #{command_args[1]}"
@@ -60,7 +62,8 @@ module Datadog
           def auth_command?(command_args)
             return false unless command_args.is_a?(Array) && !command_args.empty?
 
-            command_args.first.to_sym == :auth
+            verb = command_args.first.to_s
+            AUTH_COMMANDS.include?(verb)
           end
 
           # Unwraps command array when Redis is called with the following syntax:

data/lib/datadog/tracing/contrib/redis/tags.rb

@@ -12,7 +12,7 @@ module Datadog
         # Tags handles generic common tags assignment.
         module Tags
           class << self
-            def set_common_tags(client, span)
+            def set_common_tags(client, span, show_command_args)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
@@ -20,6 +20,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, client.host)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
@@ -30,7 +32,7 @@ module Datadog
 
               span.set_tag Ext::TAG_DATABASE_INDEX, client.db.to_s
               span.set_tag Ext::TAG_DB, client.db
-              span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args?
+              span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args
             end
 
             private
@@ -46,10 +48,6 @@ module Datadog
             def analytics_sample_rate
               datadog_configuration[:analytics_sample_rate]
             end
-
-            def show_command_args?
-              datadog_configuration[:command_args]
-            end
           end
         end
       end

data/lib/datadog/tracing/contrib/redis/trace_middleware.rb

@@ -0,0 +1,72 @@
+# typed: false
+
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'quantize'
+require_relative 'tags'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Redis
+        # Instrumentation for Redis 5+
+        module TraceMiddleware
+          def call(commands, redis_config)
+            Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
+              datadog_configuration = resolve(redis_config)
+              resource = get_command(commands, datadog_configuration[:command_args])
+
+              span.service = datadog_configuration[:service_name]
+              span.span_type = Contrib::Redis::Ext::TYPE
+              span.resource = resource
+
+              Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args])
+
+              super
+            end
+          end
+
+          def call_pipelined(commands, redis_config)
+            Tracing.trace(Contrib::Redis::Ext::SPAN_COMMAND) do |span|
+              datadog_configuration = resolve(redis_config)
+              pipelined_commands = get_pipeline_commands(commands, datadog_configuration[:command_args])
+
+              span.service = datadog_configuration[:service_name]
+              span.span_type = Contrib::Redis::Ext::TYPE
+              span.resource = pipelined_commands.join("\n")
+              span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, pipelined_commands.length
+
+              Contrib::Redis::Tags.set_common_tags(redis_config, span, datadog_configuration[:command_args])
+
+              super
+            end
+          end
+
+          private
+
+          def get_command(commands, boolean)
+            if boolean
+              Contrib::Redis::Quantize.format_command_args(commands)
+            else
+              Contrib::Redis::Quantize.get_verb(commands)
+            end
+          end
+
+          def get_pipeline_commands(commands, boolean)
+            if boolean
+              commands.map { |c| Contrib::Redis::Quantize.format_command_args(c) }
+            else
+              commands.map { |c| Contrib::Redis::Quantize.get_verb(c) }
+            end
+          end
+
+          def resolve(redis_config)
+            custom = redis_config.custom[:datadog] || {}
+
+            Datadog.configuration.tracing[:redis, redis_config.server_url].to_h.merge(custom)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,12 @@ module Datadog
             end
 
             option :distributed_tracing, default: true
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
+
             option :split_by_domain, default: false
           end
         end

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

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'rest_client'.freeze