datadog 2.3.0 → 2.4.0

data/lib/datadog/tracing/trace_operation.rb

@@ -2,7 +2,7 @@
 
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
-
+require_relative 'tracer'
 require_relative 'event'
 require_relative 'metadata/tagging'
 require_relative 'sampling/ext'
@@ -75,7 +75,9 @@ module Datadog
         metrics: nil,
         trace_state: nil,
         trace_state_unknown_fields: nil,
-        remote_parent: false
+        remote_parent: false,
+        tracer: nil
+
       )
         # Attributes
         @id = id || Tracing::Utils::TraceId.next_id
@@ -98,6 +100,7 @@ module Datadog
         @profiling_enabled = profiling_enabled
         @trace_state = trace_state
         @trace_state_unknown_fields = trace_state_unknown_fields
+        @tracer = tracer
 
         # Generic tags
         set_tags(tags) if tags
@@ -161,6 +164,23 @@ module Datadog
         @resource || (root_span && root_span.resource)
       end
 
+      # When retrieving tags or metrics we need to include root span tags for sampling purposes
+      def get_tag(key)
+        super || (root_span && root_span.get_tag(key))
+      end
+
+      def get_metric(key)
+        super || (root_span && root_span.get_metric(key))
+      end
+
+      def tags
+        all_tags = {}
+        all_tags.merge!(root_span&.tags || {}) if root_span
+        all_tags.merge!(super)
+
+        all_tags
+      end
+
       # Returns true if the resource has been explicitly set
       #
       # @return [Boolean]
@@ -284,10 +304,14 @@ module Datadog
       # Returns a set of trace headers used for continuing traces.
       # Used for propagation across execution contexts.
       # Data should reflect the active state of the trace.
+      # DEV-3.0: Sampling is a side effect of generating the digest.
+      # We should move the sample call to inject and right before moving to new contexts(threads, forking etc.)
       def to_digest
         # Resolve current span ID
         span_id = @active_span && @active_span.id
         span_id ||= @parent_span_id unless finished?
+        # sample the trace_operation with the tracer
+        @tracer&.sample_trace(self) unless sampling_priority
 
         TraceDigest.new(
           span_id: span_id,

data/lib/datadog/tracing/tracer.rb

@@ -262,6 +262,17 @@ module Datadog
         context.activate!(trace, &block)
       end
 
+      # Sample a span, tagging the trace as appropriate.
+      def sample_trace(trace_op)
+        begin
+          @sampler.sample!(trace_op)
+        rescue StandardError => e
+          SAMPLE_TRACE_LOG_ONLY_ONCE.run do
+            Datadog.logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+          end
+        end
+      end
+
       # @!visibility private
       # TODO: make this private
       def trace_completed
@@ -331,12 +342,14 @@ module Datadog
             trace_state: digest.trace_state,
             trace_state_unknown_fields: digest.trace_state_unknown_fields,
             remote_parent: digest.span_remote,
+            tracer: self
           )
         else
           TraceOperation.new(
             hostname: hostname,
             profiling_enabled: profiling_enabled,
             remote_parent: false,
+            tracer: self
           )
         end
       end
@@ -347,7 +360,6 @@ module Datadog
         events.span_before_start.subscribe do |event_span_op, event_trace_op|
           event_trace_op.service ||= @default_service
           event_span_op.service ||= @default_service
-          sample_trace(event_trace_op) if event_span_op && event_span_op.parent_id == 0
         end
 
         events.span_finished.subscribe do |event_span, event_trace_op|
@@ -463,17 +475,6 @@ module Datadog
         end
       end
 
-      # Sample a span, tagging the trace as appropriate.
-      def sample_trace(trace_op)
-        begin
-          @sampler.sample!(trace_op)
-        rescue StandardError => e
-          SAMPLE_TRACE_LOG_ONLY_ONCE.run do
-            Datadog.logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
-          end
-        end
-      end
-
       SAMPLE_TRACE_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new
       private_constant :SAMPLE_TRACE_LOG_ONLY_ONCE
 
@@ -492,6 +493,7 @@ module Datadog
 
       # Flush finished spans from the trace buffer, send them to writer.
       def flush_trace(trace_op)
+        sample_trace(trace_op) unless trace_op.sampling_priority
         begin
           trace = @trace_flush.consume!(trace_op)
           write(trace) if trace && !trace.empty?

data/lib/datadog/tracing/transport/http/client.rb

@@ -38,6 +38,7 @@ module Datadog
             if stats.consecutive_errors > 0
               Datadog.logger.debug(message)
             else
+              # Not to report telemetry logs
               Datadog.logger.error(message)
             end
 

data/lib/datadog/tracing/transport/io/client.rb

@@ -49,6 +49,7 @@ module Datadog
             if stats.consecutive_errors > 0
               Datadog.logger.debug(message)
             else
+              # Not to report telemetry logs
               Datadog.logger.error(message)
             end
 

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -43,7 +43,7 @@ module Datadog
           traces = process_traces(traces)
           flush_traces(traces)
         rescue StandardError => e
-          Datadog.logger.error(
+          Datadog.logger.warn(
             "Error while writing traces: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
           )
         end

data/lib/datadog/tracing/workers.rb

@@ -56,7 +56,7 @@ module Datadog
             # ensures that the thread will not die because of an exception.
             # TODO[manu]: findout the reason and reschedule the send if it's not
             # a fatal exception
-            Datadog.logger.error(
+            Datadog.logger.warn(
               "Error during traces flush: dropped #{traces.length} items. Cause: #{e} Location: #{Array(e.backtrace).first}"
             )
           end

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 3
+    MINOR = 4
     PATCH = 0
     PRE = nil
     BUILD = nil

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-22 00:00:00.000000000 Z
+date: 2024-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0.1.0
+        version: 12.0.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.0.0.1.0
+        version: 12.0.0.1.0
 description: |
   datadog is Datadog's client library for Ruby. It includes a suite of tools
   which provide visibility into the performance and security of Ruby applications,
@@ -110,6 +110,8 @@ files:
 - ext/datadog_profiling_native_extension/datadog_ruby_common.c
 - ext/datadog_profiling_native_extension/datadog_ruby_common.h
 - ext/datadog_profiling_native_extension/extconf.rb
+- ext/datadog_profiling_native_extension/gvl_profiling_helper.c
+- ext/datadog_profiling_native_extension/gvl_profiling_helper.h
 - ext/datadog_profiling_native_extension/heap_recorder.c
 - ext/datadog_profiling_native_extension/heap_recorder.h
 - ext/datadog_profiling_native_extension/helpers.h
@@ -156,6 +158,7 @@ files:
 - lib/datadog/appsec/contrib/devise/patcher.rb
 - lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb
 - lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb
+- lib/datadog/appsec/contrib/devise/patcher/rememberable_patch.rb
 - lib/datadog/appsec/contrib/devise/resource.rb
 - lib/datadog/appsec/contrib/devise/tracking.rb
 - lib/datadog/appsec/contrib/graphql/appsec_trace.rb
@@ -271,6 +274,7 @@ files:
 - lib/datadog/core/metrics/metric.rb
 - lib/datadog/core/metrics/options.rb
 - lib/datadog/core/pin.rb
+- lib/datadog/core/rate_limiter.rb
 - lib/datadog/core/remote.rb
 - lib/datadog/core/remote/client.rb
 - lib/datadog/core/remote/client/capabilities.rb
@@ -308,6 +312,7 @@ files:
 - lib/datadog/core/telemetry/http/ext.rb
 - lib/datadog/core/telemetry/http/response.rb
 - lib/datadog/core/telemetry/http/transport.rb
+- lib/datadog/core/telemetry/logger.rb
 - lib/datadog/core/telemetry/logging.rb
 - lib/datadog/core/telemetry/metric.rb
 - lib/datadog/core/telemetry/metrics_collection.rb
@@ -354,6 +359,16 @@ files:
 - lib/datadog/core/workers/polling.rb
 - lib/datadog/core/workers/queue.rb
 - lib/datadog/core/workers/runtime_metrics.rb
+- lib/datadog/di.rb
+- lib/datadog/di/code_tracker.rb
+- lib/datadog/di/configuration.rb
+- lib/datadog/di/configuration/settings.rb
+- lib/datadog/di/error.rb
+- lib/datadog/di/extensions.rb
+- lib/datadog/di/probe.rb
+- lib/datadog/di/probe_builder.rb
+- lib/datadog/di/redactor.rb
+- lib/datadog/di/serializer.rb
 - lib/datadog/kit.rb
 - lib/datadog/kit/appsec/events.rb
 - lib/datadog/kit/enable_core_dumps.rb
@@ -391,6 +406,7 @@ files:
 - lib/datadog/profiling/tasks/exec.rb
 - lib/datadog/profiling/tasks/help.rb
 - lib/datadog/profiling/tasks/setup.rb
+- lib/datadog/single_step_instrument.rb
 - lib/datadog/tracing.rb
 - lib/datadog/tracing/analytics.rb
 - lib/datadog/tracing/buffer.rb
@@ -424,6 +440,8 @@ files:
 - lib/datadog/tracing/contrib/action_mailer/patcher.rb
 - lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb
 - lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb
+- lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb
+- lib/datadog/tracing/contrib/action_pack/action_dispatch/patcher.rb
 - lib/datadog/tracing/contrib/action_pack/configuration/settings.rb
 - lib/datadog/tracing/contrib/action_pack/ext.rb
 - lib/datadog/tracing/contrib/action_pack/integration.rb
@@ -824,7 +842,6 @@ files:
 - lib/datadog/tracing/sampling/priority_sampler.rb
 - lib/datadog/tracing/sampling/rate_by_key_sampler.rb
 - lib/datadog/tracing/sampling/rate_by_service_sampler.rb
-- lib/datadog/tracing/sampling/rate_limiter.rb
 - lib/datadog/tracing/sampling/rate_sampler.rb
 - lib/datadog/tracing/sampling/rule.rb
 - lib/datadog/tracing/sampling/rule_sampler.rb
@@ -870,8 +887,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.3.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.3.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.4.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.4.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -890,7 +907,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Datadog tracing code for your Ruby applications

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

@@ -1,185 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../../core/utils/time'
-
-module Datadog
-  module Tracing
-    module Sampling
-      # Checks for rate limiting on a resource.
-      class RateLimiter
-        # Checks if resource of specified size can be
-        # conforms with the current limit.
-        #
-        # Implementations of this method are not guaranteed
-        # to be side-effect free.
-        #
-        # @return [Boolean] whether a resource conforms with the current limit
-        def allow?(size); end
-
-        # The effective rate limiting ratio based on
-        # recent calls to `allow?`.
-        #
-        # @return [Float] recent allowance ratio
-        def effective_rate; end
-      end
-
-      # Implementation of the Token Bucket metering algorithm
-      # for rate limiting.
-      #
-      # @see https://en.wikipedia.org/wiki/Token_bucket Token bucket
-      class TokenBucket < RateLimiter
-        attr_reader :rate, :max_tokens
-
-        # @param rate [Numeric] Allowance rate, in units per second
-        #  if rate is negative, always allow
-        #  if rate is zero, never allow
-        # @param max_tokens [Numeric] Limit of available tokens
-        def initialize(rate, max_tokens = rate)
-          super()
-
-          raise ArgumentError, "rate must be a number: #{rate}" unless rate.is_a?(Numeric)
-          raise ArgumentError, "max_tokens must be a number: #{max_tokens}" unless max_tokens.is_a?(Numeric)
-
-          @rate = rate
-          @max_tokens = max_tokens
-
-          @tokens = max_tokens
-          @total_messages = 0
-          @conforming_messages = 0
-          @prev_conforming_messages = nil
-          @prev_total_messages = nil
-          @current_window = nil
-
-          @last_refill = Core::Utils::Time.get_time
-        end
-
-        # Checks if a message of provided +size+
-        # conforms with the current bucket limit.
-        #
-        # If it does, return +true+ and remove +size+
-        # tokens from the bucket.
-        # If it does not, return +false+ without affecting
-        # the tokens from the bucket.
-        #
-        # @return [Boolean] +true+ if message conforms with current bucket limit
-        def allow?(size)
-          allowed = should_allow?(size)
-          update_rate_counts(allowed)
-          allowed
-        end
-
-        # Ratio of 'conformance' per 'total messages' checked
-        # averaged for the past 2 buckets
-        #
-        # Returns +1.0+ when no messages have been checked yet.
-        #
-        # @return [Float] Conformance ratio, between +[0,1]+
-        def effective_rate
-          return 0.0 if @rate.zero?
-          return 1.0 if @rate < 0 || @total_messages.zero?
-
-          return current_window_rate if @prev_conforming_messages.nil? || @prev_total_messages.nil?
-
-          (@conforming_messages.to_f + @prev_conforming_messages.to_f) / (@total_messages + @prev_total_messages)
-        end
-
-        # Ratio of 'conformance' per 'total messages' checked
-        # on this bucket
-        #
-        # Returns +1.0+ when no messages have been checked yet.
-        #
-        # @return [Float] Conformance ratio, between +[0,1]+
-        def current_window_rate
-          return 1.0 if @total_messages.zero?
-
-          @conforming_messages.to_f / @total_messages
-        end
-
-        # @return [Numeric] number of tokens currently available
-        def available_tokens
-          @tokens
-        end
-
-        private
-
-        def refill_since_last_message
-          now = Core::Utils::Time.get_time
-          elapsed = now - @last_refill
-
-          # Update the number of available tokens, but ensure we do not exceed the max
-          # we return the min of tokens + rate*elapsed, or max tokens
-          refill_tokens(@rate * elapsed)
-
-          @last_refill = now
-        end
-
-        def refill_tokens(size)
-          @tokens += size
-          @tokens = @max_tokens if @tokens > @max_tokens
-        end
-
-        def increment_total_count
-          @total_messages += 1
-        end
-
-        def increment_conforming_count
-          @conforming_messages += 1
-        end
-
-        def should_allow?(size)
-          # rate limit of 0 blocks everything
-          return false if @rate.zero?
-
-          # negative rate limit disables rate limiting
-          return true if @rate < 0
-
-          refill_since_last_message
-
-          # if tokens < 1 we don't allow?
-          return false if @tokens < size
-
-          @tokens -= size
-
-          true
-        end
-
-        # Sets and Updates the past two 1 second windows for which
-        # the rate limiter must compute it's rate over and updates
-        # the total count, and conforming message count if +allowed+
-        def update_rate_counts(allowed)
-          now = Core::Utils::Time.get_time
-
-          # No tokens have been seen yet, start a new window
-          if @current_window.nil?
-            @current_window = now
-          # If more than 1 second has past since last window, reset
-          elsif now - @current_window >= 1
-            @prev_conforming_messages = @conforming_messages
-            @prev_total_messages = @total_messages
-            @conforming_messages = 0
-            @total_messages = 0
-            @current_window = now
-          end
-
-          increment_conforming_count if allowed
-
-          increment_total_count
-        end
-      end
-
-      # {Datadog::Tracing::Sampling::RateLimiter} that accepts all resources,
-      # with no limits.
-      class UnlimitedLimiter < RateLimiter
-        # @return [Boolean] always +true+
-        def allow?(_)
-          true
-        end
-
-        # @return [Float] always 100%
-        def effective_rate
-          1.0
-        end
-      end
-    end
-  end
-end