datadog 2.19.0 → 2.21.0

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

@@ -52,7 +52,7 @@ module Datadog
               tags ||= {}
               tags[Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER] = decision
             when :drop
-              tags.delete(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER) if tags
+              tags&.delete(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER)
             end
           end
 
@@ -128,7 +128,7 @@ module Datadog
         # @param parent_id [Integer] 64-bit
         # @param trace_flags [Integer] 8-bit
         def build_traceparent_string(trace_id, parent_id, trace_flags)
-          "00-#{format('%032x', trace_id)}-#{format('%016x', parent_id)}-#{format('%02x', trace_flags)}"
+          "00-#{format("%032x", trace_id)}-#{format("%016x", parent_id)}-#{format("%02x", trace_flags)}"
         end
 
         # Sets the trace flag to an existing `trace_flags`.
@@ -148,12 +148,14 @@ module Datadog
 
         # @see https://www.w3.org/TR/trace-context/#tracestate-header
         def build_tracestate(digest)
-          tracestate = String.new('dd=')
+          tracestate = +'dd='
           tracestate << last_dd_parent_id(digest)
           tracestate << "s:#{digest.trace_sampling_priority};" if digest.trace_sampling_priority
           tracestate << "o:#{serialize_origin(digest.trace_origin)};" if digest.trace_origin
 
-          if digest.trace_distributed_tags
+          # Replacing this by safe navigation seems to have a different behaviour on Rubies <= 3.0.
+          # It cause a LocalJumpError in the CI.
+          if digest.trace_distributed_tags # rubocop:disable Style/SafeNavigation
             digest.trace_distributed_tags.each do |name, value|
               tag = "t.#{serialize_tag_key(name)}:#{serialize_tag_value(value)};"
 
@@ -187,7 +189,7 @@ module Datadog
               # Ensure the list has at most 31 elements, as we need to prepend Datadog's
               # entry and the limit is 32 elements total.
               vendors = vendors[0..30]
-              "#{tracestate},#{vendors.join(',')}"
+              "#{tracestate},#{vendors.join(",")}"
             else
               tracestate.to_s
             end
@@ -199,7 +201,7 @@ module Datadog
         def last_dd_parent_id(digest)
           if !digest.span_remote
             span_id = digest.span_id || 0 # Fall back to zero (invalid) if not present
-            "p:#{format('%016x', span_id)};"
+            "p:#{format("%016x", span_id)};"
           elsif digest.trace_distributed_tags&.key?(Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID)
             "p:#{digest.trace_distributed_tags[Tracing::Metadata::Ext::Distributed::TAG_DD_PARENT_ID]};"
           else
@@ -216,10 +218,10 @@ module Datadog
           # DEV: come from Datadog-controlled sources.
           # DEV: Trying to `match?` is measurably faster than a `gsub` that does not match.
           value = if INVALID_ORIGIN_CHARS.match?(value)
-                    value.gsub(INVALID_ORIGIN_CHARS, '_')
-                  else
-                    value
-                  end
+            value.gsub(INVALID_ORIGIN_CHARS, '_')
+          else
+            value
+          end
 
           if REMAP_ORIGIN_CHARS.match?(value)
             value.gsub(REMAP_ORIGIN_CHARS, '~')
@@ -253,10 +255,10 @@ module Datadog
           # DEV: come from Datadog-controlled sources.
           # DEV: Trying to `match?` is measurably faster than a `gsub` that does not match.
           ret = if INVALID_TAG_VALUE_CHARS.match?(value)
-                  value.gsub(INVALID_TAG_VALUE_CHARS, '_')
-                else
-                  value
-                end
+            value.gsub(INVALID_TAG_VALUE_CHARS, '_')
+          else
+            value
+          end
 
           # DEV: Checking for an unlikely '=' is faster than a no-op `tr`.
           if ret.include?('=')
@@ -333,7 +335,11 @@ module Datadog
             key, value = pair.split(':', 2)
             case key
             when 's'
-              sampling_priority = Integer(value) rescue nil
+              sampling_priority = begin
+                Integer(value)
+              rescue
+                nil
+              end
             when 'o'
               origin = value
             when 'p'
@@ -350,7 +356,7 @@ module Datadog
               tags ||= {}
               tags["#{Tracing::Metadata::Ext::Distributed::TAGS_PREFIX}#{key}"] = value
             else
-              unknown_fields ||= String.new
+              unknown_fields ||= +''
               unknown_fields << pair
               unknown_fields << ';'
             end

data/lib/datadog/tracing/event.rb

@@ -59,13 +59,11 @@ module Datadog
 
       def publish(*args)
         subscriptions.each do |block|
-          begin
-            block.call(*args)
-          rescue StandardError => e
-            Datadog.logger.debug do
-              "Error while handling '#{name}' event with '#{block}': #{e.class.name} #{e.message} " \
-              "at #{Array(e.backtrace).first}"
-            end
+          block.call(*args)
+        rescue => e
+          Datadog.logger.debug do
+            "Error while handling '#{name}' event with '#{block}': #{e.class.name} #{e.message} " \
+            "at #{Array(e.backtrace).first}"
           end
         end
 

data/lib/datadog/tracing/flush.rb

@@ -59,7 +59,7 @@ module Datadog
       class Finished < Base
         # Are all spans finished?
         def flush?(trace_op)
-          trace_op && trace_op.finished?
+          trace_op&.finished?
         end
       end
 

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

@@ -12,7 +12,7 @@ module Datadog
           case key
           when Ext::Analytics::TAG_ENABLED
             # If true, set rate to 1.0, otherwise set 0.0.
-            value = value == true ? Ext::Analytics::DEFAULT_SAMPLE_RATE : 0.0
+            value = (value == true) ? Ext::Analytics::DEFAULT_SAMPLE_RATE : 0.0
             Tracing::Analytics.set_sample_rate(self, value)
           when Ext::Analytics::TAG_SAMPLE_RATE
             Tracing::Analytics.set_sample_rate(self, value)

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

@@ -51,7 +51,7 @@ module Datadog
             # Encode strings in UTF-8 to facilitate downstream serialization
             meta[Core::Utils.utf8_encode(key)] = Core::Utils.utf8_encode(value)
           end
-        rescue StandardError => e
+        rescue => e
           Datadog.logger.debug("Unable to set the tag #{key}, ignoring it. Caused by: #{e}")
         end
 
@@ -80,10 +80,10 @@ module Datadog
         end
 
         # Convenient interface for setting a single tag.
-        alias []= set_tag
+        alias_method :[]=, :set_tag
 
         # Convenient interface for getting a single tag.
-        alias [] get_tag
+        alias_method :[], :get_tag
 
         # Return the metric with the given key, nil if it doesn't exist.
         def get_metric(key)
@@ -101,7 +101,7 @@ module Datadog
 
           # Encode strings in UTF-8 to facilitate downstream serialization
           metrics[Core::Utils.utf8_encode(key)] = value
-        rescue StandardError => e
+        rescue => e
           Datadog.logger.debug("Unable to set the metric #{key}, ignoring it. Caused by: #{e}")
         end
 

data/lib/datadog/tracing/pipeline/span_filter.rb

@@ -38,7 +38,9 @@ module Datadog
         private
 
         def drop_it?(span)
-          @operation.call(span) rescue false
+          @operation.call(span)
+        rescue
+          false
         end
       end
     end

data/lib/datadog/tracing/pipeline/span_processor.rb

@@ -28,7 +28,9 @@ module Datadog
         # @!visibility private
         def call(trace)
           trace.spans.each do |span|
-            @operation.call(span) rescue next
+            @operation.call(span)
+          rescue
+            next
           end
 
           trace

data/lib/datadog/tracing/pipeline.rb

@@ -47,7 +47,7 @@ module Datadog
           next nil if current_trace.nil? || current_trace.empty?
 
           process_result = processor.call(current_trace)
-          process_result && process_result.empty? ? nil : process_result
+          (process_result && process_result.empty?) ? nil : process_result
         end
       rescue => e
         Datadog.logger.debug(

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

@@ -47,8 +47,6 @@ module Datadog
           MANUAL = '-4'
           # Formerly AppSec.
           ASM = '-5'
-          # Single Span Sampled.
-          SPAN_SAMPLING_RATE = '-8'
           # Dynamically configured rule, explicitly created by the user.
           REMOTE_USER_RULE = '-11'
           # Dynamically configured  rule, automatically generated by Datadog.

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -30,26 +30,26 @@ module Datadog
           default_sampler: nil
         )
           @rules = if default_sample_rate && !default_sampler
-                     # Add to the end of the rule list a rule always matches any trace
-                     rules << SimpleRule.new(sample_rate: default_sample_rate)
-                   else
-                     rules
-                   end
+            # Add to the end of the rule list a rule always matches any trace
+            rules << SimpleRule.new(sample_rate: default_sample_rate)
+          else
+            rules
+          end
           @rate_limiter = if rate_limiter
-                            rate_limiter
-                          elsif rate_limit
-                            Core::TokenBucket.new(rate_limit)
-                          else
-                            Core::UnlimitedLimiter.new
-                          end
+            rate_limiter
+          elsif rate_limit
+            Core::TokenBucket.new(rate_limit)
+          else
+            Core::UnlimitedLimiter.new
+          end
           @default_sampler = if default_sampler
-                               default_sampler
-                             elsif default_sample_rate
-                               nil
-                             else
-                               # TODO: Simplify .tags access, as `Tracer#tags` can't be arbitrarily changed anymore
-                               RateByServiceSampler.new(1.0, env: -> { Tracing.send(:tracer).tags['env'] })
-                             end
+            default_sampler
+          elsif default_sample_rate
+            nil
+          else
+            # TODO: Simplify .tags access, as `Tracer#tags` can't be arbitrarily changed anymore
+            RateByServiceSampler.new(1.0, env: -> { Tracing.send(:tracer).tags['env'] })
+          end
         end
 
         def self.parse(rules, rate_limit, default_sample_rate)
@@ -130,17 +130,17 @@ module Datadog
             set_limiter_metrics(trace, rate_limiter.effective_rate)
 
             provenance = case rule.provenance
-                         when Rule::PROVENANCE_REMOTE_USER
-                           Ext::Decision::REMOTE_USER_RULE
-                         when Rule::PROVENANCE_REMOTE_DYNAMIC
-                           Ext::Decision::REMOTE_DYNAMIC_RULE
-                         else
-                           Ext::Decision::TRACE_SAMPLING_RULE
-                         end
+            when Rule::PROVENANCE_REMOTE_USER
+              Ext::Decision::REMOTE_USER_RULE
+            when Rule::PROVENANCE_REMOTE_DYNAMIC
+              Ext::Decision::REMOTE_DYNAMIC_RULE
+            else
+              Ext::Decision::TRACE_SAMPLING_RULE
+            end
 
             trace.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, provenance)
           end
-        rescue StandardError => e
+        rescue => e
           Datadog.logger.error(
             "Rule sampling failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
           )
@@ -153,10 +153,10 @@ module Datadog
         # was responsible for the sampling decision.
         def set_priority(trace, sampled)
           trace.sampling_priority = if sampled
-                                      Sampling::Ext::Priority::USER_KEEP
-                                    else
-                                      Sampling::Ext::Priority::USER_REJECT
-                                    end
+            Sampling::Ext::Priority::USER_KEEP
+          else
+            Sampling::Ext::Priority::USER_REJECT
+          end
         end
 
         def set_rule_metrics(trace, sample_rate)

data/lib/datadog/tracing/sampling/span/rule_parser.rb

@@ -28,7 +28,7 @@ module Datadog
                 list = JSON.parse(rules)
               rescue => e
                 Datadog.logger.warn(
-                  "Error parsing Span Sampling Rules `#{rules.inspect}`: "\
+                  "Error parsing Span Sampling Rules `#{rules.inspect}`: " \
                   "#{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
                 )
                 return nil

data/lib/datadog/tracing/sampling/span/sampler.rb

@@ -58,13 +58,6 @@ module Datadog
 
               next if decision == :not_matched # Iterate until we find a matching decision
 
-              if decision == :kept
-                trace_op.set_tag(
-                  Metadata::Ext::Distributed::TAG_DECISION_MAKER,
-                  Sampling::Ext::Decision::SPAN_SAMPLING_RATE
-                )
-              end
-
               break # Found either a `kept` or `rejected` decision
             end
 

data/lib/datadog/tracing/span.rb

@@ -113,7 +113,7 @@ module Datadog
       def stopped?
         !@end_time.nil?
       end
-      alias :finished? :stopped?
+      alias_method :finished?, :stopped?
 
       def duration
         return @duration if @duration

data/lib/datadog/tracing/span_event.rb

@@ -41,7 +41,7 @@ module Datadog
       # of being limiting span events to the size limit of a span tag.
       # All Datadog agents support this format.
       def to_hash
-        h = { 'name' => @name, 'time_unix_nano' => @time_unix_nano }
+        h = {'name' => @name, 'time_unix_nano' => @time_unix_nano}
         h['attributes'] = @attributes unless @attributes.empty?
         h
       end
@@ -51,15 +51,15 @@ module Datadog
       # This serialization format removes the serialization limitations of the `span.set_tag('events)` approach,
       # but is only supported by newer version of the Datadog agent.
       def to_native_format
-        h = { 'name' => @name, 'time_unix_nano' => @time_unix_nano }
+        h = {'name' => @name, 'time_unix_nano' => @time_unix_nano}
 
         attr = {}
         @attributes.each do |key, value|
           attr[key] = if value.is_a?(Array)
-                        { type: ARRAY_TYPE, array_value: { values: value.map { |v| serialize_native_attribute(v) } } }
-                      else
-                        serialize_native_attribute(value)
-                      end
+            {type: ARRAY_TYPE, array_value: {values: value.map { |v| serialize_native_attribute(v) }}}
+          else
+            serialize_native_attribute(value)
+          end
         end
 
         h['attributes'] = attr unless @attributes.empty?
@@ -144,13 +144,13 @@ module Datadog
       def serialize_native_attribute(value)
         case value
         when String
-          { type: STRING_TYPE, string_value: value }
+          {type: STRING_TYPE, string_value: value}
         when TrueClass, FalseClass
-          { type: BOOLEAN_TYPE, bool_value: value }
+          {type: BOOLEAN_TYPE, bool_value: value}
         when Integer
-          { type: INTEGER_TYPE, int_value: value }
+          {type: INTEGER_TYPE, int_value: value}
         when Float
-          { type: DOUBLE_TYPE, double_value: value }
+          {type: DOUBLE_TYPE, double_value: value}
         else
           # This is technically unreachable due to the validation in #initialize.
           raise ArgumentError, "Attribute must be a string, number, or boolean: #{value}."

data/lib/datadog/tracing/span_link.rb

@@ -47,15 +47,15 @@ module Datadog
         @span_id = digest.span_id
         @trace_id = digest.trace_id
         @trace_flags = if digest.trace_sampling_priority.nil?
-                         nil
-                       elsif digest.trace_sampling_priority > 0
-                         1
-                       else
-                         0
-                       end
-        @trace_state = digest.trace_state && digest.trace_state.dup
+          nil
+        elsif digest.trace_sampling_priority > 0
+          1
+        else
+          0
+        end
+        @trace_state = digest.trace_state&.dup
         @dropped_attributes = 0
-        @attributes = (attributes && attributes.dup) || {}
+        @attributes = attributes&.dup || {}
       end
 
       def to_hash
@@ -81,10 +81,10 @@ module Datadog
         # If traceflags set, the high bit (bit 31) should be set to 1 (uint32).
         # This helps us distinguish between when the sample decision is zero or not set
         h[:flags] = if @trace_flags.nil?
-                      0
-                    else
-                      @trace_flags | (1 << 31)
-                    end
+          0
+        else
+          @trace_flags | (1 << 31)
+        end
         h
       end
     end

data/lib/datadog/tracing/span_operation.rb

@@ -157,7 +157,7 @@ module Datadog
           # running, to minimize impact on normal application function.
           begin
             start
-          rescue StandardError => e
+          rescue => e
             logger.debug { "Failed to start span: #{e}" }
           ensure
             # We should yield to the provided block when possible, as this
@@ -387,7 +387,7 @@ module Datadog
       class Events
         include Tracing::Events
 
-        DEFAULT_ON_ERROR = proc { |span_op, error| span_op.set_error(error) unless span_op.nil? }
+        DEFAULT_ON_ERROR = proc { |span_op, error| span_op&.set_error(error) }
 
         attr_reader \
           :logger,
@@ -448,23 +448,21 @@ module Datadog
             original = @handler
 
             @handler = proc do |op, error|
-              begin
-                yield(op, error)
-              rescue StandardError => e
-                logger.debug do
-                  "Custom on_error handler #{@handler} failed, using fallback behavior. \
+              yield(op, error)
+            rescue => e
+              logger.debug do
+                "Custom on_error handler #{@handler} failed, using fallback behavior. \
                   Cause: #{e.class}: #{e} Location: #{Array(e.backtrace).first}"
-                end
-
-                original.call(op, error) if original
               end
+
+              original&.call(op, error)
             end
           end
 
           def publish(*args)
             begin
               @handler.call(*args)
-            rescue StandardError => e
+            rescue => e
               logger.debug do
                 "Error in on_error handler '#{@default}': #{e.class}: #{e} at #{Array(e.backtrace).first}"
               end

data/lib/datadog/tracing/trace_digest.rb

@@ -162,29 +162,27 @@ module Datadog
         # DEV: Because we want to sometimes freeze the values provided to `TraceDigest`, it's best
         # DEV: to let `#initialize` decide how to handle each field, instead of duplicating that logic here.
         TraceDigest.new(
-          **{
-            span_id: span_id,
-            span_name: span_name,
-            span_resource: span_resource,
-            span_service: span_service,
-            span_type: span_type,
-            trace_distributed_tags: trace_distributed_tags,
-            trace_hostname: trace_hostname,
-            trace_id: trace_id,
-            trace_name: trace_name,
-            trace_origin: trace_origin,
-            trace_process_id: trace_process_id,
-            trace_resource: trace_resource,
-            trace_runtime_id: trace_runtime_id,
-            trace_sampling_priority: trace_sampling_priority,
-            trace_service: trace_service,
-            trace_distributed_id: trace_distributed_id,
-            trace_flags: trace_flags,
-            trace_state: trace_state,
-            trace_state_unknown_fields: trace_state_unknown_fields,
-            span_remote: span_remote,
-            baggage: baggage
-          }.merge!(field_value_pairs)
+          span_id: span_id,
+          span_name: span_name,
+          span_resource: span_resource,
+          span_service: span_service,
+          span_type: span_type,
+          trace_distributed_tags: trace_distributed_tags,
+          trace_hostname: trace_hostname,
+          trace_id: trace_id,
+          trace_name: trace_name,
+          trace_origin: trace_origin,
+          trace_process_id: trace_process_id,
+          trace_resource: trace_resource,
+          trace_runtime_id: trace_runtime_id,
+          trace_sampling_priority: trace_sampling_priority,
+          trace_service: trace_service,
+          trace_distributed_id: trace_distributed_id,
+          trace_flags: trace_flags,
+          trace_state: trace_state,
+          trace_state_unknown_fields: trace_state_unknown_fields,
+          span_remote: span_remote,
+          baggage: baggage, **field_value_pairs
         )
       end
     end