datadog 2.0.0.rc1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8f4fef81d3a238299c70c27f6ece67dc31e76e4b6ad2180a2d1126e4c9545a
-  data.tar.gz: 17bc14574f265b2fdba65d4030e37e513f6af33af6ce8be77e1bbb535d4f6ae4
+  metadata.gz: e0297728b2d8779a69af39f3dffa86af6b3765e3f2dd19cb685340ca7ad8e2ac
+  data.tar.gz: 3c7d3506df76790fea0b2e2047d1b2c4919e9d928ccb644086194197125391e7
 SHA512:
-  metadata.gz: fff160e4a8e316ec82381e5ae6ef5687a434aa0798debcc689c37e127d688e3d0c0f1009befb6871096c77032caeed348df777ba9baab4c8f7d6f4582d02c8bd
-  data.tar.gz: 6fb4d250c8838a101a489cc10ee0672c23dd4a9793ad850b17bc2c375881c0e3e4cf2c7c3bf5645a6ce8bce1e59c06cbb82609dffe489101fb3ba158d655f034
+  metadata.gz: ec2862773c6ee93e5d698d6b586a576413689a84f7d94a621c20088759469e1ad6742e13fc1e7f9250046212cec0e284abf4fb0048e255802c19f378cf7d428c
+  data.tar.gz: 507fbfd3f8879333c11336646e1a56ca453fbaf92c84fb0bae3b0e38435f3ea1ec6b3ddc756f848c76113a4e5832f8097cd521532541bf9ca8fdff6cca1e5ff3

data/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 ## [Unreleased]
 
+## [2.1.0] - 2024-06-10
+
+### Added
+
+* Tracing: Configuration by OpenTelemetry environment variables ([#3657][])
+
+### Fixed
+
+* Tracing: Improved compatibility with W3C Trace Context propagation ([#3631][])
+
+## [2.0.0] - 2024-06-06
+
+### Added
+
+* Tracing: Remap http status code tag for otel span for trace metrics ([#3664][])
+
 ## [2.0.0.rc1] - 2024-05-24
 
 ### Added
@@ -2888,7 +2904,9 @@ Release notes: https://github.com/DataDog/dd-trace-rb/releases/tag/v0.3.1
 Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 
 
-[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.0.0.rc1...master
+[Unreleased]: https://github.com/DataDog/dd-trace-rb/compare/v2.1.0...master
+[2.1.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.0.0...v2.1.0
+[2.0.0]: https://github.com/DataDog/dd-trace-rb/compare/v2.0.0.rc1...v2.0.0
 [2.0.0.rc1]: https://github.com/DataDog/dd-trace-rb/compare/v2.0.0.beta2...v2.0.0.rc1
 [1.23.0]: https://github.com/DataDog/dd-trace-rb/compare/v1.22.0...v1.23.0
 [2.0.0.beta2]: https://github.com/DataDog/dd-trace-rb/compare/v2.0.0.beta1...v2.0.0.beta2
@@ -4260,8 +4278,11 @@ Git diff: https://github.com/DataDog/dd-trace-rb/compare/v0.3.0...v0.3.1
 [#3624]: https://github.com/DataDog/dd-trace-rb/issues/3624
 [#3627]: https://github.com/DataDog/dd-trace-rb/issues/3627
 [#3630]: https://github.com/DataDog/dd-trace-rb/issues/3630
+[#3631]: https://github.com/DataDog/dd-trace-rb/issues/3631
 [#3645]: https://github.com/DataDog/dd-trace-rb/issues/3645
 [#3651]: https://github.com/DataDog/dd-trace-rb/issues/3651
+[#3657]: https://github.com/DataDog/dd-trace-rb/issues/3657
+[#3664]: https://github.com/DataDog/dd-trace-rb/issues/3664
 [@AdrianLC]: https://github.com/AdrianLC
 [@Azure7111]: https://github.com/Azure7111
 [@BabyGroot]: https://github.com/BabyGroot

data/README.md

@@ -8,7 +8,7 @@
 
 ## Getting started
 
-**If you're upgrading from a 0.x version, check out our [upgrade guide](https://github.com/DataDog/dd-trace-rb/blob/master/docs/UpgradeGuide.md#from-0x-to-10).**
+**If you're upgrading from a 1.x version, check out the [upgrade guide](https://github.com/DataDog/dd-trace-rb/blob/release/docs/UpgradeGuide2.md).**
 
 For a product overview, installation, and configuration check out our [documentation][public docs].
 

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

@@ -192,6 +192,11 @@ module Datadog
                   end
                 end
               end
+
+              option :sca_enabled do |o|
+                o.type :bool, nilable: true
+                o.env 'DD_APPSEC_SCA_ENABLED'
+              end
             end
           end
         end

data/lib/datadog/appsec/contrib/rack/request_middleware.rb

@@ -15,7 +15,6 @@ module Datadog
   module AppSec
     module Contrib
       module Rack
-        # Create an array of lowercased headers
         WAF_VENDOR_HEADERS_TAGS = %w[
           X-Amzn-Trace-Id
           Cloudfront-Viewer-Ja3-Fingerprint

data/lib/datadog/core/configuration/ext.rb

@@ -9,6 +9,7 @@ module Datadog
         # @public_api
         module Diagnostics
           ENV_DEBUG_ENABLED = 'DD_TRACE_DEBUG'
+          ENV_OTEL_LOG_LEVEL = 'OTEL_LOG_LEVEL'
           ENV_HEALTH_METRICS_ENABLED = 'DD_HEALTH_METRICS_ENABLED'
           ENV_STARTUP_LOGS_ENABLED = 'DD_TRACE_STARTUP_LOGS'
         end

data/lib/datadog/core/configuration/option.rb

@@ -14,7 +14,7 @@ module Datadog
         # @!attribute [r] precedence_set
         #   When this option was last set, what was the value precedence used?
         #   @return [Precedence::Value]
-        attr_reader :definition, :precedence_set
+        attr_reader :definition, :precedence_set, :resolved_env
 
         # Option setting precedence.
         module Precedence
@@ -50,6 +50,7 @@ module Datadog
           @context = context
           @value = nil
           @is_set = false
+          @resolved_env = nil
 
           # One value is stored per precedence, to allow unsetting a higher
           # precedence value and falling back to a lower precedence one.
@@ -65,7 +66,7 @@ module Datadog
         #
         # @param value [Object] the new value to be associated with this option
         # @param precedence [Precedence] from what precedence order this new value comes from
-        def set(value, precedence: Precedence::PROGRAMMATIC)
+        def set(value, precedence: Precedence::PROGRAMMATIC, resolved_env: nil)
           # Is there a higher precedence value set?
           if @precedence_set > precedence
             # This should be uncommon, as higher precedence values tend to
@@ -84,7 +85,7 @@ module Datadog
             return @value
           end
 
-          internal_set(value, precedence)
+          internal_set(value, precedence, resolved_env)
         end
 
         def unset(precedence)
@@ -102,7 +103,7 @@ module Datadog
               # Look for value that is set.
               # The hash `@value_per_precedence` has a custom default value of `UNSET`.
               if (value = @value_per_precedence[p]) != UNSET
-                internal_set(value, p)
+                internal_set(value, p, nil)
                 return nil
               end
             end
@@ -260,11 +261,12 @@ module Datadog
         end
 
         # Directly manipulates the current value and currently set precedence.
-        def internal_set(value, precedence)
+        def internal_set(value, precedence, resolved_env)
           old_value = @value
           (@value = context_exec(validate_type(value), old_value, &definition.setter)).tap do |v|
             @is_set = true
             @precedence_set = precedence
+            @resolved_env = resolved_env
             # Store original value to ensure we can always safely call `#internal_set`
             # when restoring a value from `@value_per_precedence`, and we are only running `definition.setter`
             # on the original value, not on a valud that has already been processed by `definition.setter`.
@@ -284,16 +286,21 @@ module Datadog
         def set_value_from_env_or_default
           value = nil
           precedence = nil
-          effective_env = nil
+          resolved_env = nil
 
-          if definition.env && ENV[definition.env]
-            effective_env = definition.env
-            value = coerce_env_variable(ENV[definition.env])
-            precedence = Precedence::PROGRAMMATIC
+          if definition.env
+            Array(definition.env).each do |env|
+              next if ENV[env].nil?
+
+              resolved_env = env
+              value = coerce_env_variable(ENV[env])
+              precedence = Precedence::PROGRAMMATIC
+              break
+            end
           end
 
           if value.nil? && definition.deprecated_env && ENV[definition.deprecated_env]
-            effective_env = definition.deprecated_env
+            resolved_env = definition.deprecated_env
             value = coerce_env_variable(ENV[definition.deprecated_env])
             precedence = Precedence::PROGRAMMATIC
 
@@ -304,11 +311,11 @@ module Datadog
 
           option_value = value.nil? ? default_value : value
 
-          set(option_value, precedence: precedence || Precedence::DEFAULT)
+          set(option_value, precedence: precedence || Precedence::DEFAULT, resolved_env: resolved_env)
         rescue ArgumentError
           raise ArgumentError,
-            "Expected environment variable #{effective_env} to be a #{@definition.type}, " \
-                              "but '#{ENV[effective_env]}' was provided"
+            "Expected environment variable #{resolved_env} to be a #{@definition.type}, " \
+                              "but '#{ENV[resolved_env]}' was provided"
         end
 
         # Anchor object that represents a value that is not set.

data/lib/datadog/core/configuration/options.rb

@@ -68,7 +68,7 @@ module Datadog
           end
 
           def set_option(name, value, precedence: Configuration::Option::Precedence::PROGRAMMATIC)
-            resolve_option(name).set(value, precedence: precedence)
+            resolve_option(name).set(value, precedence: precedence, resolved_env: resolved_env(name))
           end
 
           def unset_option(name, precedence: Configuration::Option::Precedence::PROGRAMMATIC)
@@ -116,6 +116,10 @@ module Datadog
             options[name] = definition.build(self)
           end
 
+          def resolved_env(name)
+            return options[name].resolved_env if options.key?(name)
+          end
+
           def assert_valid_option!(name)
             raise(InvalidOptionError, "#{self.class.name} doesn't define the option: #{name}") unless option_defined?(name)
           end

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

@@ -122,9 +122,18 @@ module Datadog
           # @default `DD_TRACE_DEBUG` environment variable, otherwise `false`
           # @return [Boolean]
           option :debug do |o|
-            o.env Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED
+            o.env [Datadog::Core::Configuration::Ext::Diagnostics::ENV_DEBUG_ENABLED,
+                   Datadog::Core::Configuration::Ext::Diagnostics::ENV_OTEL_LOG_LEVEL]
             o.default false
             o.type :bool
+            o.env_parser do |value|
+              if value
+                value = value.strip.downcase
+                # Debug is enabled when DD_TRACE_DEBUG is true or 1 OR
+                # when OTEL_LOG_LEVEL is set to debug
+                ['true', '1', 'debug'].include?(value)
+              end
+            end
             o.after_set do |enabled|
               # Enable rich debug print statements.
               # We do not need to unnecessarily load 'pp' unless in debugging mode.
@@ -465,7 +474,7 @@ module Datadog
           o.type :string, nilable: true
 
           # NOTE: service also gets set as a side effect of tags. See the WORKAROUND note in #initialize for details.
-          o.env Core::Environment::Ext::ENV_SERVICE
+          o.env [Core::Environment::Ext::ENV_SERVICE, Core::Environment::Ext::ENV_OTEL_SERVICE]
           o.default Core::Environment::Ext::FALLBACK_SERVICE_NAME
 
           # There's a few cases where we don't want to use the fallback service name, so this helper allows us to get a
@@ -500,14 +509,13 @@ module Datadog
         # @return [Hash<String,String>]
         option :tags do |o|
           o.type :hash, nilable: true
-          o.env Core::Environment::Ext::ENV_TAGS
+          o.env [Core::Environment::Ext::ENV_TAGS, Core::Environment::Ext::ENV_OTEL_RESOURCE_ATTRIBUTES]
           o.env_parser do |env_value|
             values = if env_value.include?(',')
                        env_value.split(',')
                      else
                        env_value.split(' ') # rubocop:disable Style/RedundantArgument
                      end
-
             values.map! do |v|
               v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
 
@@ -517,7 +525,23 @@ module Datadog
             values.compact!
             values.each_with_object({}) do |tag, tags|
               key, value = tag.split(':', 2)
-              tags[key] = value if value && !value.empty?
+              if value.nil?
+                # support tags/attributes delimited by the OpenTelemetry separator (`=`)
+                key, value = tag.split('=', 2)
+              end
+              next if value.nil? || value.empty?
+
+              # maps OpenTelemetry semantic attributes to Datadog tags
+              case key.downcase
+              when 'deployment.environment'
+                tags['env'] = value
+              when 'service.version'
+                tags['version'] = value
+              when 'service.name'
+                tags['service'] = value
+              else
+                tags[key] = value
+              end
             end
           end
           o.setter do |new_value, old_value|

data/lib/datadog/core/environment/ext.rb

@@ -18,8 +18,10 @@ module Datadog
         ENV_API_KEY = 'DD_API_KEY'
         ENV_ENVIRONMENT = 'DD_ENV'
         ENV_SERVICE = 'DD_SERVICE'
+        ENV_OTEL_SERVICE = 'OTEL_SERVICE_NAME'
         ENV_SITE = 'DD_SITE'
         ENV_TAGS = 'DD_TAGS'
+        ENV_OTEL_RESOURCE_ATTRIBUTES = 'OTEL_RESOURCE_ATTRIBUTES'
         ENV_VERSION = 'DD_VERSION'
         FALLBACK_SERVICE_NAME =
           begin

data/lib/datadog/core/runtime/ext.rb

@@ -13,6 +13,7 @@ module Datadog
         # @public_api
         module Metrics
           ENV_ENABLED = 'DD_RUNTIME_METRICS_ENABLED'
+          ENV_OTEL_METRICS_EXPORTER = 'OTEL_METRICS_EXPORTER'
 
           METRIC_CLASS_COUNT = 'runtime.ruby.class_count'
           METRIC_GC_PREFIX = 'runtime.ruby.gc'

data/lib/datadog/core/telemetry/event.rb

@@ -113,7 +113,10 @@ module Datadog
               conf_value('tracing.opentelemetry.enabled', !defined?(Datadog::OpenTelemetry::LOADED).nil?),
             )
             list << conf_value('logger.instance', config.logger.instance.class.to_s) if config.logger.instance
-            list << conf_value('appsec.enabled', config.dig('appsec', 'enabled')) if config.respond_to?('appsec')
+            if config.respond_to?('appsec')
+              list << conf_value('appsec.enabled', config.dig('appsec', 'enabled'))
+              list << conf_value('appsec.sca_enabled', config.dig('appsec', 'sca_enabled'))
+            end
             list << conf_value('ci.enabled', config.dig('ci', 'enabled')) if config.respond_to?('ci')
 
             list.reject! { |entry| entry[:value].nil? }
@@ -242,15 +245,30 @@ module Datadog
           end
 
           def payload(seq_id)
-            {
-              configuration: @changes.map do |name, value|
-                {
-                  name: name,
-                  value: value,
-                  origin: @origin,
-                }
-              end
-            }
+            { configuration: configuration(seq_id) }
+          end
+
+          def configuration(seq_id)
+            config = Datadog.configuration
+
+            res = @changes.map do |name, value|
+              {
+                name: name,
+                value: value,
+                origin: @origin,
+              }
+            end
+
+            unless config.dig('appsec', 'sca_enabled').nil?
+              res << {
+                name: 'appsec.sca_enabled',
+                value: config.appsec.sca_enabled,
+                origin: 'code',
+                seq_id: seq_id,
+              }
+            end
+
+            res
           end
         end
 

data/lib/datadog/opentelemetry/sdk/span_processor.rb

@@ -112,6 +112,11 @@ module Datadog
           if attributes.key?('analytics.event') && (analytics_event = attributes['analytics.event']).respond_to?(:casecmp)
             attributes[Tracing::Metadata::Ext::Analytics::TAG_SAMPLE_RATE] = analytics_event.casecmp('true') == 0 ? 1 : 0
           end
+
+          if attributes.key?('http.response.status_code')
+            attributes[Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE] = attributes.delete('http.response.status_code')
+          end
+
           attributes[Tracing::Metadata::Ext::TAG_KIND] = span.kind || 'internal'
 
           kwargs = { start_time: ns_to_time(span.start_timestamp) }

data/lib/datadog/opentelemetry/sdk/trace/span.rb

@@ -141,10 +141,12 @@ module Datadog
               value.casecmp('true') == 0 ? 1 : 0
             )
           end
+
+          span.set_tag('http.status_code', value) if key == 'http.response.status_code'
         end
 
         DATADOG_SPAN_ATTRIBUTE_OVERRIDES = ['analytics.event', 'operation.name', 'resource.name', 'service.name',
-                                            'span.type'].freeze
+                                            'span.type', 'http.response.status_code'].freeze
 
         ::OpenTelemetry::SDK::Trace::Span.prepend(self)
       end

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

@@ -9,6 +9,7 @@ module Datadog
       # e.g. Env vars, default values, enums, etc...
       module Ext
         ENV_ENABLED = 'DD_TRACE_ENABLED'
+        ENV_OTEL_TRACES_EXPORTER = 'OTEL_TRACES_EXPORTER'
         ENV_HEADER_TAGS = 'DD_TRACE_HEADER_TAGS'
         ENV_TRACE_ID_128_BIT_GENERATION_ENABLED = 'DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED'
 
@@ -39,10 +40,14 @@ module Datadog
           # W3C Trace Context
           PROPAGATION_STYLE_TRACE_CONTEXT = 'tracecontext'
 
+          PROPAGATION_STYLE_SUPPORTED = [PROPAGATION_STYLE_DATADOG, PROPAGATION_STYLE_B3_MULTI_HEADER,
+                                         PROPAGATION_STYLE_B3_SINGLE_HEADER, PROPAGATION_STYLE_TRACE_CONTEXT].freeze
+
           # Sets both extract and inject propagation style tho the provided value.
           # Has lower precedence than `DD_TRACE_PROPAGATION_STYLE_INJECT` or
           # `DD_TRACE_PROPAGATION_STYLE_EXTRACT`.
           ENV_PROPAGATION_STYLE = 'DD_TRACE_PROPAGATION_STYLE'
+          ENV_OTEL_PROPAGATION_STYLE = 'OTEL_PROPAGATORS'
 
           ENV_PROPAGATION_STYLE_INJECT = 'DD_TRACE_PROPAGATION_STYLE_INJECT'
 
@@ -68,6 +73,8 @@ module Datadog
           ENV_SAMPLE_RATE = 'DD_TRACE_SAMPLE_RATE'
           ENV_RATE_LIMIT = 'DD_TRACE_RATE_LIMIT'
           ENV_RULES = 'DD_TRACE_SAMPLING_RULES'
+          ENV_OTEL_TRACES_SAMPLER = 'OTEL_TRACES_SAMPLER'
+          OTEL_TRACES_SAMPLER_ARG = 'OTEL_TRACES_SAMPLER_ARG'
 
           # @public_api
           module Span

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

@@ -13,6 +13,8 @@ module Datadog
       # rubocop:disable Metrics/BlockLength
       # rubocop:disable Metrics/MethodLength
       # rubocop:disable Layout/LineLength
+      # rubocop:disable Metrics/CyclomaticComplexity
+      # rubocop:disable Metrics/PerceivedComplexity
       module Settings
         def self.extended(base)
           base.class_eval do
@@ -89,7 +91,7 @@ module Datadog
               # @return [Array<String>]
               option :propagation_style do |o|
                 o.type :array
-                o.env Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE
+                o.env [Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE, Configuration::Ext::Distributed::ENV_OTEL_PROPAGATION_STYLE]
                 o.default []
                 o.after_set do |styles|
                   next if styles.empty?
@@ -97,6 +99,14 @@ module Datadog
                   # Make values case-insensitive
                   styles.map!(&:downcase)
 
+                  styles.select! do |s|
+                    if Configuration::Ext::Distributed::PROPAGATION_STYLE_SUPPORTED.include?(s)
+                      true
+                    else
+                      Datadog.logger.warn("Unsupported propagation style: #{s}")
+                      false
+                    end
+                  end
                   set_option(:propagation_style_extract, styles)
                   set_option(:propagation_style_inject, styles)
                 end
@@ -121,9 +131,23 @@ module Datadog
               # @default `DD_TRACE_ENABLED` environment variable, otherwise `true`
               # @return [Boolean]
               option :enabled do |o|
-                o.env Tracing::Configuration::Ext::ENV_ENABLED
+                o.env [Tracing::Configuration::Ext::ENV_ENABLED, Tracing::Configuration::Ext::ENV_OTEL_TRACES_EXPORTER]
                 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)
+                    false
+                  # Tracing is enabled when DD_TRACE_ENABLED is true or 1
+                  elsif ['true', '1'].include?(value)
+                    true
+                  else
+                    Datadog.logger.warn("Unsupported value for exporting datadog traces: #{value}. Traces will be sent to Datadog.")
+                    nil
+                  end
+                end
               end
 
               # Comma-separated, case-insensitive list of header names that are reported in incoming and outgoing HTTP requests.
@@ -245,7 +269,30 @@ module Datadog
                 # @return [Float, nil]
                 option :default_rate do |o|
                   o.type :float, nilable: true
-                  o.env Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE
+                  o.env [Tracing::Configuration::Ext::Sampling::ENV_SAMPLE_RATE, Tracing::Configuration::Ext::Sampling::ENV_OTEL_TRACES_SAMPLER]
+                  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)
+                      Datadog.logger.warn("The value '#{value}' is not yet supported. 'parentbased_#{value}' will be used instead.")
+                      value = "parentbased_#{value}"
+                    end
+                    # OTEL_TRACES_SAMPLER can be set to always_on, always_off, traceidratio, and/or parentbased value.
+                    # These values are mapped to a sample rate.
+                    # DD_TRACE_SAMPLE_RATE sets the sample rate to float.
+                    case value
+                    when 'parentbased_always_on'
+                      1.0
+                    when 'parentbased_always_off'
+                      0.0
+                    when 'parentbased_traceidratio'
+                      ENV.fetch(Tracing::Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
+                    else
+                      value.to_f
+                    end
+                  end
                 end
 
                 # Rate limit for number of spans per second.
@@ -417,6 +464,8 @@ module Datadog
       # rubocop:enable Metrics/BlockLength
       # rubocop:enable Metrics/MethodLength
       # rubocop:enable Layout/LineLength
+      # rubocop:enable Metrics/CyclomaticComplexity
+      # rubocop:enable Metrics/PerceivedComplexity
     end
   end
 end

data/lib/datadog/tracing/correlation.rb

@@ -73,12 +73,7 @@ module Datadog
         end
 
         def trace_id
-          if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled &&
-              !Tracing::Utils::TraceId.to_high_order(@trace_id).zero?
-            Kernel.format('%032x', @trace_id)
-          else
-            Tracing::Utils::TraceId.to_low_order(@trace_id).to_s
-          end
+          Correlation.format_trace_id(@trace_id)
         end
       end
 
@@ -97,6 +92,15 @@ module Datadog
           trace_id: digest.trace_id,
         )
       end
+
+      def format_trace_id(trace_id)
+        if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled &&
+            !Tracing::Utils::TraceId.to_high_order(trace_id).zero?
+          Kernel.format('%032x', trace_id)
+        else
+          Tracing::Utils::TraceId.to_low_order(trace_id).to_s
+        end
+      end
     end
   end
 end

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

@@ -101,10 +101,22 @@ module Datadog
               # Only parse if it represent the same trace as the successfully extracted one
               next unless tracecontext_digest.trace_id == extracted_trace_digest.trace_id
 
-              # Preserve the `tracestate`
+              parent_id = extracted_trace_digest.span_id
+              distributed_tags = extracted_trace_digest.trace_distributed_tags
+              unless extracted_trace_digest.span_id == tracecontext_digest.span_id
+                # span_id in the tracecontext header takes precedence over the value in all conflicting headers
+                parent_id = tracecontext_digest.span_id
+                if (lp_id = last_datadog_parent_id(data, tracecontext_digest.trace_distributed_tags))
+                  distributed_tags = extracted_trace_digest.trace_distributed_tags&.dup || {}
+                  distributed_tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] = lp_id
+                end
+              end
+              # Preserve the trace state and last datadog span id
               extracted_trace_digest = extracted_trace_digest.merge(
+                span_id: parent_id,
                 trace_state: tracecontext_digest.trace_state,
-                trace_state_unknown_fields: tracecontext_digest.trace_state_unknown_fields
+                trace_state_unknown_fields: tracecontext_digest.trace_state_unknown_fields,
+                trace_distributed_tags: distributed_tags
               )
             end
           rescue => e
@@ -115,6 +127,22 @@ module Datadog
 
           extracted_trace_digest
         end
+
+        private
+
+        def last_datadog_parent_id(headers, tracecontext_tags)
+          dd_propagator = @propagation_style_extract.find { |propagator| propagator.is_a?(Datadog) }
+          if tracecontext_tags&.fetch(
+            Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID,
+            Tracing::Metadata::Ext::Distributed::DD_PARENT_ID_DEFAULT
+          ) != Tracing::Metadata::Ext::Distributed::DD_PARENT_ID_DEFAULT
+            # tracecontext headers contain a p value, ensure this value is sent to backend
+            tracecontext_tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID]
+          elsif dd_propagator && (dd_digest = dd_propagator.extract(headers))
+            # if p value is not present in tracestate, use the parent id from the datadog headers
+            format('%016x', dd_digest.span_id)
+          end
+        end
       end
     end
   end

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

@@ -57,7 +57,8 @@ module Datadog
           end
 
           tags ||= {}
-          tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] = ts_parent_id || '0000000000000000'
+          tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID] =
+            ts_parent_id || Tracing::Metadata::Ext::Distributed::DD_PARENT_ID_DEFAULT
 
           TraceDigest.new(
             span_id: parent_id,

data/lib/datadog/tracing/metadata/ext.rb

@@ -55,6 +55,7 @@ module Datadog
           TAG_SAMPLING_PRIORITY = '_sampling_priority_v1'
 
           TAG_DD_PARENT_ID = '_dd.parent_id'
+          DD_PARENT_ID_DEFAULT = '0000000000000000'
 
           # Trace tags with this prefix will propagate from a trace through distributed tracing.
           # Distributed headers tags with this prefix will be injected into the active trace.

data/lib/datadog/version.rb

@@ -3,9 +3,9 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
-    PRE = 'rc1'
+    PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.1.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -837,6 +837,7 @@ files:
 homepage: https://github.com/DataDog/dd-trace-rb
 licenses:
 - BSD-3-Clause
+- Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
   changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md