datadog 2.12.0 → 2.22.0

data/lib/datadog/tracing/contrib/sequel/database.rb

@@ -23,7 +23,7 @@ module Datadog
               response = nil
 
               Tracing.trace(Ext::SPAN_QUERY) do |span|
-                span.service =  Datadog.configuration_for(self, :service_name) \
+                span.service = Datadog.configuration_for(self, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
                                   '',
@@ -46,10 +46,10 @@ module Datadog
 
             def parse_opts(sql, opts)
               db_opts = if ::Sequel::VERSION < '3.41.0' && self.class.to_s !~ /Dataset$/
-                          @opts
-                        elsif instance_variable_defined?(:@pool) && @pool
-                          @pool.db.opts
-                        end
+                @opts
+              elsif instance_variable_defined?(:@pool) && @pool
+                @pool.db.opts
+              end
               sql = sql.is_a?(::Sequel::SQL::Expression) ? literal(sql) : sql.to_s
 
               Utils.parse_opts(sql, opts, db_opts)

data/lib/datadog/tracing/contrib/sequel/dataset.rb

@@ -40,7 +40,7 @@ module Datadog
               response = nil
 
               Tracing.trace(Ext::SPAN_QUERY) do |span|
-                span.service =  Datadog.configuration_for(db, :service_name) \
+                span.service = Datadog.configuration_for(db, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
                                   '',

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :sequel, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['sequel'] && Gem.loaded_specs['sequel'].version
+            Gem.loaded_specs['sequel']&.version
           end
 
           def self.loaded?

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

@@ -34,7 +34,7 @@ module Datadog
 
             def parse_opts(sql, opts, db_opts, dataset = nil)
               # Prepared statements don't provide their sql query in the +sql+ parameter.
-              if !sql.is_a?(String) && (dataset && dataset.respond_to?(:prepared_sql) &&
+              if !sql.is_a?(String) && (dataset&.respond_to?(:prepared_sql) &&
                 (resolved_sql = dataset.prepared_sql))
                 # The dataset contains the resolved SQL query and prepared statement name.
                 prepared_name = dataset.prepared_statement_name

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :shoryuken
 
           def self.version
-            Gem.loaded_specs['shoryuken'] && Gem.loaded_specs['shoryuken'].version
+            Gem.loaded_specs['shoryuken']&.version
           end
 
           def self.loaded?

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

@@ -24,7 +24,12 @@ module Datadog
             resource = job_resource(job)
 
             Datadog::Tracing.trace(Ext::SPAN_PUSH, service: @sidekiq_service) do |span, trace_op|
-              Sidekiq.inject(trace_op, job) if configuration[:distributed_tracing]
+              if Tracing::Distributed::PropagationPolicy.enabled?(
+                global_config: configuration,
+                trace: trace_op
+              )
+                Sidekiq.inject(trace_op, job)
+              end
 
               span.resource = resource
 

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

@@ -2,6 +2,7 @@
 
 require_relative '../../../distributed/fetcher'
 require_relative '../../../distributed/propagation'
+require_relative '../../../distributed/propagation_policy'
 require_relative '../../../distributed/b3_multi'
 require_relative '../../../distributed/b3_single'
 require_relative '../../../distributed/datadog'
@@ -31,6 +32,8 @@ module Datadog
                     Tracing::Distributed::Datadog.new(fetcher: Tracing::Distributed::Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT =>
                     Tracing::Distributed::TraceContext.new(fetcher: Tracing::Distributed::Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE =>
+                    Tracing::Distributed::Baggage.new(fetcher: Tracing::Distributed::Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new
                 },
                 propagation_style_inject: propagation_style_inject,

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

@@ -13,6 +13,7 @@ module Datadog
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_SIDEKIQ_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SIDEKIQ_ANALYTICS_SAMPLE_RATE'
           SERVICE_NAME = 'sidekiq'
+          SIDEKIQ_8_SECONDS_PER_INTEGER = 0.001 # Sidekiq 8 uses integer epoch milliseconds, rather than epoch floats
           SPAN_PUSH = 'sidekiq.push'
           SPAN_JOB = 'sidekiq.job'
           SPAN_JOB_FETCH = 'sidekiq.job_fetch'

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

@@ -20,7 +20,7 @@ module Datadog
           register_as :sidekiq
 
           def self.version
-            Gem.loaded_specs['sidekiq'] && Gem.loaded_specs['sidekiq'].version
+            Gem.loaded_specs['sidekiq']&.version
           end
 
           def self.loaded?

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

@@ -22,7 +22,7 @@ module Datadog
             @quantize = options[:quantize] || configuration[:quantize]
           end
 
-          def call(worker, job, queue)
+          def call(worker, job, queue) # rubocop:disable Metrics/MethodLength
             resource = job_resource(job)
 
             if @distributed_tracing
@@ -61,7 +61,10 @@ module Datadog
               span.set_tag(Ext::TAG_JOB_RETRY_COUNT, job['retry_count'])
               span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])
               span.set_tag(Ext::TAG_JOB_WRAPPER, job['class']) if job['wrapped']
-              span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Time.now.utc.to_f - job['enqueued_at'].to_f))
+
+              enqueued_at = job['enqueued_at']
+              enqueued_at *= Ext::SIDEKIQ_8_SECONDS_PER_INTEGER if enqueued_at.is_a?(Integer)
+              span.set_tag(Ext::TAG_JOB_DELAY, 1000.0 * (Core::Utils::Time.now.utc.to_f - enqueued_at.to_f))
 
               args = job['args']
               if args && !args.empty?

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

@@ -25,7 +25,7 @@ module Datadog
               job['class'].to_s
             end
           rescue => e
-            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job['jid']}): #{e}" }
+            Datadog.logger.debug { "Error retrieving Sidekiq job class name (jid:#{job["jid"]}): #{e}" }
 
             job['class'].to_s
           end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :sinatra
 
           def self.version
-            Gem.loaded_specs['sinatra'] && Gem.loaded_specs['sinatra'].version
+            Gem.loaded_specs['sinatra']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/sinatra/tracer_middleware.rb

@@ -28,63 +28,61 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span|
-              begin
-                # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
-                # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
-                span.resource = nil
+              # this is kept nil until we set a correct one (either in the route or with a fallback in the ensure below)
+              # the nil signals that there's no good one yet and is also seen by profiler, when sampling the resource
+              span.resource = nil
 
-                Sinatra::Env.set_datadog_span(env, span)
+              Sinatra::Env.set_datadog_span(env, span)
 
-                response = @app.call(env)
-              ensure
-                Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
+              response = @app.call(env)
+            ensure
+              Contrib::Rack::HeaderTagging.tag_request_headers(span, env, configuration)
 
-                span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
+              span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+              span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-                request = ::Sinatra::Request.new(env)
+              request = ::Sinatra::Request.new(env)
 
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, request.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, request.request_method)
 
-                datadog_route = Sinatra::Env.route_path(env)
+              datadog_route = Sinatra::Env.route_path(env)
 
-                span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
+              span.set_tag(Ext::TAG_ROUTE_PATH, datadog_route) if datadog_route
 
-                if request.script_name && !request.script_name.empty?
-                  span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
-                end
+              if request.script_name && !request.script_name.empty?
+                span.set_tag(Ext::TAG_SCRIPT_NAME, request.script_name)
+              end
 
-                # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
-                # resource; if no resource was set, let's use a fallback
-                span.resource = env['REQUEST_METHOD'] if span.resource.nil?
+              # If this app handled the request, then Contrib::Sinatra::Tracer OR Contrib::Sinatra::Base set the
+              # resource; if no resource was set, let's use a fallback
+              span.resource = env['REQUEST_METHOD'] if span.resource.nil?
 
-                rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
+              rack_request_span = env[Contrib::Rack::Ext::RACK_ENV_REQUEST_SPAN]
 
-                # This propagates the Sinatra resource to the Rack span,
-                # since the latter is unaware of what the resource might be
-                # and would fallback to a generic resource name when unset
-                rack_request_span.resource ||= span.resource if rack_request_span
+              # This propagates the Sinatra resource to the Rack span,
+              # since the latter is unaware of what the resource might be
+              # and would fallback to a generic resource name when unset
+              rack_request_span.resource ||= span.resource if rack_request_span
 
-                if response
-                  if (status = response[0])
-                    sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
+              if response
+                if (status = response[0])
+                  sinatra_response = ::Sinatra::Response.new([], status) # Build object to use status code helpers
 
-                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
-                    span.set_error(env['sinatra.error']) if sinatra_response.server_error?
-                  end
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, sinatra_response.status)
+                  span.set_error(env['sinatra.error']) if sinatra_response.server_error?
+                end
 
-                  if (headers = response[1])
-                    Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
-                  end
+                if (headers = response[1])
+                  Contrib::Rack::HeaderTagging.tag_response_headers(span, headers, configuration)
                 end
+              end
 
-                # Set analytics sample rate
-                Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+              # Set analytics sample rate
+              Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-                # Measure service stats
-                Contrib::Analytics.set_measured(span)
-              end
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
             end
           end
           # rubocop:enable Metrics/MethodLength

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

@@ -19,7 +19,7 @@ module Datadog
           register_as :sneakers, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sneakers'] && Gem.loaded_specs['sneakers'].version
+            Gem.loaded_specs['sneakers']&.version
           end
 
           def self.loaded?

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

@@ -11,7 +11,7 @@ module Datadog
         NO_SOURCE = [].freeze
 
         def self.fetch_service_name(env, default)
-          ENV.fetch(env) do
+          DATADOG_ENV.fetch(env) do
             if Datadog.configuration.tracing.contrib.global_default_service_name.enabled
               return Datadog.configuration.service
             end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :stripe
 
           def self.version
-            Gem.loaded_specs['stripe'] && Gem.loaded_specs['stripe'].version
+            Gem.loaded_specs['stripe']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/stripe/request.rb

@@ -54,7 +54,7 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_METHOD, event.method)
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
-          rescue StandardError => e
+          rescue => e
             Datadog.logger.debug(e.message)
           end
 

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :sucker_punch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sucker_punch'] && Gem.loaded_specs['sucker_punch'].version
+            Gem.loaded_specs['sucker_punch']&.version
           end
 
           def self.loaded?

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

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      # Miscellaneous support methods to aid in the creation of integrations.
+      module Support
+        module_function
+
+        # Checks if a constant is loaded in a module, handling autoloaded constants correctly.
+        #
+        # This method is particularly useful when you need to check if a constant is fully loaded,
+        # not just defined. It handles the special case of autoloaded constants, which return
+        # non-nil for `defined?` even when they haven't been loaded yet.
+        #
+        # @param base_module [Module] the module to check for the constant
+        # @param constant [Symbol] the name of the constant to check
+        # @return [Boolean] true if the constant has been loaded, false otherwise
+        def fully_loaded?(base_module, constant)
+          # Autoload constants return `constant` for `defined?`, but that doesn't mean they are loaded...
+          base_module.const_defined?(constant) &&
+            # ... to check that we need to call `autoload?`. If it returns `nil`, it's loaded.
+            base_module.autoload?(constant).nil?
+        end
+      end
+    end
+  end
+end

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

@@ -19,7 +19,7 @@ module Datadog
           TAG_COMPONENT = 'trilogy'
           TAG_OPERATION_QUERY = 'query'
           TAG_SYSTEM = 'mysql'
-          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
+          PEER_SERVICE_SOURCES = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Datadog
           register_as :trilogy
 
           def self.version
-            Gem.loaded_specs['trilogy'] && Gem.loaded_specs['trilogy'].version
+            Gem.loaded_specs['trilogy']&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/utils/quantization/hash.rb

@@ -21,7 +21,7 @@ module Datadog
             def format(hash_obj, options = {})
               options ||= {}
               format!(hash_obj, options)
-            rescue StandardError
+            rescue
               options[:placeholder] || PLACEHOLDER
             end
 
@@ -66,7 +66,7 @@ module Datadog
             def format_array(value, options)
               if value.any? { |v| v.class <= ::Hash || v.class <= Array }
                 first_entry = format_value(value.first, options)
-                value.size > 1 ? [first_entry, options[:placeholder]] : [first_entry]
+                (value.size > 1) ? [first_entry, options[:placeholder]] : [first_entry]
                 # Otherwise short-circuit and return single placeholder
               else
                 [options[:placeholder]]
@@ -77,19 +77,19 @@ module Datadog
               {}.tap do |options|
                 # Show
                 # If either is :all, value becomes :all
-                options[:show] =  if original[:show] == :all || additional[:show] == :all
-                                    :all
-                                  else
-                                    (original[:show] || []).dup.concat(additional[:show] || []).uniq
-                                  end
+                options[:show] = if original[:show] == :all || additional[:show] == :all
+                  :all
+                else
+                  (original[:show] || []).dup.concat(additional[:show] || []).uniq
+                end
 
                 # Exclude
                 # If either is :all, value becomes :all
                 options[:exclude] = if original[:exclude] == :all || additional[:exclude] == :all
-                                      :all
-                                    else
-                                      (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
-                                    end
+                  :all
+                else
+                  (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
+                end
 
                 options[:placeholder] = additional[:placeholder] || original[:placeholder]
               end

data/lib/datadog/tracing/contrib/utils/quantization/http.rb

@@ -16,16 +16,16 @@ module Datadog
             # but adjusted to parse only <scheme>://<host>:<port>/ components
             # and stop there, since we don't care about the path, query string,
             # and fragment components
-            RFC3986_URL_BASE = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)))(?:\/|\z)/.freeze # rubocop:disable Style/RegexpLiteral, Layout/LineLength
+            RFC3986_URL_BASE = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*+):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*+)@)?(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h++\.[!$&-.0-;=A-Z_a-z~]++))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])*+))(?::(?<port>\d*+))?)))(?:\/|\z)/.freeze # rubocop:disable Layout/LineLength
 
             module_function
 
             def url(url, options = {})
               url!(url, options)
-            rescue StandardError
+            rescue
               placeholder = options[:placeholder] || PLACEHOLDER
 
-              options[:base] == :exclude ? placeholder : "#{base_url(url)}/#{placeholder}"
+              (options[:base] == :exclude) ? placeholder : "#{base_url(url)}/#{placeholder}"
             end
 
             def base_url(url, options = {})
@@ -43,7 +43,7 @@ module Datadog
                 # Format the query string
                 if uri.query
                   query = query(uri.query, options[:query])
-                  uri.query = (!query.nil? && query.empty? ? nil : query)
+                  uri.query = ((!query.nil? && query.empty?) ? nil : query)
                 end
 
                 # Remove any URI fragments
@@ -59,7 +59,7 @@ module Datadog
 
             def query(query, options = {})
               query!(query, options)
-            rescue StandardError
+            rescue
               options[:placeholder] || PLACEHOLDER
             end
 
@@ -78,7 +78,7 @@ module Datadog
                   if options[:exclude].include?(key)
                     [nil, nil]
                   else
-                    value = options[:show] == :all || options[:show].include?(key) ? value : nil
+                    value = (options[:show] == :all || options[:show].include?(key)) ? value : nil
                     [key, value]
                   end
                 end

data/lib/datadog/tracing/contrib.rb

@@ -55,6 +55,7 @@ require_relative 'contrib/httpclient/integration'
 require_relative 'contrib/httprb/integration'
 require_relative 'contrib/integration'
 require_relative 'contrib/kafka/integration'
+require_relative 'contrib/karafka'
 require_relative 'contrib/lograge/integration'
 require_relative 'contrib/mongodb/integration'
 require_relative 'contrib/mysql2/integration'

data/lib/datadog/tracing/correlation.rb

@@ -94,8 +94,15 @@ module Datadog
       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?
+        if Datadog.configuration.tracing.trace_id_128_bit_logging_enabled
+          format_trace_id_128(trace_id)
+        else
+          Tracing::Utils::TraceId.to_low_order(trace_id).to_s
+        end
+      end
+
+      def format_trace_id_128(trace_id)
+        if !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

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

@@ -84,9 +84,13 @@ module Datadog
           # @return [Numeric, nil] tracer sample rate configured
           def sample_rate
             sampler = Datadog.configuration.tracing.sampler
-            return nil unless sampler
+            return Datadog.configuration.tracing.sampling.default_rate unless sampler
 
-            sampler.sample_rate(nil) rescue nil
+            begin
+              sampler.sample_rate(nil)
+            rescue
+              nil
+            end
           end
 
           # DEV: We currently only support SimpleRule instances.
@@ -97,6 +101,8 @@ module Datadog
           # @return [Hash, nil] sample rules configured
           def sampling_rules
             sampler = Datadog.configuration.tracing.sampler
+            return Datadog.configuration.tracing.sampling.rules unless sampler
+
             return nil unless sampler.is_a?(Tracing::Sampling::PrioritySampler) &&
               sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
 

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

@@ -55,7 +55,7 @@ module Datadog
           span_id = Helpers.parse_hex_id(fetcher[@span_id_key])
 
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           # We don't need to try and convert sampled since B3 supports 0/1 (AUTO_REJECT/AUTO_KEEP)
           sampling_priority = Helpers.parse_decimal_id(fetcher[@sampled_key])

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

@@ -28,7 +28,7 @@ module Datadog
           span_id = digest.span_id || 0 # Fall back to zero (invalid) if not present
 
           # DEV: We need these to be hex encoded
-          value = "#{format('%032x', digest.trace_id)}-#{format('%016x', span_id)}"
+          value = "#{format("%032x", digest.trace_id)}-#{format("%016x", span_id)}"
 
           if digest.trace_sampling_priority
             sampling_priority = Helpers.clamp_sampling_priority(
@@ -54,7 +54,7 @@ module Datadog
 
           span_id = Helpers.parse_hex_id(parts[1]) if parts.length > 1
           # Return early if this propagation is not valid
-          return if span_id.nil? || span_id <= 0 || span_id >= Tracing::Utils::EXTERNAL_MAX_ID
+          return if span_id.nil? || span_id <= 0 || span_id > Tracing::Utils::EXTERNAL_MAX_ID
 
           sampling_priority = Helpers.parse_decimal_id(parts[2]) if parts.length > 2