datadog 2.12.1 → 2.17.0

data/lib/datadog/tracing/transport/traces.rb

@@ -43,15 +43,17 @@ module Datadog
           # We set the value to a conservative 5 MiB, in case network speed is slow.
           DEFAULT_MAX_PAYLOAD_SIZE = 5 * 1024 * 1024
 
-          attr_reader :encoder, :max_size
+          attr_reader :encoder, :max_size, :logger
 
           #
           # Single traces larger than +max_size+ will be discarded.
           #
           # @param encoder [Datadog::Core::Encoding::Encoder]
+          # @param logger [Datadog::Core::Logger]
           # @param max_size [String] maximum acceptable payload size
-          def initialize(encoder, native_events_supported:, max_size: DEFAULT_MAX_PAYLOAD_SIZE)
+          def initialize(encoder, logger:, native_events_supported:, max_size: DEFAULT_MAX_PAYLOAD_SIZE)
             @encoder = encoder
+            @logger = logger
             @native_events_supported = native_events_supported
             @max_size = max_size
           end
@@ -78,11 +80,16 @@ module Datadog
           private
 
           def encode_one(trace)
-            encoded = Encoder.encode_trace(encoder, trace, native_events_supported: @native_events_supported)
+            encoded = Encoder.encode_trace(
+              encoder,
+              trace,
+              logger: logger,
+              native_events_supported: @native_events_supported
+            )
 
             if encoded.size > max_size
               # This single trace is too large, we can't flush it
-              Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
+              logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
               Datadog.health_metrics.transport_trace_too_large(1)
 
               return nil
@@ -96,7 +103,7 @@ module Datadog
         module Encoder
           module_function
 
-          def encode_trace(encoder, trace, native_events_supported:)
+          def encode_trace(encoder, trace, logger:, native_events_supported:)
             # Format the trace for transport
             TraceFormatter.format!(trace)
 
@@ -106,7 +113,7 @@ module Datadog
             # Encode the trace
             encoder.encode(serializable_trace).tap do |encoded|
               # Print the actual serialized trace, since the encoder can change make non-trivial changes
-              Datadog.logger.debug { "Flushing trace: #{encoder.decode(encoded)}" }
+              logger.debug { "Flushing trace: #{encoder.decode(encoded)}" }
             end
           end
         end
@@ -117,11 +124,12 @@ module Datadog
         # batches of traces into smaller chunks and handles
         # API version downgrade handshake.
         class Transport
-          attr_reader :client, :apis, :default_api, :current_api_id
+          attr_reader :client, :apis, :default_api, :current_api_id, :logger
 
-          def initialize(apis, default_api)
+          def initialize(apis, default_api, logger: Datadog.logger)
             @apis = apis
             @default_api = default_api
+            @logger = logger
 
             change_api!(default_api)
           end
@@ -130,6 +138,7 @@ module Datadog
             encoder = current_api.encoder
             chunker = Datadog::Tracing::Transport::Traces::Chunker.new(
               encoder,
+              logger: logger,
               native_events_supported: native_events_supported?
             )
 
@@ -190,7 +199,7 @@ module Datadog
             raise UnknownApiVersionError, api_id unless apis.key?(api_id)
 
             @current_api_id = api_id
-            @client = HTTP::Client.new(current_api)
+            @client = HTTP::Client.new(current_api, logger: logger)
           end
 
           # Queries the agent for native span events serialization support.
@@ -198,6 +207,14 @@ module Datadog
           def native_events_supported?
             return @native_events_supported if defined?(@native_events_supported)
 
+            # Check for an explicit override
+            option = Datadog.configuration.tracing.native_span_events
+            unless option.nil?
+              @native_events_supported = option
+              return option
+            end
+
+            # Otherwise, check for agent support, to ensure a configuration-less setup.
             if (res = Datadog.send(:components).agent_info.fetch)
               @native_events_supported = res.span_events == true
             else

data/lib/datadog/tracing/utils.rb

@@ -24,7 +24,7 @@ module Datadog
 
       # While we only generate 63-bit integers due to limitations in other languages, we support
       # parsing 64-bit integers for distributed tracing since an upstream system may generate one
-      EXTERNAL_MAX_ID = 1 << 64
+      EXTERNAL_MAX_ID = (1 << 64) - 1
 
       # We use a custom random number generator because we want no interference
       # with the default one. Using the default prng, we could break code that

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

@@ -26,14 +26,10 @@ module Datadog
           @logger = options[:logger] || Datadog.logger
 
           transport_options = options.fetch(:transport_options, {})
-
-          if options.key?(:agent_settings)
-            @agent_settings = options[:agent_settings]
-            transport_options = transport_options.merge(agent_settings: @agent_settings)
-          end
+          @agent_settings = options[:agent_settings]
 
           @transport = options.fetch(:transport) do
-            Datadog::Tracing::Transport::HTTP.default(**transport_options)
+            Datadog::Tracing::Transport::HTTP.default(agent_settings: agent_settings, logger: logger, **transport_options)
           end
         end
         # rubocop:enable Lint/MissingSuper

data/lib/datadog/tracing/writer.rb

@@ -26,15 +26,11 @@ module Datadog
         @buff_size = options.fetch(:buffer_size, Workers::AsyncTransport::DEFAULT_BUFFER_MAX_SIZE)
         @flush_interval = options.fetch(:flush_interval, Workers::AsyncTransport::DEFAULT_FLUSH_INTERVAL)
         transport_options = options.fetch(:transport_options, {})
-
-        if options.key?(:agent_settings)
-          @agent_settings = options[:agent_settings]
-          transport_options = transport_options.merge(agent_settings: @agent_settings)
-        end
+        @agent_settings = options[:agent_settings]
 
         # transport and buffers
         @transport = options.fetch(:transport) do
-          Transport::HTTP.default(**transport_options)
+          Transport::HTTP.default(agent_settings: agent_settings, logger: logger, **transport_options)
         end
 
         @shutdown_timeout = options.fetch(:shutdown_timeout, Workers::AsyncTransport::DEFAULT_SHUTDOWN_TIMEOUT)

data/lib/datadog/tracing.rb

@@ -26,7 +26,6 @@ module Datadog
         id: nil,
         &block
       )
-
         tracer.trace(
           name,
           continue_from: continue_from,
@@ -82,7 +81,7 @@ module Datadog
       # @public_api
       def keep!
         trace = active_trace
-        active_trace.keep! if trace
+        trace.keep! if trace
       end
 
       # (see Datadog::Tracing::TraceSegment#reject!)
@@ -90,7 +89,7 @@ module Datadog
       # @public_api
       def reject!
         trace = active_trace
-        active_trace.reject! if trace
+        trace.reject! if trace
       end
 
       # (see Datadog::Tracing::Tracer#active_correlation)
@@ -127,6 +126,20 @@ module Datadog
         correlation.to_log_format
       end
 
+      # Returns the baggage for the current trace.
+      #
+      # If there is no active trace, a new one is created.
+      #
+      # @return [Datadog::Tracing::Distributed::Baggage] The baggage for the current trace.
+      # @public_api
+      def baggage
+        # Baggage should not be dependent on there being an active trace.
+        # So we create a new TraceOperation if there isn't one.
+        active_trace = self.active_trace || tracer.continue_trace!(nil)
+        active_trace.baggage ||= {}
+        active_trace.baggage
+      end
+
       # Gracefully shuts down the tracer.
       #
       # The public tracing API will still respond to method calls as usual

data/lib/datadog/version.rb

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

data/lib/datadog.rb

@@ -7,7 +7,6 @@ require_relative 'datadog/tracing/contrib'
 # Load other products (must follow tracing)
 require_relative 'datadog/profiling'
 require_relative 'datadog/appsec'
-# Line probes will not work on Ruby < 2.6 because of lack of :script_compiled
-# trace point. Only load DI on supported Ruby versions.
-require_relative 'datadog/di' if RUBY_VERSION >= '2.6'
+require_relative 'datadog/di'
+require_relative 'datadog/error_tracking'
 require_relative 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.12.1
+  version: 2.17.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -31,6 +31,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,34 +41,37 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.1
+        version: 1.22.0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.1
+        version: 1.22.0.0.2
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 16.0.1.1.0
+        version: 18.1.0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 16.0.1.1.0
+        version: 18.1.0.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +126,8 @@ files:
 - ext/datadog_profiling_native_extension/collectors_thread_context.h
 - ext/datadog_profiling_native_extension/datadog_ruby_common.c
 - ext/datadog_profiling_native_extension/datadog_ruby_common.h
+- ext/datadog_profiling_native_extension/encoded_profile.c
+- ext/datadog_profiling_native_extension/encoded_profile.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
@@ -144,14 +152,24 @@ files:
 - ext/datadog_profiling_native_extension/unsafe_api_calls_check.c
 - ext/datadog_profiling_native_extension/unsafe_api_calls_check.h
 - ext/libdatadog_api/crashtracker.c
+- ext/libdatadog_api/crashtracker.h
 - ext/libdatadog_api/datadog_ruby_common.c
 - ext/libdatadog_api/datadog_ruby_common.h
 - ext/libdatadog_api/extconf.rb
+- ext/libdatadog_api/init.c
+- ext/libdatadog_api/library_config.c
+- ext/libdatadog_api/library_config.h
 - ext/libdatadog_api/macos_development.md
+- ext/libdatadog_api/process_discovery.c
+- ext/libdatadog_api/process_discovery.h
 - ext/libdatadog_extconf_helpers.rb
 - lib/datadog.rb
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/actions_handler.rb
+- lib/datadog/appsec/actions_handler/serializable_backtrace.rb
+- lib/datadog/appsec/anonymizer.rb
+- lib/datadog/appsec/api_security.rb
+- lib/datadog/appsec/api_security/lru_cache.rb
 - lib/datadog/appsec/assets.rb
 - lib/datadog/appsec/assets/blocked.html
 - lib/datadog/appsec/assets/blocked.json
@@ -163,6 +181,7 @@ files:
 - lib/datadog/appsec/assets/waf_rules/strict.json
 - lib/datadog/appsec/autoload.rb
 - lib/datadog/appsec/component.rb
+- lib/datadog/appsec/compressed_json.rb
 - lib/datadog/appsec/configuration.rb
 - lib/datadog/appsec/configuration/settings.rb
 - lib/datadog/appsec/context.rb
@@ -171,15 +190,14 @@ files:
 - lib/datadog/appsec/contrib/active_record/patcher.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
 - lib/datadog/appsec/contrib/devise/configuration.rb
-- lib/datadog/appsec/contrib/devise/event.rb
+- lib/datadog/appsec/contrib/devise/data_extractor.rb
 - lib/datadog/appsec/contrib/devise/ext.rb
 - lib/datadog/appsec/contrib/devise/integration.rb
 - 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/devise/patches/signin_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/patches/signup_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/patches/skip_signin_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/tracking_middleware.rb
 - lib/datadog/appsec/contrib/excon/integration.rb
 - lib/datadog/appsec/contrib/excon/patcher.rb
 - lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb
@@ -226,6 +244,7 @@ files:
 - lib/datadog/appsec/instrumentation.rb
 - lib/datadog/appsec/instrumentation/gateway.rb
 - lib/datadog/appsec/instrumentation/gateway/argument.rb
+- lib/datadog/appsec/instrumentation/gateway/middleware.rb
 - lib/datadog/appsec/metrics.rb
 - lib/datadog/appsec/metrics/collector.rb
 - lib/datadog/appsec/metrics/exporter.rb
@@ -242,11 +261,11 @@ files:
 - lib/datadog/appsec/security_engine.rb
 - lib/datadog/appsec/security_engine/result.rb
 - lib/datadog/appsec/security_engine/runner.rb
+- lib/datadog/appsec/security_event.rb
 - lib/datadog/appsec/utils.rb
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
 - lib/datadog/appsec/utils/http/media_type.rb
-- lib/datadog/appsec/utils/trace_operation.rb
 - lib/datadog/auto_instrument.rb
 - lib/datadog/auto_instrument_base.rb
 - lib/datadog/core.rb
@@ -256,13 +275,16 @@ files:
 - lib/datadog/core/chunker.rb
 - lib/datadog/core/configuration.rb
 - lib/datadog/core/configuration/agent_settings_resolver.rb
+- lib/datadog/core/configuration/agentless_settings_resolver.rb
 - lib/datadog/core/configuration/base.rb
 - lib/datadog/core/configuration/components.rb
+- lib/datadog/core/configuration/components_state.rb
 - lib/datadog/core/configuration/ext.rb
 - lib/datadog/core/configuration/option.rb
 - lib/datadog/core/configuration/option_definition.rb
 - lib/datadog/core/configuration/options.rb
 - lib/datadog/core/configuration/settings.rb
+- lib/datadog/core/configuration/stable_config.rb
 - lib/datadog/core/contrib/rails/utils.rb
 - lib/datadog/core/crashtracking/component.rb
 - lib/datadog/core/crashtracking/tag_builder.rb
@@ -298,6 +320,7 @@ files:
 - lib/datadog/core/metrics/metric.rb
 - lib/datadog/core/metrics/options.rb
 - lib/datadog/core/pin.rb
+- lib/datadog/core/process_discovery.rb
 - lib/datadog/core/rate_limiter.rb
 - lib/datadog/core/remote.rb
 - lib/datadog/core/remote/client.rb
@@ -328,18 +351,31 @@ files:
 - lib/datadog/core/telemetry/component.rb
 - lib/datadog/core/telemetry/emitter.rb
 - lib/datadog/core/telemetry/event.rb
+- lib/datadog/core/telemetry/event/app_client_configuration_change.rb
+- lib/datadog/core/telemetry/event/app_closing.rb
+- lib/datadog/core/telemetry/event/app_dependencies_loaded.rb
+- lib/datadog/core/telemetry/event/app_heartbeat.rb
+- lib/datadog/core/telemetry/event/app_integrations_change.rb
+- lib/datadog/core/telemetry/event/app_started.rb
+- lib/datadog/core/telemetry/event/base.rb
+- lib/datadog/core/telemetry/event/distributions.rb
+- lib/datadog/core/telemetry/event/generate_metrics.rb
+- lib/datadog/core/telemetry/event/log.rb
+- lib/datadog/core/telemetry/event/message_batch.rb
+- lib/datadog/core/telemetry/event/synth_app_client_configuration_change.rb
 - lib/datadog/core/telemetry/ext.rb
 - lib/datadog/core/telemetry/http/adapters/net.rb
-- lib/datadog/core/telemetry/http/env.rb
-- 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
 - lib/datadog/core/telemetry/metrics_manager.rb
 - lib/datadog/core/telemetry/request.rb
+- lib/datadog/core/telemetry/transport/http.rb
+- lib/datadog/core/telemetry/transport/http/api.rb
+- lib/datadog/core/telemetry/transport/http/client.rb
+- lib/datadog/core/telemetry/transport/http/telemetry.rb
+- lib/datadog/core/telemetry/transport/telemetry.rb
 - lib/datadog/core/telemetry/worker.rb
 - lib/datadog/core/transport/ext.rb
 - lib/datadog/core/transport/http.rb
@@ -370,6 +406,7 @@ files:
 - lib/datadog/core/utils/safe_dup.rb
 - lib/datadog/core/utils/sequence.rb
 - lib/datadog/core/utils/time.rb
+- lib/datadog/core/utils/truncation.rb
 - lib/datadog/core/utils/url.rb
 - lib/datadog/core/vendor/multipart-post/LICENSE
 - lib/datadog/core/vendor/multipart-post/multipart.rb
@@ -387,6 +424,7 @@ files:
 - lib/datadog/core/workers/runtime_metrics.rb
 - lib/datadog/di.rb
 - lib/datadog/di/base.rb
+- lib/datadog/di/boot.rb
 - lib/datadog/di/code_tracker.rb
 - lib/datadog/di/component.rb
 - lib/datadog/di/configuration.rb
@@ -415,11 +453,21 @@ files:
 - lib/datadog/di/transport/http/input.rb
 - lib/datadog/di/transport/input.rb
 - lib/datadog/di/utils.rb
+- lib/datadog/error_tracking.rb
+- lib/datadog/error_tracking/collector.rb
+- lib/datadog/error_tracking/component.rb
+- lib/datadog/error_tracking/configuration.rb
+- lib/datadog/error_tracking/configuration/settings.rb
+- lib/datadog/error_tracking/ext.rb
+- lib/datadog/error_tracking/extensions.rb
+- lib/datadog/error_tracking/filters.rb
 - lib/datadog/kit.rb
 - lib/datadog/kit/appsec/events.rb
 - lib/datadog/kit/enable_core_dumps.rb
 - lib/datadog/kit/identity.rb
 - lib/datadog/opentelemetry.rb
+- lib/datadog/opentelemetry/api/baggage.rb
+- lib/datadog/opentelemetry/api/baggage.rbs
 - lib/datadog/opentelemetry/api/context.rb
 - lib/datadog/opentelemetry/api/trace/span.rb
 - lib/datadog/opentelemetry/sdk/configurator.rb
@@ -437,6 +485,7 @@ files:
 - lib/datadog/profiling/collectors/stack.rb
 - lib/datadog/profiling/collectors/thread_context.rb
 - lib/datadog/profiling/component.rb
+- lib/datadog/profiling/encoded_profile.rb
 - lib/datadog/profiling/exporter.rb
 - lib/datadog/profiling/ext.rb
 - lib/datadog/profiling/ext/dir_monkey_patches.rb
@@ -687,6 +736,13 @@ files:
 - lib/datadog/tracing/contrib/kafka/ext.rb
 - lib/datadog/tracing/contrib/kafka/integration.rb
 - lib/datadog/tracing/contrib/kafka/patcher.rb
+- lib/datadog/tracing/contrib/karafka.rb
+- lib/datadog/tracing/contrib/karafka/configuration/settings.rb
+- lib/datadog/tracing/contrib/karafka/distributed/propagation.rb
+- lib/datadog/tracing/contrib/karafka/ext.rb
+- lib/datadog/tracing/contrib/karafka/integration.rb
+- lib/datadog/tracing/contrib/karafka/monitor.rb
+- lib/datadog/tracing/contrib/karafka/patcher.rb
 - lib/datadog/tracing/contrib/lograge/configuration/settings.rb
 - lib/datadog/tracing/contrib/lograge/ext.rb
 - lib/datadog/tracing/contrib/lograge/instrumentation.rb
@@ -849,6 +905,7 @@ files:
 - lib/datadog/tracing/contrib/sucker_punch/instrumentation.rb
 - lib/datadog/tracing/contrib/sucker_punch/integration.rb
 - lib/datadog/tracing/contrib/sucker_punch/patcher.rb
+- lib/datadog/tracing/contrib/support.rb
 - lib/datadog/tracing/contrib/trilogy/configuration/settings.rb
 - lib/datadog/tracing/contrib/trilogy/ext.rb
 - lib/datadog/tracing/contrib/trilogy/instrumentation.rb
@@ -863,12 +920,14 @@ files:
 - lib/datadog/tracing/diagnostics/health.rb
 - lib/datadog/tracing/distributed/b3_multi.rb
 - lib/datadog/tracing/distributed/b3_single.rb
+- lib/datadog/tracing/distributed/baggage.rb
 - lib/datadog/tracing/distributed/datadog.rb
 - lib/datadog/tracing/distributed/datadog_tags_codec.rb
 - lib/datadog/tracing/distributed/fetcher.rb
 - lib/datadog/tracing/distributed/helpers.rb
 - lib/datadog/tracing/distributed/none.rb
 - lib/datadog/tracing/distributed/propagation.rb
+- lib/datadog/tracing/distributed/propagation_policy.rb
 - lib/datadog/tracing/distributed/trace_context.rb
 - lib/datadog/tracing/event.rb
 - lib/datadog/tracing/flush.rb
@@ -876,6 +935,8 @@ files:
 - lib/datadog/tracing/metadata/analytics.rb
 - lib/datadog/tracing/metadata/errors.rb
 - lib/datadog/tracing/metadata/ext.rb
+- lib/datadog/tracing/metadata/metastruct.rb
+- lib/datadog/tracing/metadata/metastruct_tagging.rb
 - lib/datadog/tracing/metadata/tagging.rb
 - lib/datadog/tracing/pipeline.rb
 - lib/datadog/tracing/pipeline/span_filter.rb
@@ -930,8 +991,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.12.1/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.12.1
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.17.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.17.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/datadog/appsec/contrib/devise/event.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Devise
-        # Class to extract event information from the resource
-        class Event
-          UUID_REGEX = /^\h{8}-\h{4}-\h{4}-\h{4}-\h{12}$/.freeze
-
-          attr_reader :user_id
-
-          def initialize(resource, mode)
-            @resource = resource
-            @mode = mode
-            @user_id = nil
-            @email = nil
-            @username = nil
-
-            extract if @resource
-          end
-
-          def to_h
-            return @event if defined?(@event)
-
-            @event = {}
-            @event[:email] = @email if @email
-            @event[:username] = @username if @username
-            @event
-          end
-
-          private
-
-          def extract
-            @user_id = @resource.id
-
-            case @mode
-            when AppSec::Configuration::Settings::IDENTIFICATION_AUTO_USER_INSTRUMENTATION_MODE
-              @email = @resource.email
-              @username = @resource.username
-            when AppSec::Configuration::Settings::ANONYMIZATION_AUTO_USER_INSTRUMENTATION_MODE
-              @user_id = nil unless @user_id && @user_id.to_s =~ UUID_REGEX
-            else
-              Datadog.logger.warn(
-                "Invalid auto_user_instrumentation.mode: `#{@mode}`. " \
-                "Supported modes are: #{AppSec::Configuration::Settings::AUTO_USER_INSTRUMENTATION_MODES.join(' | ')}."
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../configuration'
-require_relative '../tracking'
-require_relative '../resource'
-require_relative '../event'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Devise
-        module Patcher
-          # Hook in devise validate method
-          module AuthenticatablePatch
-            # rubocop:disable Metrics/MethodLength
-            def validate(resource, &block)
-              result = super
-
-              return result unless AppSec.enabled?
-              return result if @_datadog_appsec_skip_track_login_event
-              return result unless Configuration.auto_user_instrumentation_enabled?
-              return result unless AppSec.active_context
-
-              devise_resource = resource ? Resource.new(resource) : nil
-              event_information = Event.new(devise_resource, Configuration.auto_user_instrumentation_mode)
-
-              if result
-                if event_information.user_id
-                  Datadog.logger.debug { 'AppSec: User successful login event' }
-                else
-                  Datadog.logger.debug do
-                    "AppSec: User successful login event, but can't extract user ID. Tracking empty event"
-                  end
-                end
-
-                Tracking.track_login_success(
-                  AppSec.active_context.trace,
-                  AppSec.active_context.span,
-                  user_id: event_information.user_id,
-                  **event_information.to_h
-                )
-
-                return result
-              end
-
-              user_exists = nil
-
-              if resource
-                user_exists = true
-                Datadog.logger.debug { 'AppSec: User failed login event, but user exists' }
-              else
-                user_exists = false
-                Datadog.logger.debug { 'AppSec: User failed login event and user does not exist' }
-              end
-
-              Tracking.track_login_failure(
-                AppSec.active_context.trace,
-                AppSec.active_context.span,
-                user_id: event_information.user_id,
-                user_exists: user_exists,
-                **event_information.to_h
-              )
-
-              result
-            end
-            # rubocop:enable Metrics/MethodLength
-          end
-        end
-      end
-    end
-  end
-end