datadog 2.38.0 → 2.40.0

data/lib/datadog/error_tracking/component.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'set'
-require_relative 'collector'
-require_relative 'filters'
+require "set"
+require_relative "collector"
+require_relative "filters"
 
 module Datadog
   module ErrorTracking
@@ -30,10 +30,10 @@ module Datadog
         end
 
         def environment_supported?(logger)
-          if RUBY_ENGINE != 'ruby'
+          if RUBY_ENGINE != "ruby"
             logger.warn("error tracking: cannot enable error tracking: MRI is required, but running on #{RUBY_ENGINE}")
             false
-          elsif RubyVersion.is?('< 2.7')
+          elsif RubyVersion.is?("< 2.7")
             logger.warn(
               "error tracking: cannot enable error tracking: Ruby 2.7+ is required, but running
               on #{RUBY_VERSION}"
@@ -63,7 +63,7 @@ module Datadog
         # Before Ruby3.3 the TracePoint listen for :raise events.
         # If an error is not handled, we will delete the according
         # span event in the collector.
-        event = RubyVersion.is?('>= 3.3') ? :rescue : :raise
+        event = RubyVersion.is?(">= 3.3") ? :rescue : :raise
 
         # This TracePoint is in charge of capturing the handled exceptions
         # and of adding the corresponding span events to the collector
@@ -113,9 +113,9 @@ module Datadog
             # - otherwise we just check if the name provided is in the path and is
             #   either the name of a folder or of a ruby file.
             regex =
-              if file_to_instr.start_with?('/')
+              if file_to_instr.start_with?("/")
                 %r{\A#{Regexp.escape(file_to_instr)}(?:/|\.rb\z|\z)}
-              elsif file_to_instr.start_with?('./')
+              elsif file_to_instr.start_with?("./")
                 abs_path = File.expand_path(file_to_instr)
                 %r{\A#{Regexp.escape(abs_path)}(?:/|\.rb\z|\z)}
               else
@@ -152,11 +152,11 @@ module Datadog
       def generate_span_event(exception)
         formatted_exception = Datadog::Core::Error.build_from(exception)
         attributes = {
-          'exception.type' => formatted_exception.type,
-          'exception.message' => formatted_exception.message,
-          'exception.stacktrace' => formatted_exception.backtrace
+          "exception.type" => formatted_exception.type,
+          "exception.message" => formatted_exception.message,
+          "exception.stacktrace" => formatted_exception.backtrace
         }
-        Datadog::Tracing::SpanEvent.new('exception', attributes: attributes)
+        Datadog::Tracing::SpanEvent.new("exception", attributes: attributes)
       end
 
       def add_instrumented_file(file_path)

data/lib/datadog/error_tracking/configuration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module ErrorTracking
@@ -35,7 +35,7 @@ module Datadog
                     Datadog.logger.warn(
                       "Invalid handled errors scope: #{value}. " \
                       "Supported values are: #{Ext::VALID_HANDLED_ERRORS.join(" | ")}. " \
-                      'Deactivating the feature.'
+                      "Deactivating the feature."
                     )
                   end
 

data/lib/datadog/error_tracking/ext.rb

@@ -4,15 +4,15 @@ 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'
+      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'
+      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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'configuration'
-require_relative '../core/configuration'
+require_relative "configuration"
+require_relative "../core/configuration"
 
 module Datadog
   module ErrorTracking

data/lib/datadog/error_tracking/filters.rb

@@ -32,7 +32,7 @@ module Datadog
       end
 
       def datadog_code?(file_path)
-        file_path.include?('lib/datadog/')
+        file_path.include?("lib/datadog/")
       end
 
       def third_party_code?(file_path)
@@ -48,9 +48,9 @@ module Datadog
       def generate_filter(to_instrument_scope, handled_errors_include = nil)
         case to_instrument_scope
         # If DD_ERROR_TRACKING_HANDLED_ERRORS is set
-        when 'all'
+        when "all"
           proc { |file_path| !datadog_code?(file_path) }
-        when 'user'
+        when "user"
           # If DD_ERROR_TRACKING_HANDLED_ERRORS_INCLUDE is set
           if handled_errors_include
             proc { |file_path|
@@ -59,7 +59,7 @@ module Datadog
           else
             proc { |file_path| user_code?(file_path) }
           end
-        when 'third_party'
+        when "third_party"
           if handled_errors_include
             proc { |file_path|
               third_party_code?(file_path) || file_included?(file_path, handled_errors_include)

data/lib/datadog/error_tracking.rb

@@ -1,11 +1,11 @@
 # 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'
+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.

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../identity'
-require_relative '../../../appsec/trace_keeper'
+require_relative "../../identity"
+require_relative "../../../appsec/trace_keeper"
 
 module Datadog
   module Kit
@@ -9,17 +9,17 @@ module Datadog
       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'
+          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_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'
+            LOGIN_SUCCESS_EVENT => "login_success",
+            LOGIN_FAILURE_EVENT => "login_failure",
+            SIGNUP_EVENT => "signup"
           }.freeze
 
           class << self
@@ -50,31 +50,31 @@ module Datadog
 
               if trace.nil? || span.nil?
                 return Datadog.logger.warn(
-                  'Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events'
+                  "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)
+              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')
+              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)
+              ::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)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
             end
 
             # Attach user login failure information to the service entry span
@@ -102,30 +102,30 @@ module Datadog
 
               if trace.nil? || span.nil?
                 return Datadog.logger.warn(
-                  'Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events'
+                  "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)
+              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'
+                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)
+              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)
+              ::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)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
             end
 
             # Attach user signup information to the service entry span
@@ -155,19 +155,19 @@ module Datadog
 
               if trace.nil? || span.nil?
                 return Datadog.logger.warn(
-                  'Kit::AppSec: Tracing is not enabled. Please enable tracing if you want to track events'
+                  "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)
+              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')
+              span.set_tag("appsec.events.users.signup.track", "true")
+              span.set_tag("_dd.appsec.events.users.signup.sdk", "true")
 
               ::Datadog::AppSec::TraceKeeper.keep!(trace)
 
@@ -179,7 +179,7 @@ module Datadog
                 # 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)
+                ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
               end
             end
 
@@ -202,7 +202,7 @@ module Datadog
             end
 
             def build_user_attributes(user_or_id, login)
-              raise TypeError, '`login` argument must be a String' unless login.is_a?(String)
+              raise TypeError, "`login` argument must be a String" unless login.is_a?(String)
 
               case user_or_id
               when nil
@@ -210,12 +210,12 @@ module Datadog
               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)
+                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'
+                raise TypeError, "`user_or_id` argument must be either String or Hash"
               end
             end
 
@@ -235,7 +235,7 @@ module Datadog
 
               if telemetry.nil?
                 return Datadog.logger.debug(
-                  'Kit::AppSec: Telemetry component is unavailable. Skip recording SDK metrics'
+                  "Kit::AppSec: Telemetry component is unavailable. Skip recording SDK metrics"
                 )
               end
 

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

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require_relative '../identity'
-require_relative '../../appsec/trace_keeper'
+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'
-        USER_LOGIN_KEYS = ['usr.login', :"usr.login"].freeze
+        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
@@ -29,12 +29,12 @@ 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
+              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
@@ -60,12 +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|
-              others[:"usr.login"] = user_id if user_id && !others.key?(:"usr.login") && !others.key?('usr.login')
+            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
 
@@ -84,12 +84,12 @@ 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
+              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
@@ -118,23 +118,23 @@ 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
 
               ::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
@@ -143,7 +143,7 @@ module Datadog
               end
             end
 
-            ::Datadog::AppSec::Instrumentation.gateway.push('appsec.events.user_lifecycle', event)
+            ::Datadog::AppSec::Instrumentation.gateway.push("appsec.events.user_lifecycle", event)
           end
 
           private
@@ -160,7 +160,7 @@ module Datadog
             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'
+                " 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}'"

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
@@ -39,39 +39,39 @@ module Datadog
         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_context
-              active_span.set_tag('_dd.appsec.user.collection_mode', 'sdk')
+              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)
+              ::Datadog::AppSec::Instrumentation.gateway.push("identity.set_user", user)
             end
           end
         end
@@ -96,7 +96,7 @@ module Datadog
           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'
+              " to track this events"
             )
             return
           end

data/lib/datadog/kit/tracing/method_tracer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Needed since this file can be loaded without core
-require_relative '../../ruby_version'
+require_relative "../../ruby_version"
 
 module Datadog
   module Kit
@@ -56,8 +56,8 @@ module Datadog
           # @param dynamic [Boolean] if true, skip method existence check (for method_missing-handled methods)
           # @return [void]
           def trace_method(mod, method_name, span_name: nil, dynamic: false)
-            raise ArgumentError, 'mod is not a module' unless mod.is_a?(Module)
-            raise ArgumentError, 'ambiguous span name: provide one or define mod.name' if mod.name.nil? && span_name.nil?
+            raise ArgumentError, "mod is not a module" unless mod.is_a?(Module)
+            raise ArgumentError, "ambiguous span name: provide one or define mod.name" if mod.name.nil? && span_name.nil?
 
             is_private = mod.private_method_defined?(method_name)
             is_protected = mod.protected_method_defined?(method_name)
@@ -72,19 +72,19 @@ module Datadog
             span_name ||= hook_point
 
             unless span_name.is_a?(String)
-              raise ArgumentError, 'span name is not a String'
+              raise ArgumentError, "span name is not a String"
             end
 
-            args = RubyVersion.is?('>= 2.7') ? '...' : '*args, &block'
+            args = RubyVersion.is?(">= 2.7") ? "..." : "*args, &block"
 
             hook_module = Module.new do
               define_singleton_method(:inspect) do
-                suffix = custom_span_name ? ", #{custom_span_name.inspect}" : ''
+                suffix = custom_span_name ? ", #{custom_span_name.inspect}" : ""
                 name || "#<Datadog::Tracing::Kit::MethodTracer(#{method_name.inspect}#{suffix})>"
               end
 
               define_singleton_method(:to_s) do
-                suffix = custom_span_name ? ", #{custom_span_name.inspect}" : ''
+                suffix = custom_span_name ? ", #{custom_span_name.inspect}" : ""
                 name || "#<Datadog::Tracing::Kit::MethodTracer(#{method_name.inspect}#{suffix})>"
               end
 

data/lib/datadog/kit.rb

@@ -8,4 +8,4 @@ module Datadog
   end
 end
 
-require_relative 'kit/identity'
+require_relative "kit/identity"