datadog 2.8.0 → 2.39.0

data/lib/datadog/error_tracking/ext.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Datadog
+  module ErrorTracking
+    # Error Tracking constants
+    module Ext
+      ENV_HANDLED_ERRORS = "DD_ERROR_TRACKING_HANDLED_ERRORS"
+      ENV_HANDLED_ERRORS_INCLUDE = "DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE"
+      HANDLED_ERRORS_ALL = "all"
+      HANDLED_ERRORS_USER = "user"
+      HANDLED_ERRORS_THIRD_PARTY = "third_party"
+      DEFAULT_HANDLED_ERRORS = nil
+      VALID_HANDLED_ERRORS = [HANDLED_ERRORS_ALL, HANDLED_ERRORS_USER, HANDLED_ERRORS_THIRD_PARTY].freeze
+      SPAN_EVENTS_HAS_EXCEPTION = "_dd.span_events.has_exception"
+      RUBY_VERSION_WITH_RESCUE_EVENT = "3.3"
+    end
+  end
+end

data/lib/datadog/error_tracking/extensions.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative "configuration"
+require_relative "../core/configuration"
+
+module Datadog
+  module ErrorTracking
+    # Extends Datadog tracing with ErrorTracking features
+    module Extensions
+      # Inject Error Tracking into global objects.
+      def self.activate!
+        Core::Configuration::Settings.extend(Configuration::Settings)
+      end
+    end
+  end
+end

data/lib/datadog/error_tracking/filters.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module Datadog
+  module ErrorTracking
+    # Based on configuration, the TracePoint listening to :rescue or :raise
+    # may report more handled errors than we want to report. Therefore we need
+    # a function to filter the events. As the filter function both depends
+    # on configuration and is called numerous time, we generate it during
+    # during the initialization of the feature to have the best performance
+    # possible.
+    #
+    # @api private
+    module Filters
+      module_function
+
+      def get_gem_name(file_path)
+        regex = %r{gems/([^/]+)-\d}
+        regex_match = regex.match(file_path)
+        return unless regex_match
+
+        gem_name = regex_match[1] #: String
+
+        begin
+          Gem::Specification.find_by_name(gem_name)
+        rescue Gem::MissingSpecError
+          nil
+        end
+      end
+
+      def user_code?(file_path)
+        !get_gem_name(file_path)
+      end
+
+      def datadog_code?(file_path)
+        file_path.include?("lib/datadog/")
+      end
+
+      def third_party_code?(file_path)
+        gem_name = get_gem_name(file_path)
+        gem_name && gem_name != "datadog"
+      end
+
+      def file_included?(file_path, instrumented_files)
+        instrumented_files.include?(file_path)
+      end
+
+      # Generate the proc used in the TracePoint
+      def generate_filter(to_instrument_scope, handled_errors_include = nil)
+        case to_instrument_scope
+        # If DD_ERROR_TRACKING_HANDLED_ERRORS is set
+        when "all"
+          proc { |file_path| !datadog_code?(file_path) }
+        when "user"
+          # If DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE is set
+          if handled_errors_include
+            proc { |file_path|
+              user_code?(file_path) || file_included?(file_path, handled_errors_include)
+            }
+          else
+            proc { |file_path| user_code?(file_path) }
+          end
+        when "third_party"
+          if handled_errors_include
+            proc { |file_path|
+              third_party_code?(file_path) || file_included?(file_path, handled_errors_include)
+            }
+          else
+            proc { |file_path| third_party_code?(file_path) }
+          end
+        else
+          # If only DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE is set
+          proc { |file_path| file_included?(file_path, handled_errors_include) }
+        end
+      end
+    end
+  end
+end

data/lib/datadog/error_tracking.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "error_tracking/collector"
+require_relative "error_tracking/component"
+require_relative "error_tracking/configuration"
+require_relative "error_tracking/ext"
+require_relative "error_tracking/extensions"
+require_relative "error_tracking/filters"
+
+module Datadog
+  # Namespace for Datadog ErrorTracking.
+  #
+  # @api private
+  module ErrorTracking
+    # Expose ErrorTracking to global shared objects
+    Extensions.activate!
+  end
+end

data/lib/datadog/kit/appsec/events/v2.rb

@@ -0,0 +1,253 @@
+# frozen_string_literal: true
+
+require_relative "../../identity"
+require_relative "../../../appsec/trace_keeper"
+
+module Datadog
+  module Kit
+    module AppSec
+      module Events
+        # The second version of Business Logic Events SDK
+        module V2
+          SIGNUP_EVENT = "users.signup"
+          LOGIN_SUCCESS_EVENT = "users.login.success"
+          LOGIN_FAILURE_EVENT = "users.login.failure"
+
+          TELEMETRY_METRICS_NAMESPACE = "appsec"
+          TELEMETRY_METRICS_SDK_EVENT = "sdk.event"
+          TELEMETRY_METRICS_SDK_VERSION = "v2"
+          TELEMETRY_METRICS_EVENTS_INTO_TYPES = {
+            LOGIN_SUCCESS_EVENT => "login_success",
+            LOGIN_FAILURE_EVENT => "login_failure",
+            SIGNUP_EVENT => "signup"
+          }.freeze
+
+          class << self
+            # Attach user login success information to the service entry span
+            # and trigger AppSec event processing.
+            #
+            # @param login [String] The user login (e.g., username or email).
+            # @param user_or_id [String, Hash<Symbol, String>] (optional) If a
+            #   String, considered as a user ID, if a Hash, considered as a user
+            #   attributes. The Hash must include `:id` as a key.
+            # @param metadata [Hash<Symbol, String>] Additional flat free-form
+            #   metadata to attach to the event.
+            #
+            # @example Login only
+            #   Datadog::Kit::AppSec::Events::V2.track_user_login_success('alice@example.com')
+            #
+            # @example Login and user attributes
+            #   Datadog::Kit::AppSec::Events::V2.track_user_login_success(
+            #     'alice@example.com',
+            #     { id: 'user-123', email: 'alice@example.com', name: 'Alice' },
+            #     ip: '192.168.1.1', device: 'mobile', 'usr.country': 'US'
+            #   )
+            #
+            # @return [void]
+            def track_user_login_success(login, user_or_id = nil, metadata = {})
+              trace = service_entry_trace
+              span = service_entry_span
+
+              if trace.nil? || span.nil?
+                return Datadog.logger.warn(
+                  "Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events"
+                )
+              end
+
+              raise TypeError, "`login` argument must be a String" unless login.is_a?(String)
+              raise TypeError, "`metadata` argument must be a Hash" unless metadata.is_a?(Hash)
+
+              user_attributes = build_user_attributes(user_or_id, login)
+
+              set_span_tags(span, metadata, namespace: LOGIN_SUCCESS_EVENT)
+              set_span_tags(span, user_attributes, namespace: "#{LOGIN_SUCCESS_EVENT}.usr")
+              span.set_tag("appsec.events.users.login.success.track", "true")
+              span.set_tag("_dd.appsec.events.users.login.success.sdk", "true")
+
+              ::Datadog::AppSec::TraceKeeper.keep!(trace)
+
+              record_event_telemetry_metric(LOGIN_SUCCESS_EVENT)
+              ::Datadog::AppSec::Instrumentation.gateway.push("appsec.events.user_lifecycle", LOGIN_SUCCESS_EVENT)
+
+              return Kit::Identity.set_user(trace, span, **user_attributes) if user_attributes.key?(:id)
+
+              # NOTE: This is a fallback for the case when we don't have an ID,
+              #       but need to trigger WAF.
+              user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(nil, login)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
+            end
+
+            # Attach user login failure information to the service entry span
+            # and trigger AppSec event processing.
+            #
+            # @param login [String] The user login (e.g., username or email).
+            # @param user_exists [Boolean] Whether the user exists in the system.
+            # @param metadata [Hash<Symbol, String>] Additional flat free-form
+            #   metadata to attach to the event.
+            #
+            # @example Login only
+            #   Datadog::Kit::AppSec::Events::V2.track_user_login_failure('alice@example.com')
+            #
+            # @example With user existence and metadata
+            #   Datadog::Kit::AppSec::Events::V2.track_user_login_failure(
+            #     'alice@example.com',
+            #     true,
+            #     ip: '192.168.1.1', device: 'mobile', 'usr.country': 'US'
+            #   )
+            #
+            # @return [void]
+            def track_user_login_failure(login, user_exists = false, metadata = {})
+              trace = service_entry_trace
+              span = service_entry_span
+
+              if trace.nil? || span.nil?
+                return Datadog.logger.warn(
+                  "Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events"
+                )
+              end
+
+              raise TypeError, "`login` argument must be a String" unless login.is_a?(String)
+              raise TypeError, "`metadata` argument must be a Hash" unless metadata.is_a?(Hash)
+
+              unless user_exists.is_a?(TrueClass) || user_exists.is_a?(FalseClass)
+                raise TypeError, "`user_exists` argument must be a boolean"
+              end
+
+              set_span_tags(span, metadata, namespace: LOGIN_FAILURE_EVENT)
+              span.set_tag("appsec.events.users.login.failure.track", "true")
+              span.set_tag("_dd.appsec.events.users.login.failure.sdk", "true")
+              span.set_tag("appsec.events.users.login.failure.usr.login", login)
+              span.set_tag("appsec.events.users.login.failure.usr.exists", user_exists.to_s)
+
+              ::Datadog::AppSec::TraceKeeper.keep!(trace)
+
+              record_event_telemetry_metric(LOGIN_FAILURE_EVENT)
+              ::Datadog::AppSec::Instrumentation.gateway.push("appsec.events.user_lifecycle", LOGIN_FAILURE_EVENT)
+
+              user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(nil, login)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
+            end
+
+            # Attach user signup information to the service entry span
+            # and trigger AppSec event processing.
+            #
+            # @param login [String] The user login (e.g., username or email).
+            # @param user_or_id [String, Hash<Symbol, String>] (optional) If a
+            #   String, considered as a user ID, if a Hash, considered as a user
+            #   attributes. The Hash must include `:id` as a key.
+            # @param metadata [Hash<Symbol, String>] Additional flat free-form
+            #   metadata to attach to the event.
+            #
+            # @example Login only
+            #   Datadog::Kit::AppSec::Events::V2.track_user_signup('alice@example.com')
+            #
+            # @example Login, user attributes, and metadata
+            #   Datadog::Kit::AppSec::Events::V2.track_user_signup(
+            #     'alice@example.com',
+            #     { id: 'user-123', email: 'alice@example.com', name: 'Alice' },
+            #     ip: '192.168.1.1', device: 'mobile', 'usr.country': 'US'
+            #   )
+            #
+            # @return [void]
+            def track_user_signup(login, user_or_id = nil, metadata = {})
+              trace = service_entry_trace
+              span = service_entry_span
+
+              if trace.nil? || span.nil?
+                return Datadog.logger.warn(
+                  "Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events"
+                )
+              end
+
+              raise TypeError, "`login` argument must be a String" unless login.is_a?(String)
+              raise TypeError, "`metadata` argument must be a Hash" unless metadata.is_a?(Hash)
+
+              user_attributes = build_user_attributes(user_or_id, login)
+
+              set_span_tags(span, metadata, namespace: SIGNUP_EVENT)
+              set_span_tags(span, user_attributes, namespace: "#{SIGNUP_EVENT}.usr")
+              span.set_tag("appsec.events.users.signup.track", "true")
+              span.set_tag("_dd.appsec.events.users.signup.sdk", "true")
+
+              ::Datadog::AppSec::TraceKeeper.keep!(trace)
+
+              record_event_telemetry_metric(SIGNUP_EVENT)
+
+              if user_attributes.key?(:id)
+                Kit::Identity.set_user(trace, span, **user_attributes)
+              else
+                # NOTE: {Datadog::Kit::Identity.set_user} requires an ID,
+                #       but WAF can evaluate login alone
+                user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(nil, login)
+                ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
+              end
+            end
+
+            private
+
+            # NOTE: Current tracer implementation does not provide a way to
+            #       get the service entry span. This is a shortcut we take now.
+            def service_entry_trace
+              return Datadog::Tracing.active_trace unless Datadog::AppSec.active_context
+
+              Datadog::AppSec.active_context&.trace
+            end
+
+            # NOTE: Current tracer implementation does not provide a way to
+            #       get the service entry span. This is a shortcut we take now.
+            def service_entry_span
+              return Datadog::Tracing.active_span unless Datadog::AppSec.active_context
+
+              Datadog::AppSec.active_context&.span
+            end
+
+            def build_user_attributes(user_or_id, login)
+              raise TypeError, "`login` argument must be a String" unless login.is_a?(String)
+
+              case user_or_id
+              when nil
+                {login: login}
+              when String
+                {login: login, id: user_or_id}
+              when Hash
+                raise ArgumentError, "missing required user key `:id`" unless user_or_id.key?(:id)
+                raise TypeError, "user key `:id` must be a String" unless user_or_id[:id].is_a?(String)
+
+                user_or_id.merge(login: login)
+              else
+                raise TypeError, "`user_or_id` argument must be either String or Hash"
+              end
+            end
+
+            def set_span_tags(span, tags, namespace:)
+              tags.each do |name, value|
+                next if value.nil?
+
+                span.set_tag("appsec.events.#{namespace}.#{name}", value)
+              end
+            end
+
+            # TODO: In case if we need to introduce telemetry metrics to the SDK v1
+            #       or highly increase the number of metrics, this method should be
+            #       extracted into a proper module.
+            def record_event_telemetry_metric(event)
+              telemetry = ::Datadog.send(:components, allow_initialization: false)&.telemetry
+
+              if telemetry.nil?
+                return Datadog.logger.debug(
+                  "Kit::AppSec: Telemetry component is unavailable. Skip recording SDK metrics"
+                )
+              end
+
+              tags = {
+                event_type: TELEMETRY_METRICS_EVENTS_INTO_TYPES[event],
+                sdk_version: TELEMETRY_METRICS_SDK_VERSION
+              }
+              telemetry.inc(TELEMETRY_METRICS_NAMESPACE, TELEMETRY_METRICS_SDK_EVENT, 1, tags: tags)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/kit/appsec/events.rb

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
 
-require_relative '../identity'
+require_relative "../identity"
+require_relative "../../appsec/trace_keeper"
 
 module Datadog
   module Kit
     module AppSec
       # Tracking events
       module Events
-        LOGIN_SUCCESS_EVENT = 'users.login.success'
-        LOGIN_FAILURE_EVENT = 'users.login.failure'
-        SIGNUP_EVENT = 'users.signup'
+        LOGIN_SUCCESS_EVENT = "users.login.success"
+        LOGIN_FAILURE_EVENT = "users.login.failure"
+        SIGNUP_EVENT = "users.signup"
+        USER_LOGIN_KEYS = ["usr.login", :"usr.login"].freeze
 
         class << self
           # Attach login success event information to the trace
@@ -27,14 +29,18 @@ module Datadog
           # @param others [Hash<String || Symbol, String>] Additional free-form
           #   event information to attach to the trace.
           def track_login_success(trace = nil, span = nil, user:, **others)
-            set_trace_and_span_context('track_login_success', trace, span) do |active_trace, active_span|
+            set_trace_and_span_context("track_login_success", trace, span) do |active_trace, active_span|
               user_options = user.dup
               user_id = user_options.delete(:id)
+              user_login = user_options[:login] || others[:"usr.login"] || others["usr.login"] || user_id
 
-              raise ArgumentError, 'missing required key: :user => { :id }' if user_id.nil?
+              raise ArgumentError, "missing required key: :user => { :id }" if user_id.nil?
 
+              others = others.reject { |key, _| USER_LOGIN_KEYS.include?(key) }
+              others[:"usr.login"] = user_login
               track(LOGIN_SUCCESS_EVENT, active_trace, active_span, **others)
 
+              user_options[:login] = user_login
               Kit::Identity.set_user(active_trace, active_span, id: user_id, **user_options)
             end
           end
@@ -54,11 +60,12 @@ module Datadog
           # @param others [Hash<String || Symbol, String>] Additional free-form
           #   event information to attach to the trace.
           def track_login_failure(trace = nil, span = nil, user_exists:, user_id: nil, **others)
-            set_trace_and_span_context('track_login_failure', trace, span) do |active_trace, active_span|
+            set_trace_and_span_context("track_login_failure", trace, span) do |active_trace, active_span|
+              others[:"usr.login"] = user_id if user_id && !others.key?(:"usr.login") && !others.key?("usr.login")
               track(LOGIN_FAILURE_EVENT, active_trace, active_span, **others)
 
-              active_span.set_tag('appsec.events.users.login.failure.usr.id', user_id) if user_id
-              active_span.set_tag('appsec.events.users.login.failure.usr.exists', user_exists)
+              active_span.set_tag("appsec.events.users.login.failure.usr.id", user_id) if user_id
+              active_span.set_tag("appsec.events.users.login.failure.usr.exists", user_exists)
             end
           end
 
@@ -77,14 +84,18 @@ module Datadog
           # @param others [Hash<String || Symbol, String>] Additional free-form
           #   event information to attach to the trace.
           def track_signup(trace = nil, span = nil, user:, **others)
-            set_trace_and_span_context('track_signup', trace, span) do |active_trace, active_span|
+            set_trace_and_span_context("track_signup", trace, span) do |active_trace, active_span|
               user_options = user.dup
               user_id = user_options.delete(:id)
+              user_login = user_options[:login] || others[:"usr.login"] || others["usr.login"] || user_id
 
-              raise ArgumentError, 'missing required key: :user => { :id }' if user_id.nil?
+              raise ArgumentError, "missing required key: :user => { :id }" if user_id.nil?
 
+              others = others.reject { |key, _| USER_LOGIN_KEYS.include?(key) }
+              others[:"usr.login"] = user_login
               track(SIGNUP_EVENT, active_trace, active_span, **others)
 
+              user_options[:login] = user_login
               Kit::Identity.set_user(trace, id: user_id, **user_options)
             end
           end
@@ -107,47 +118,49 @@ module Datadog
             if trace && span
               check_trace_span_integrity(trace, span)
 
-              span.set_tag("appsec.events.#{event}.track", 'true')
-              span.set_tag("_dd.appsec.events.#{event}.sdk", 'true')
+              span.set_tag("appsec.events.#{event}.track", "true")
+              span.set_tag("_dd.appsec.events.#{event}.sdk", "true")
 
               others.each do |k, v|
-                raise ArgumentError, 'key cannot be :track' if k.to_sym == :track
+                raise ArgumentError, "key cannot be :track" if k.to_sym == :track
 
                 span.set_tag("appsec.events.#{event}.#{k}", v) unless v.nil?
               end
 
-              trace.keep!
+              ::Datadog::AppSec::TraceKeeper.keep!(trace)
             else
-              set_trace_and_span_context('track', trace, span) do |active_trace, active_span|
-                active_span.set_tag("appsec.events.#{event}.track", 'true')
-                active_span.set_tag("_dd.appsec.events.#{event}.sdk", 'true')
+              set_trace_and_span_context("track", trace, span) do |active_trace, active_span|
+                active_span.set_tag("appsec.events.#{event}.track", "true")
+                active_span.set_tag("_dd.appsec.events.#{event}.sdk", "true")
 
                 others.each do |k, v|
-                  raise ArgumentError, 'key cannot be :track' if k.to_sym == :track
+                  raise ArgumentError, "key cannot be :track" if k.to_sym == :track
 
                   active_span.set_tag("appsec.events.#{event}.#{k}", v) unless v.nil?
                 end
 
-                active_trace.keep!
+                ::Datadog::AppSec::TraceKeeper.keep!(active_trace)
               end
             end
+
+            ::Datadog::AppSec::Instrumentation.gateway.push("appsec.events.user_lifecycle", event)
           end
 
           private
 
           def set_trace_and_span_context(method, trace = nil, span = nil)
-            if (appsec_scope = Datadog::AppSec.active_scope)
-              trace = appsec_scope.trace
-              span = appsec_scope.service_entry_span
+            if (appsec_context = Datadog::AppSec.active_context)
+              trace = appsec_context.trace
+              span = appsec_context.span
             end
 
             trace ||= Datadog::Tracing.active_trace
-            span ||=  trace && trace.active_span || Datadog::Tracing.active_span
+            span ||= trace&.active_span || Datadog::Tracing.active_span
 
             unless trace && span
               Datadog.logger.debug(
-                "Tracing not enabled. Method ##{method} is a no-op. Please enable tracing if you want ##{method}"\
-                ' to track this events'
+                "Tracing not enabled. Method ##{method} is a no-op. Please enable tracing if you want ##{method}" \
+                " to track this events"
               )
               return
             end

data/lib/datadog/kit/enable_core_dumps.rb

@@ -11,9 +11,9 @@ module Datadog
         current_size, maximum_size = Process.getrlimit(:CORE)
         core_pattern =
           begin
-            File.read('/proc/sys/kernel/core_pattern').strip
+            File.read("/proc/sys/kernel/core_pattern").strip
           rescue
-            '(Could not open /proc/sys/kernel/core_pattern)'
+            "(Could not open /proc/sys/kernel/core_pattern)"
           end
 
         enabled_status = "Maximum size: #{maximum_size} Output pattern: '#{core_pattern}'"
@@ -30,7 +30,7 @@ module Datadog
           Process.setrlimit(:CORE, maximum_size)
         rescue => e
           Kernel.warn(
-            "[datadog] Failed to enable core dumps. Cause: #{e.class.name} #{e.message} " \
+            "[datadog] Failed to enable core dumps. Cause: #{e.class}: #{e.message} " \
             "Location: #{Array(e.backtrace).first}"
           )
           return

data/lib/datadog/kit/identity.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../appsec/instrumentation/gateway/argument'
+require_relative "../appsec/instrumentation/gateway/argument"
 
 module Datadog
   module Kit
@@ -33,63 +33,70 @@ module Datadog
         # @param others [Hash<Symbol, String>] Additional free-form
         #   user information to attach to the trace.
         #
+        # rubocop:disable Metrics/AbcSize
         # rubocop:disable Metrics/CyclomaticComplexity
         # rubocop:disable Metrics/PerceivedComplexity
         def set_user(
           trace = nil, span = nil, id:, email: nil, name: nil, session_id: nil, role: nil, scope: nil, **others
         )
-          raise ArgumentError, 'missing required key: :id' if id.nil?
+          raise ArgumentError, "missing required key: :id" if id.nil?
 
           # enforce types
 
-          raise TypeError, ':id must be a String'         unless id.is_a?(String)
-          raise TypeError, ':email must be a String'      unless email.nil? || email.is_a?(String)
-          raise TypeError, ':name must be a String'       unless name.nil? || name.is_a?(String)
-          raise TypeError, ':session_id must be a String' unless session_id.nil? || session_id.is_a?(String)
-          raise TypeError, ':role must be a String'       unless role.nil? || role.is_a?(String)
-          raise TypeError, ':scope must be a String'      unless scope.nil? || scope.is_a?(String)
+          raise TypeError, ":id must be a String" unless id.is_a?(String)
+          raise TypeError, ":email must be a String" unless email.nil? || email.is_a?(String)
+          raise TypeError, ":name must be a String" unless name.nil? || name.is_a?(String)
+          raise TypeError, ":session_id must be a String" unless session_id.nil? || session_id.is_a?(String)
+          raise TypeError, ":role must be a String" unless role.nil? || role.is_a?(String)
+          raise TypeError, ":scope must be a String" unless scope.nil? || scope.is_a?(String)
 
           others.each do |k, v|
             raise TypeError, "#{k.inspect} must be a String" unless v.nil? || v.is_a?(String)
           end
 
-          set_trace_and_span_context('set_user', trace, span) do |_active_trace, active_span|
+          set_trace_and_span_context("set_user", trace, span) do |_active_trace, active_span|
             # set tags once data is known consistent
-            active_span.set_tag('usr.id', id)
-            active_span.set_tag('usr.email', email)           unless email.nil?
-            active_span.set_tag('usr.name', name)             unless name.nil?
-            active_span.set_tag('usr.session_id', session_id) unless session_id.nil?
-            active_span.set_tag('usr.role', role)             unless role.nil?
-            active_span.set_tag('usr.scope', scope)           unless scope.nil?
+            active_span.set_tag("usr.id", id)
+            active_span.set_tag("usr.email", email) unless email.nil?
+            active_span.set_tag("usr.name", name) unless name.nil?
+            active_span.set_tag("usr.session_id", session_id) unless session_id.nil?
+            active_span.set_tag("usr.role", role) unless role.nil?
+            active_span.set_tag("usr.scope", scope) unless scope.nil?
 
             others.each do |k, v|
               active_span.set_tag("usr.#{k}", v) unless v.nil?
             end
 
-            if Datadog::AppSec.active_scope
-              user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(id)
-              ::Datadog::AppSec::Instrumentation.gateway.push('identity.set_user', user)
+            if Datadog::AppSec.active_context
+              active_span.set_tag("_dd.appsec.user.collection_mode", "sdk")
+
+              user = ::Datadog::AppSec::Instrumentation::Gateway::User.new(id, others[:login], session_id)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
             end
           end
         end
+        # rubocop:enable Metrics/AbcSize
         # rubocop:enable Metrics/PerceivedComplexity
         # rubocop:enable Metrics/CyclomaticComplexity
 
         private
 
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/PerceivedComplexity
         def set_trace_and_span_context(method, trace = nil, span = nil)
-          if (appsec_scope = Datadog::AppSec.active_scope)
-            trace = appsec_scope.trace
-            span = appsec_scope.service_entry_span
+          if (appsec_context = Datadog::AppSec.active_context)
+            trace = appsec_context.trace
+            span = appsec_context.span
           end
 
           trace ||= Datadog::Tracing.active_trace
-          span ||= trace && trace.active_span || Datadog::Tracing.active_span
+          span ||= trace&.active_span || Datadog::Tracing.active_span
 
           unless trace && span
             Datadog.logger.debug(
-              "Tracing not enabled. Method ##{method} is a no-op. Please enable tracing if you want ##{method}"\
-              ' to track this events'
+              "Tracing not enabled. Method ##{method} is a no-op. Please enable tracing if you want ##{method}" \
+              " to track this events"
             )
             return
           end
@@ -98,6 +105,9 @@ module Datadog
 
           yield(trace, span)
         end
+        # rubocop:enable Metrics/AbcSize
+        # rubocop:enable Metrics/PerceivedComplexity
+        # rubocop:enable Metrics/CyclomaticComplexity
       end
     end
   end