Merge branch 'master' into nony--add-yjit-stats

lib/datadog/appsec/contrib/devise/ext.rb

@@ -6,7 +6,6 @@ module Contrib
       module Devise
         # Devise integration constants
         module Ext
-          APP = 'devise'
         end
       end
     end

lib/datadog/appsec/contrib/rack/ext.rb

@@ -6,7 +6,6 @@ module Contrib
       module Rack
         # Rack integration constants
         module Ext
-          APP = 'rack'
         end
       end
     end

lib/datadog/appsec/contrib/rails/ext.rb

@@ -4,9 +4,8 @@ module Datadog
   module AppSec
     module Contrib
       module Rails
-        # Rack integration constants
+        # Rails integration constants
         module Ext
-          APP = 'rails'
         end
       end
     end

lib/datadog/appsec/contrib/sinatra/ext.rb

@@ -6,7 +6,6 @@ module Contrib
       module Sinatra
         # Sinatra integration constants
         module Ext
-          APP = 'sinatra'
           ROUTE_INTERRUPT = :datadog_appsec_contrib_sinatra_route_interrupt
         end
       end

lib/datadog/profiling.rb

@@ -178,6 +178,10 @@ def self.allocation_count # rubocop:disable Lint/DuplicateMethods, Lint/NestedMe
       end
     end
 
+    # All requires for the profiler should be directly added here; and everything should be loaded eagerly.
+    # (Currently there's a few exceptions for the old profiler, but we should avoid other exceptions.)
+    #
+    # All of the profiler should be loaded and ready to go when this method returns `true`.
     private_class_method def self.load_profiling
       return false unless supported?
 
@@ -197,7 +201,8 @@ def self.allocation_count # rubocop:disable Lint/DuplicateMethods, Lint/NestedMe
       require_relative 'profiling/profiler'
       require_relative 'profiling/native_extension'
       require_relative 'profiling/trace_identifiers/helper'
-      # This file is loaded in Profiling::Component#load_pprof_support; see notes there for why
+      # This file is no longer eagerly loaded as a workaround for an issue. It only gets loaded dynamically if the old
+      # profiler is in use. See Profiling::Component#load_pprof_support for more details.
       # require_relative 'profiling/pprof/pprof_pb'
       require_relative 'profiling/tag_builder'
       require_relative 'profiling/http_transport'