ddtrace 1.6.1 → 1.8.0

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,49 +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.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)
+                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/resque/resque_job.rb

@@ -41,6 +41,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])

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

data/lib/datadog/tracing/contrib/shoryuken/tracer.rb

@@ -37,6 +37,8 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_ATTRIBUTES, sqs_msg.attributes) if sqs_msg.respond_to?(:attributes)
               span.set_tag(Ext::TAG_JOB_BODY, body) if configuration[:tag_body]
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               yield
             end
           end

data/lib/datadog/tracing/contrib/sidekiq/client_tracer.rb

@@ -28,6 +28,11 @@ module Datadog
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_PUSH)
 
+              span.set_tag(
+                Datadog::Tracing::Metadata::Ext::TAG_KIND,
+                Datadog::Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER
+              )
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

data/lib/datadog/tracing/contrib/sidekiq/server_tracer.rb

@@ -40,6 +40,11 @@ module Datadog
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
 
+              span.set_tag(
+                Datadog::Tracing::Metadata::Ext::TAG_KIND,
+                Datadog::Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER
+              )
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

data/lib/datadog/tracing/contrib/sneakers/tracer.rb

@@ -41,6 +41,8 @@ module Datadog
 
               request_span.set_tag(Ext::TAG_JOB_BODY, deserialized_msg) if configuration[:tag_body]
 
+              request_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
               @app.call(deserialized_msg, delivery_info, metadata, handler)
             end
           end

data/lib/datadog/{core → tracing}/diagnostics/ext.rb

@@ -1,19 +1,14 @@
 # typed: true
 
 module Datadog
-  module Core
+  module Tracing
     module Diagnostics
       # @public_api
       module Ext
-        DD_TRACE_STARTUP_LOGS = 'DD_TRACE_STARTUP_LOGS'.freeze
-        DD_TRACE_DEBUG = 'DD_TRACE_DEBUG'.freeze
-        DD_TRACE_ENABLED = 'DD_TRACE_ENABLED'.freeze
         # Health
         module Health
           # Metrics
           module Metrics
-            ENV_ENABLED = 'DD_HEALTH_METRICS_ENABLED'.freeze
-
             METRIC_API_ERRORS = 'datadog.tracer.api.errors'.freeze
             METRIC_API_REQUESTS = 'datadog.tracer.api.requests'.freeze
             METRIC_API_RESPONSES = 'datadog.tracer.api.responses'.freeze

data/lib/datadog/tracing/diagnostics/health.rb

@@ -0,0 +1,40 @@
+# typed: ignore
+
+require_relative 'ext'
+
+module Datadog
+  module Tracing
+    module Diagnostics
+      # Health-related diagnostics
+      module Health
+        # Health metrics for diagnostics
+        module Metrics
+          def self.extended(base)
+            base.class_eval do
+              count :api_errors, Ext::Health::Metrics::METRIC_API_ERRORS
+              count :api_requests, Ext::Health::Metrics::METRIC_API_REQUESTS
+              count :api_responses, Ext::Health::Metrics::METRIC_API_RESPONSES
+              count :error_context_overflow, Ext::Health::Metrics::METRIC_ERROR_CONTEXT_OVERFLOW
+              count :error_instrumentation_patch, Ext::Health::Metrics::METRIC_ERROR_INSTRUMENTATION_PATCH
+              count :error_span_finish, Ext::Health::Metrics::METRIC_ERROR_SPAN_FINISH
+              count :error_unfinished_spans, Ext::Health::Metrics::METRIC_ERROR_UNFINISHED_SPANS
+              count :instrumentation_patched, Ext::Health::Metrics::METRIC_INSTRUMENTATION_PATCHED
+              count :queue_accepted, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED
+              count :queue_accepted_lengths, Ext::Health::Metrics::METRIC_QUEUE_ACCEPTED_LENGTHS
+              count :queue_dropped, Ext::Health::Metrics::METRIC_QUEUE_DROPPED
+              count :traces_filtered, Ext::Health::Metrics::METRIC_TRACES_FILTERED
+              count :transport_trace_too_large, Ext::Health::Metrics::METRIC_TRANSPORT_TRACE_TOO_LARGE
+              count :transport_chunked, Ext::Health::Metrics::METRIC_TRANSPORT_CHUNKED
+              count :writer_cpu_time, Ext::Health::Metrics::METRIC_WRITER_CPU_TIME
+
+              gauge :queue_length, Ext::Health::Metrics::METRIC_QUEUE_LENGTH
+              gauge :queue_max_length, Ext::Health::Metrics::METRIC_QUEUE_MAX_LENGTH
+              gauge :queue_spans, Ext::Health::Metrics::METRIC_QUEUE_SPANS
+              gauge :sampling_service_cache_length, Ext::Health::Metrics::METRIC_SAMPLING_SERVICE_CACHE_LENGTH
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/distributed/b3_multi.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+# typed: true
+
+require_relative 'helpers'
+require_relative '../trace_digest'
+
+module Datadog
+  module Tracing
+    module Distributed
+      # B3 multi header-style trace propagation.
+      # @see https://github.com/openzipkin/b3-propagation#multiple-headers
+      class B3Multi
+        B3_TRACE_ID_KEY = 'x-b3-traceid'
+        B3_SPAN_ID_KEY = 'x-b3-spanid'
+        B3_SAMPLED_KEY = 'x-b3-sampled'
+
+        def initialize(
+          fetcher:,
+          trace_id_key: B3_TRACE_ID_KEY,
+          span_id_key: B3_SPAN_ID_KEY,
+          sampled_key: B3_SAMPLED_KEY
+        )
+          @trace_id_key = trace_id_key
+          @span_id_key = span_id_key
+          @sampled_key = sampled_key
+          @fetcher = fetcher
+        end
+
+        def inject!(digest, data = {})
+          return if digest.nil?
+
+          # DEV: We need these to be hex encoded
+          data[@trace_id_key] = digest.trace_id.to_s(16)
+          data[@span_id_key] = digest.span_id.to_s(16)
+
+          if digest.trace_sampling_priority
+            sampling_priority = Helpers.clamp_sampling_priority(
+              digest.trace_sampling_priority
+            )
+            data[@sampled_key] = sampling_priority.to_s
+          end
+
+          data
+        end
+
+        def extract(data)
+          # DEV: B3 doesn't have "origin"
+          fetcher = @fetcher.new(data)
+          trace_id = fetcher.id(@trace_id_key, base: 16)
+          span_id = fetcher.id(@span_id_key, base: 16)
+          # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
+          sampling_priority = fetcher.number(@sampled_key)
+
+          # Return early if this propagation is not valid
+          return unless trace_id && span_id
+
+          TraceDigest.new(
+            trace_id: trace_id,
+            span_id: span_id,
+            trace_sampling_priority: sampling_priority
+          )
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/distributed/b3_single.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+# typed: true
+
+require_relative 'helpers'
+require_relative '../trace_digest'
+
+module Datadog
+  module Tracing
+    module Distributed
+      # B3 single header-style trace propagation.
+      #
+      # DEV: Format:
+      # DEV:   b3: {TraceId}-{SpanId}-{SamplingState}-{ParentSpanId}
+      # DEV: https://github.com/apache/incubator-zipkin-b3-propagation/tree/7c6e9f14d6627832bd80baa87ac7dabee7be23cf#single-header
+      # DEV: `{SamplingState}` and `{ParentSpanId}` are optional
+      #
+      # @see https://github.com/openzipkin/b3-propagation#single-header
+      class B3Single
+        B3_SINGLE_HEADER_KEY = 'b3'
+
+        def initialize(fetcher:, key: B3_SINGLE_HEADER_KEY)
+          @key = key
+          @fetcher = fetcher
+        end
+
+        def inject!(digest, env)
+          return if digest.nil?
+
+          # DEV: We need these to be hex encoded
+          value = "#{digest.trace_id.to_s(16)}-#{digest.span_id.to_s(16)}"
+
+          if digest.trace_sampling_priority
+            sampling_priority = Helpers.clamp_sampling_priority(
+              digest.trace_sampling_priority
+            )
+            value += "-#{sampling_priority}"
+          end
+
+          env[@key] = value
+          env
+        end
+
+        def extract(env)
+          fetcher = @fetcher.new(env)
+          value = fetcher[@key]
+
+          return unless value
+
+          parts = value.split('-')
+          trace_id = Helpers.value_to_id(parts[0], 16) unless parts.empty?
+          span_id = Helpers.value_to_id(parts[1], 16) if parts.length > 1
+          sampling_priority = Helpers.value_to_number(parts[2]) if parts.length > 2
+
+          # Return if this propagation is not valid
+          return unless trace_id && span_id
+
+          TraceDigest.new(
+            span_id: span_id,
+            trace_id: trace_id,
+            trace_sampling_priority: sampling_priority
+          )
+        end
+      end
+    end
+  end
+end