solarwinds_apm 6.1.1 → 6.1.2

data/lib/rails/generators/solarwinds_apm/templates/solarwinds_apm_initializer.rb

@@ -169,9 +169,5 @@ if defined?(SolarWindsAPM::Config)
   # Example:
   #   SELECT `posts`.* FROM `posts` /*traceparent=00-a448f096d441e167d12ebd32a927c1a5-a29655a47e430119-01*/
   #
-  # This option can add a small overhead for prepared statements since the traceparent value is unique per execution.
-  # This feature uses marginalia, see its caveat and possible workaround
-  # https://github.com/basecamp/marginalia/blob/master/README.md#prepared-statements
-  #
   SolarWindsAPM::Config[:tag_sql] = false
 end

data/lib/solarwinds_apm/api/custom_instrumentation.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+# © 2024 SolarWinds Worldwide, LLC. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+
+module SolarWindsAPM
+  module API
+    module Tracer
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        # Helper method to instrument custom method
+        #
+        # `add_tracer` can add a custom span to the specified instance or class method that is already defined.
+        # It requires the custom span name and optionally takes the span kind and additional attributes
+        # in hash format.
+        #
+        # === Argument:
+        #
+        # * +method_name+ - (String) A non-empty string that match the method name that need to be instrumented
+        # * +span_name+ - (String, optional, default = method_name) A non-empty string that define the span name (default to method_name)
+        # * +options+ - (Hash, optional, default = {}) A hash with desired options include attributes and span kind e.g. {attributes: {}, kind: :consumer}
+        #
+        # === Example:
+        #
+        #   class DogfoodsController < ApplicationController
+        #     include SolarWindsAPM::API::Tracer
+        #
+        #     def create
+        #       @dogfood = Dogfood.new(params.permit(:brand, :name))
+        #       @dogfood.save
+        #       custom_method
+        #     end
+        #
+        #     def custom_method
+        #     end
+        #     add_tracer :custom_method, 'custom_name', { attributes: { 'foo' => 'bar' }, kind: :consumer }
+        #
+        #   end
+        #
+        #   class DogfoodsController < ApplicationController
+        #     def create
+        #       @dogfood = Dogfood.new(params.permit(:brand, :name))
+        #       @dogfood.save
+        #       custom_method
+        #     end
+        #
+        #     def self.custom_method
+        #     end
+        #
+        #     class << self
+        #       include SolarWindsAPM::API::Tracer
+        #       add_tracer :custom_method, 'custom_name', { attributes: { 'foo' => 'bar' }, kind: :consumer }
+        #     end
+        #
+        #   end
+        #
+        # === Returns:
+        # * nil
+        #
+        def add_tracer(method_name, span_name = nil, options = {})
+          span_name = name.nil? ? "#{to_s.split(':').last&.tr('>', '')}/#{__method__}" : "#{name}/#{__method__}" if span_name.nil?
+
+          original_method = instance_method(method_name)
+
+          define_method(method_name) do |*args, &block|
+            SolarWindsAPM::API.in_span(span_name, **options) do |_span|
+              original_method.bind_call(self, *args, &block)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/solarwinds_apm/api.rb

@@ -11,6 +11,7 @@ require_relative 'api/current_trace_info'
 require_relative 'api/tracing'
 require_relative 'api/opentelemetry'
 require_relative 'api/custom_metrics'
+require_relative 'api/custom_instrumentation'
 
 module SolarWindsAPM
   module API
@@ -19,5 +20,6 @@ module SolarWindsAPM
     extend SolarWindsAPM::API::Tracing
     extend SolarWindsAPM::API::OpenTelemetry
     extend SolarWindsAPM::API::CustomMetrics
+    extend SolarWindsAPM::API::Tracer
   end
 end

data/lib/solarwinds_apm/patch/tag_sql/sw_dbo_utils.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module SolarWindsAPM
+  module Patch
+    module TagSql
+      module SWODboUtils
+        def self.annotate_span_and_sql(sql)
+          return sql if sql.to_s.empty?
+
+          current_span = ::OpenTelemetry::Trace.current_span
+
+          annotated_sql = ''
+          if current_span.context.trace_flags.sampled?
+            traceparent = SolarWindsAPM::Utils.traceparent_from_context(current_span.context)
+            annotated_traceparent = "/*traceparent='#{traceparent}'*/"
+            current_span.add_attributes({ 'sw.query_tag' => annotated_traceparent })
+            annotated_sql = "#{sql} #{annotated_traceparent}"
+          else
+            annotated_sql = sql
+          end
+
+          SolarWindsAPM.logger.debug { "[#{self.class}/#{__method__}] annotated_sql: #{annotated_sql}" }
+          annotated_sql
+        rescue StandardError => e
+          SolarWindsAPM.logger.error { "[#{self.class}/#{__method__}] Failed to annotated sql. Error: #{e.message}" }
+          sql
+        end
+      end
+    end
+  end
+end

data/lib/solarwinds_apm/patch/tag_sql/sw_mysql2_patch.rb

@@ -11,18 +11,7 @@ module SolarWindsAPM
     module TagSql
       module SWOMysql2Patch
         def query(sql, options = {})
-          current_span = ::OpenTelemetry::Trace.current_span
-
-          annotated_sql = ''
-          if current_span.context.trace_flags.sampled?
-            traceparent = SolarWindsAPM::Utils.traceparent_from_context(current_span.context)
-            annotated_traceparent = "/*traceparent='#{traceparent}'*/"
-            current_span.add_attributes({ 'sw.query_tag' => annotated_traceparent })
-            annotated_sql = "#{sql} #{annotated_traceparent}"
-          else
-            annotated_sql = sql
-          end
-
+          annotated_sql = ::SolarWindsAPM::Patch::TagSql::SWODboUtils.annotate_span_and_sql(sql)
           super(annotated_sql, options)
         end
       end

data/lib/solarwinds_apm/patch/tag_sql/sw_pg_patch.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module SolarWindsAPM
+  module Patch
+    module TagSql
+      module SWOPgPatch
+        # We target operations covered by the upstream pg instrumentation.
+        # These are all alike in that they will have a SQL
+        # statement as the first parameter, and they are all
+        # non-prepared statement execute.
+        EXEC_ISH_METHODS = %i[
+          exec
+          query
+          sync_exec
+          async_exec
+          exec_params
+          async_exec_params
+          sync_exec_params
+        ].freeze
+
+        EXEC_ISH_METHODS.each do |method|
+          define_method method do |*args|
+            annotated_sql = ::SolarWindsAPM::Patch::TagSql::SWODboUtils.annotate_span_and_sql(args[0])
+            args[0] = annotated_sql
+            super(*args)
+          end
+        end
+      end
+    end
+  end
+end
+
+# need to prepend before pg instrumentation patch itself
+# upstream instrumentation -> our patch -> original function
+PG::Connection.prepend(SolarWindsAPM::Patch::TagSql::SWOPgPatch) if defined?(PG::Connection)

data/lib/solarwinds_apm/patch/tag_sql_patch.rb

@@ -6,4 +6,6 @@
 #
 # Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
 
+require_relative 'tag_sql/sw_dbo_utils'
 require_relative 'tag_sql/sw_mysql2_patch'
+require_relative 'tag_sql/sw_pg_patch'

data/lib/solarwinds_apm/version.rb

@@ -13,7 +13,7 @@ module SolarWindsAPM
   module Version
     MAJOR  = 6 # breaking,
     MINOR  = 1 # feature,
-    PATCH  = 1 # fix => BFF
+    PATCH  = 2 # fix => BFF
     PRE    = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: solarwinds_apm
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 6.1.2
 platform: ruby
 authors:
 - Maia Engeli
 - Peter Giacomo Lombardo
 - Spiros Eliopoulos
 - Xuan Cao
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-09 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-all
@@ -74,6 +74,7 @@ files:
 - lib/solarwinds_apm.rb
 - lib/solarwinds_apm/api.rb
 - lib/solarwinds_apm/api/current_trace_info.rb
+- lib/solarwinds_apm/api/custom_instrumentation.rb
 - lib/solarwinds_apm/api/custom_metrics.rb
 - lib/solarwinds_apm/api/opentelemetry.rb
 - lib/solarwinds_apm/api/tracing.rb
@@ -100,7 +101,9 @@ files:
 - lib/solarwinds_apm/otel_lambda_config.rb
 - lib/solarwinds_apm/patch.rb
 - lib/solarwinds_apm/patch/dummy_patch.rb
+- lib/solarwinds_apm/patch/tag_sql/sw_dbo_utils.rb
 - lib/solarwinds_apm/patch/tag_sql/sw_mysql2_patch.rb
+- lib/solarwinds_apm/patch/tag_sql/sw_pg_patch.rb
 - lib/solarwinds_apm/patch/tag_sql_patch.rb
 - lib/solarwinds_apm/support.rb
 - lib/solarwinds_apm/support/logger_formatter.rb
@@ -109,13 +112,6 @@ files:
 - lib/solarwinds_apm/support/oboe_tracing_mode.rb
 - lib/solarwinds_apm/support/service_key_checker.rb
 - lib/solarwinds_apm/support/support_report.rb
-- lib/solarwinds_apm/support/swomarginalia/LICENSE
-- lib/solarwinds_apm/support/swomarginalia/README.md
-- lib/solarwinds_apm/support/swomarginalia/comment.rb
-- lib/solarwinds_apm/support/swomarginalia/formatter.rb
-- lib/solarwinds_apm/support/swomarginalia/load_swomarginalia.rb
-- lib/solarwinds_apm/support/swomarginalia/railtie.rb
-- lib/solarwinds_apm/support/swomarginalia/swomarginalia.rb
 - lib/solarwinds_apm/support/transaction_cache.rb
 - lib/solarwinds_apm/support/transaction_settings.rb
 - lib/solarwinds_apm/support/txn_name_manager.rb
@@ -131,7 +127,7 @@ metadata:
   homepage_uri: https://documentation.solarwinds.com/en/success_center/observability/content/intro/landing-page.html
   source_code_uri: https://github.com/solarwinds/apm-ruby
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: SolarWindsAPM performance instrumentation gem for Ruby
 test_files: []

data/lib/solarwinds_apm/support/swomarginalia/LICENSE

@@ -1,20 +0,0 @@
-# Copyright (c) 2012 37signals, LLC
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/solarwinds_apm/support/swomarginalia/README.md

@@ -1,46 +0,0 @@
-# swomarginalia
-
-This folder contains the code that is copied from original [marginalia](https://github.com/basecamp/marginalia)
-
-## File structure
-
-```console
-|-- swomarginalia
-|   |-- LICENSE
-|   |-- README.md
-|   |-- comment.rb
-|   |-- railtie.rb
-|   |-- load_swomarginalia.rb
-|   `-- swomarginalia.rb
-```
-
-## Modification
-
-### railitie.rb
-
-1. Moved prepend logic into load_swomarginalia.rb in case that non-rails app using activerecord
-
-### swomarginlia.rb
-
-1. Removed the alias_method to achieve function override; instead, we use prepend.
-2. Added step of cleaning-up previous transparent comments
-
-### comment.rb
-
-1. Added the traceparent comment (trace string constructed based on opentelemetry)
-
-### load_swomarginalia.rb
-
-1. (new file) prepend the ActiveRecordInstrumentation to activerecord adapter
-
-## Example
-
-### Sample output of rails application
-
-```console
-Post Load (1.1ms)  SELECT `posts`.* FROM `posts` /*application=SqlcommenterRailsDemo,controller=posts,action=index,traceparent=00-a448f096d441e167d12ebd32a927c1a5-a29655a47e430119-01*/
-```
-
-## License
-
-This project is licensed under the [MIT License](https://github.com/solarwinds/apm-ruby/blob/main/lib/solarwinds_apm/support/swomarginalia/LICENSE).

data/lib/solarwinds_apm/support/swomarginalia/comment.rb

@@ -1,206 +0,0 @@
-# frozen_string_literal: true
-
-require 'socket'
-require 'opentelemetry-api'
-
-module SolarWindsAPM
-  module SWOMarginalia
-    module Comment
-      mattr_accessor :components, :lines_to_ignore, :prepend_comment
-      SWOMarginalia::Comment.components ||= [:traceparent]
-      # To add new components:
-      # Create file and load after loading solarwinds_apm, and add following:
-      # SolarWindsAPM::SWOMarginalia::Comment.component = [:user_defined]
-
-      def self.update!(controller = nil)
-        self.marginalia_controller = controller
-      end
-
-      def self.update_job!(job)
-        self.marginalia_job = job
-      end
-
-      def self.update_adapter!(adapter)
-        self.marginalia_adapter = adapter
-      end
-
-      def self.construct_comment
-        ret = +''
-        components.each do |c|
-          component_value = send(c)
-          ret << "#{c}='#{component_value}'," if component_value.present?
-        end
-        ret.chop!
-        escape_sql_comment(ret)
-      end
-
-      def self.construct_inline_comment
-        return nil if inline_annotations.none?
-
-        escape_sql_comment(inline_annotations.join)
-      end
-
-      def self.escape_sql_comment(str)
-        str = str.gsub('/*', '').gsub('*/', '') while str.include?('/*') || str.include?('*/')
-        str
-      end
-
-      def self.clear!
-        self.marginalia_controller = nil
-      end
-
-      def self.clear_job!
-        self.marginalia_job = nil
-      end
-
-      def self.marginalia_controller=(controller)
-        Thread.current[:marginalia_controller] = controller
-      end
-
-      def self.marginalia_controller
-        Thread.current[:marginalia_controller]
-      end
-
-      def self.marginalia_job=(job)
-        Thread.current[:marginalia_job] = job
-      end
-
-      def self.marginalia_job
-        Thread.current[:marginalia_job]
-      end
-
-      def self.marginalia_adapter=(adapter)
-        Thread.current[:marginalia_adapter] = adapter
-      end
-
-      def self.marginalia_adapter
-        Thread.current[:marginalia_adapter]
-      end
-
-      def self.application
-        SWOMarginalia.application_name ||= if defined?(::Rails.application)
-                                             ::Rails.application.class.name.split('::').first
-                                           else
-                                             'rails'
-                                           end
-
-        SWOMarginalia.application_name
-      end
-
-      def self.job
-        marginalia_job&.class&.name
-      end
-
-      def self.controller
-        marginalia_controller.controller_name if marginalia_controller.respond_to? :controller_name
-      end
-
-      def self.controller_with_namespace
-        marginalia_controller&.class&.name
-      end
-
-      def self.action
-        marginalia_controller.action_name if marginalia_controller.respond_to? :action_name
-      end
-
-      def self.sidekiq_job
-        marginalia_job['class'] if marginalia_job.respond_to?(:[])
-      end
-
-      DEFAULT_LINES_TO_IGNORE_REGEX = %r{\.rvm|/ruby/gems/|vendor/|marginalia|rbenv|monitor\.rb.*mon_synchronize}
-
-      def self.line
-        SWOMarginalia::Comment.lines_to_ignore ||= DEFAULT_LINES_TO_IGNORE_REGEX
-
-        last_line = caller.detect do |line|
-          line !~ SWOMarginalia::Comment.lines_to_ignore
-        end
-        return unless last_line
-
-        root = if defined?(Rails) && Rails.respond_to?(:root)
-                 Rails.root.to_s
-               elsif defined?(RAILS_ROOT)
-                 RAILS_ROOT
-               else
-                 ''
-               end
-        last_line = last_line[root.length..] if last_line.start_with? root
-        last_line
-      end
-
-      def self.hostname
-        @hostname ||= Socket.gethostname
-      end
-
-      def self.pid
-        Process.pid
-      end
-
-      def self.request_id
-        return unless marginalia_controller.respond_to?(:request) && marginalia_controller.request.respond_to?(:uuid)
-
-        marginalia_controller.request.uuid
-      end
-
-      def self.socket
-        return unless connection_config.present?
-
-        connection_config[:socket]
-      end
-
-      def self.db_host
-        return unless connection_config.present?
-
-        connection_config[:host]
-      end
-
-      def self.database
-        return unless connection_config.present?
-
-        connection_config[:database]
-      end
-
-      ##
-      # Insert trace string as traceparent to sql statement
-      # Not insert if:
-      #   there is no valid current trace context
-      #   current trace context is not sampled
-      #
-      def self.traceparent
-        span_context = ::OpenTelemetry::Trace.current_span.context
-        return '' if span_context == ::OpenTelemetry::Trace::SpanContext::INVALID
-
-        trace_flag = span_context.trace_flags.sampled? ? '01' : '00'
-        return '' if trace_flag == '00'
-
-        format(
-          '00-%<trace_id>s-%<span_id>s-%<trace_flags>.2d',
-          trace_id: span_context.hex_trace_id,
-          span_id: span_context.hex_span_id,
-          trace_flags: trace_flag
-        )
-      rescue NameError => e
-        SolarWindsAPM.logger.error { "[#{name}/#{__method__}] Couldn't find OpenTelemetry. Error: #{e.message}" }
-      end
-
-      if Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new('6.1')
-        def self.connection_config
-          return if marginalia_adapter.pool.nil?
-
-          marginalia_adapter.pool.spec.config
-        end
-      else
-        def self.connection_config
-          # `pool` might be a NullPool which has no db_config
-          return unless marginalia_adapter.pool.respond_to?(:db_config)
-
-          marginalia_adapter.pool.db_config.configuration_hash
-        end
-      end
-
-      def self.inline_annotations
-        Thread.current[:marginalia_inline_annotations] ||= []
-      end
-    end
-  end
-end

data/lib/solarwinds_apm/support/swomarginalia/formatter.rb

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module SolarWindsAPM
-  module SWOMarginalia
-    module Formatter
-      def tag_content
-        comment = super
-        comment.tr!(':', '=')
-        comment
-      end
-    end
-  end
-end
-
-# Prepend the Formatter module to the singleton class of ActiveRecord::QueryLogs
-if defined?(ActiveRecord::QueryLogs)
-  class << ActiveRecord::QueryLogs
-    prepend SolarWindsAPM::SWOMarginalia::Formatter
-  end
-end

data/lib/solarwinds_apm/support/swomarginalia/load_swomarginalia.rb

@@ -1,55 +0,0 @@
-# frozen_string_literal: true
-
-# © 2023 SolarWinds Worldwide, LLC. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at:http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
-
-require_relative 'swomarginalia'
-
-module SolarWindsAPM
-  module SWOMarginalia
-    module LoadSWOMarginalia
-      def self.insert
-        insert_into_active_record
-        insert_into_action_controller
-        insert_into_active_job
-      end
-
-      def self.insert_into_active_job
-        return unless defined? ::ActiveJob::Base
-
-        ::ActiveJob::Base.class_eval do
-          around_perform do |job, block|
-            SWOMarginalia::Comment.update_job! job
-            block.call
-          ensure
-            SWOMarginalia::Comment.clear_job!
-          end
-        end
-      end
-
-      def self.insert_into_action_controller
-        return unless defined? ::ActionController::Base
-
-        ::ActionController::Base.include SWOMarginalia::ActionControllerInstrumentation
-
-        return unless defined? ::ActionController::API
-
-        ::ActionController::API.include SWOMarginalia::ActionControllerInstrumentation
-      end
-
-      def self.insert_into_active_record
-        ActiveRecord::ConnectionAdapters::Mysql2Adapter.prepend(SWOMarginalia::ActiveRecordInstrumentation) if defined? ActiveRecord::ConnectionAdapters::Mysql2Adapter
-        ActiveRecord::ConnectionAdapters::MysqlAdapter.prepend(SWOMarginalia::ActiveRecordInstrumentation) if defined? ActiveRecord::ConnectionAdapters::MysqlAdapter
-        ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(SWOMarginalia::ActiveRecordInstrumentation) if defined? ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-        return unless defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
-
-        return unless defined? ActiveRecord::ConnectionAdapters::SQLite3Adapter
-
-        ActiveRecord::ConnectionAdapters::SQLite3Adapter.prepend(SWOMarginalia::ActiveRecordInstrumentation)
-      end
-    end
-  end
-end

data/lib/solarwinds_apm/support/swomarginalia/railtie.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/railtie'
-require_relative 'load_swomarginalia'
-
-module SolarWindsAPM
-  module SWOMarginalia
-    class Railtie < Rails::Railtie
-      initializer 'swomarginalia.insert' do
-        ActiveSupport.on_load :active_record do
-          ::SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert_into_active_record
-        end
-
-        ActiveSupport.on_load :action_controller do
-          ::SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert_into_action_controller
-        end
-
-        ActiveSupport.on_load :active_job do
-          ::SolarWindsAPM::SWOMarginalia::LoadSWOMarginalia.insert_into_active_job
-        end
-      end
-    end
-  end
-end