feat!(action_pack): Use ActiveSupport instead of patches

instrumentation/action_pack/Appraisals

@@ -15,3 +15,7 @@ end
 appraise 'rails-7.0' do
   gem 'rails', '~> 7.0.0'
 end
+
+appraise 'rails-7.1' do
+  gem 'rails', '~> 7.1.0'
+end

instrumentation/action_pack/README.md

@@ -30,6 +30,18 @@ OpenTelemetry::SDK.configure do |c|
 end
 ```
 
+## Active Support Instrumentation
+
+Earlier versions of this instrumentation relied on patching custom `dispatch` hooks from rails [action_controller](https://github.com/rails/rails/blob/main/actionpack/lib/action_controller/metal.rb#L224) in order to extract request information.
+
+This instrumentation now relies on `ActiveSupport::Notifications` and registers a custom Subscriber that listens to relevant events to modify rack span.
+
+See the table below for details of what [Rails Framework Hook Events](https://guides.rubyonrails.org/active_support_instrumentation.html#action-controller) are recorded by this instrumentation:
+
+| Event Name | Subscribe? | Creates Span? |  Notes |
+| - | - | - | - |
+| `process_action.action_controller` | :white_check_mark: | :x: | It modifies the existing Rack span |
+
 ## Examples
 
 Example usage can be seen in the `./example/trace_demonstration.rb` file [here](https://github.com/open-telemetry/opentelemetry-ruby-contrib/blob/main/instrumentation/action_pack/example/trace_demonstration.ru)

instrumentation/action_pack/example/trace_demonstration.ru

@@ -39,6 +39,6 @@ Rails.application.initialize!
 run Rails.application
 
 # To run this example run the `rackup` command with this file
-# Example: rackup trace_request_demonstration.ru
+# Example: rackup trace_demonstration.ru
 # Navigate to http://localhost:9292/
 # Spans for the requests will appear in the console

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require_relative 'handlers/action_controller'
+
+module OpenTelemetry
+  module Instrumentation
+    module ActionPack
+      # Module that contains custom event handlers, which are used to generate spans per event
+      module Handlers
+        module_function
+
+        def subscribe
+          return unless Array(@subscriptions).empty?
+
+          config = ActionPack::Instrumentation.instance.config
+          handlers_by_pattern = {
+            'process_action.action_controller' => Handlers::ActionController.new(config)
+          }
+
+          @subscriptions = handlers_by_pattern.map do |key, handler|
+            ::ActiveSupport::Notifications.subscribe(key, handler)
+          end
+        end
+
+        # Removes Event Handler Subscriptions for ActionController notifications
+        # @note this method is not thread safe and sholud not be used in a multi-threaded context
+        def unsubscribe
+          @subscriptions&.each { |subscriber| ::ActiveSupport::Notifications.unsubscribe(subscriber) }
+          @subscriptions = nil
+        end
+      end
+    end
+  end
+end

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/handlers/action_controller.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+module OpenTelemetry
+  module Instrumentation
+    module ActionPack
+      module Handlers
+        # Action controller handler to handle the notification from ActiveSupport
+        class ActionController
+          # @param config [Hash] of instrumentation options
+          def initialize(config)
+            @config = config
+          end
+
+          # Invoked by ActiveSupport::Notifications at the start of the instrumentation block
+          #
+          # @param _name [String] of the Event (unused)
+          # @param _id [String] of the event (unused)
+          # @param payload [Hash] containing job run information
+          # @return [Hash] the payload passed as a method argument
+          def start(_name, _id, payload)
+            rack_span = OpenTelemetry::Instrumentation::Rack.current_span
+
+            # from rails 6.1, the request will be added to payload
+            request = payload[:request]
+            request = payload[:headers].instance_variable_get(:@req) if ::ActionPack.version < Gem::Version.new('6.1.0')
+
+            rack_span.name = "#{payload[:controller]}##{payload[:action]}" unless request.env['action_dispatch.exception']
+
+            attributes_to_append = {
+              OpenTelemetry::SemanticConventions::Trace::CODE_NAMESPACE => String(payload[:controller]),
+              OpenTelemetry::SemanticConventions::Trace::CODE_FUNCTION => String(payload[:action])
+            }
+
+            attributes_to_append[OpenTelemetry::SemanticConventions::Trace::HTTP_TARGET] = request.filtered_path if request.filtered_path != request.fullpath
+
+            rack_span.add_attributes(attributes_to_append)
+          rescue StandardError => e
+            OpenTelemetry.handle_error(exception: e)
+          end
+
+          # Invoked by ActiveSupport::Notifications at the end of the instrumentation block
+          #
+          # @param _name [String] of the Event (unused)
+          # @param _id [String] of the event (unused)
+          # @param payload [Hash] containing job run information
+          # @return [Hash] the payload passed as a method argument
+          def finish(_name, _id, payload)
+            rack_span = OpenTelemetry::Instrumentation::Rack.current_span
+            rack_span.record_exception(payload[:exception_object]) if payload[:exception_object]
+          rescue StandardError => e
+            OpenTelemetry.handle_error(exception: e)
+          end
+        end
+      end
+    end
+  end
+end

instrumentation/action_pack/lib/opentelemetry/instrumentation/action_pack/instrumentation.rb

@@ -32,11 +32,11 @@ def gem_version
         end
 
         def patch
-          ::ActionController::Metal.prepend(Patches::ActionController::Metal)
+          Handlers.subscribe
         end
 
         def require_dependencies
-          require_relative 'patches/action_controller/metal'
+          require_relative 'handlers'
         end
 
         def require_railtie

instrumentation/action_pack/opentelemetry-instrumentation-action_pack.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency 'opentelemetry-sdk', '~> 1.1'
   spec.add_development_dependency 'opentelemetry-test-helpers', '~> 0.3'
-  spec.add_development_dependency 'rails', '>= 6'
+  spec.add_development_dependency 'rails', '>= 6.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rubocop', '~> 1.56.1'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'

instrumentation/action_pack/test/opentelemetry/instrumentation/action_pack/patches/action_controller/metal_test.rb → instrumentation/action_pack/test/opentelemetry/instrumentation/action_pack/handlers/action_controller_test.rb

@@ -6,19 +6,30 @@
 
 require 'test_helper'
 
-require_relative '../../../../../../lib/opentelemetry/instrumentation/action_pack'
-require_relative '../../../../../../lib/opentelemetry/instrumentation/action_pack/patches/action_controller/metal'
+require_relative '../../../../../lib/opentelemetry/instrumentation/action_pack'
+require_relative '../../../../../lib/opentelemetry/instrumentation/action_pack/handlers'
 
-describe OpenTelemetry::Instrumentation::ActionPack::Patches::ActionController::Metal do
+describe OpenTelemetry::Instrumentation::ActionPack::Handlers::ActionController do
   include Rack::Test::Methods
 
+  let(:instrumentation) { OpenTelemetry::Instrumentation::ActionPack::Instrumentation.instance }
   let(:exporter) { EXPORTER }
   let(:spans) { exporter.finished_spans }
   let(:span) { exporter.finished_spans.last }
   let(:rails_app) { DEFAULT_RAILS_APP }
+  let(:config) { {} }
 
   # Clear captured spans
-  before { exporter.reset }
+  before do
+    OpenTelemetry::Instrumentation::ActionPack::Handlers.unsubscribe
+
+    instrumentation.instance_variable_set(:@config, config)
+    instrumentation.instance_variable_set(:@installed, false)
+
+    instrumentation.install(config)
+
+    exporter.reset
+  end
 
   it 'sets the span name to the format: ControllerName#action' do
     get '/ok'
@@ -75,18 +86,57 @@
     get 'internal_server_error'
 
     _(span.name).must_equal 'ExampleController#internal_server_error'
+    _(span.kind).must_equal :server
+    _(span.status.ok?).must_equal false
+
+    _(span.instrumentation_library.name).must_equal 'OpenTelemetry::Instrumentation::Rack'
+    _(span.instrumentation_library.version).must_equal OpenTelemetry::Instrumentation::Rack::VERSION
+
+    _(span.attributes['http.method']).must_equal 'GET'
+    _(span.attributes['http.host']).must_equal 'example.org'
+    _(span.attributes['http.scheme']).must_equal 'http'
+    _(span.attributes['http.target']).must_equal '/internal_server_error'
+    _(span.attributes['http.status_code']).must_equal 500
+    _(span.attributes['http.user_agent']).must_be_nil
+    _(span.attributes['code.namespace']).must_equal 'ExampleController'
+    _(span.attributes['code.function']).must_equal 'internal_server_error'
   end
 
   it 'does not set the span name when an exception is raised in middleware' do
     get '/ok?raise_in_middleware'
 
     _(span.name).must_equal 'HTTP GET'
+    _(span.kind).must_equal :server
+    _(span.status.ok?).must_equal false
+
+    _(span.instrumentation_library.name).must_equal 'OpenTelemetry::Instrumentation::Rack'
+    _(span.instrumentation_library.version).must_equal OpenTelemetry::Instrumentation::Rack::VERSION
+
+    _(span.attributes['http.method']).must_equal 'GET'
+    _(span.attributes['http.host']).must_equal 'example.org'
+    _(span.attributes['http.scheme']).must_equal 'http'
+    _(span.attributes['http.target']).must_equal '/ok?raise_in_middleware'
+    _(span.attributes['http.status_code']).must_equal 500
+    _(span.attributes['http.user_agent']).must_be_nil
+    _(span.attributes['code.namespace']).must_be_nil
+    _(span.attributes['code.function']).must_be_nil
   end
 
   it 'does not set the span name when the request is redirected in middleware' do
     get '/ok?redirect_in_middleware'
 
     _(span.name).must_equal 'HTTP GET'
+    _(span.kind).must_equal :server
+    _(span.status.ok?).must_equal true
+
+    _(span.attributes['http.method']).must_equal 'GET'
+    _(span.attributes['http.host']).must_equal 'example.org'
+    _(span.attributes['http.scheme']).must_equal 'http'
+    _(span.attributes['http.target']).must_equal '/ok?redirect_in_middleware'
+    _(span.attributes['http.status_code']).must_equal 307
+    _(span.attributes['http.user_agent']).must_be_nil
+    _(span.attributes['code.namespace']).must_be_nil
+    _(span.attributes['code.function']).must_be_nil
   end
 
   describe 'when the application has exceptions_app configured' do
@@ -96,6 +146,20 @@
       get 'internal_server_error'
 
       _(span.name).must_equal 'ExampleController#internal_server_error'
+      _(span.kind).must_equal :server
+      _(span.status.ok?).must_equal false
+
+      _(span.instrumentation_library.name).must_equal 'OpenTelemetry::Instrumentation::Rack'
+      _(span.instrumentation_library.version).must_equal OpenTelemetry::Instrumentation::Rack::VERSION
+
+      _(span.attributes['http.method']).must_equal 'GET'
+      _(span.attributes['http.host']).must_equal 'example.org'
+      _(span.attributes['http.scheme']).must_equal 'http'
+      _(span.attributes['http.target']).must_equal '/internal_server_error'
+      _(span.attributes['http.status_code']).must_equal 500
+      _(span.attributes['http.user_agent']).must_be_nil
+      _(span.attributes['code.namespace']).must_equal 'ExceptionsController'
+      _(span.attributes['code.function']).must_equal 'show'
     end
   end
 

instrumentation/action_pack/test/opentelemetry/instrumentation/action_pack/handlers_test.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Copyright The OpenTelemetry Authors
+#
+# SPDX-License-Identifier: Apache-2.0
+
+require 'test_helper'
+
+require_relative '../../../../lib/opentelemetry/instrumentation/action_pack'
+
+describe 'OpenTelemetry::Instrumentation::ActionPack::Handlers' do
+  let(:instrumentation) { OpenTelemetry::Instrumentation::ActionPack::Instrumentation.instance }
+  let(:config) { {} }
+
+  before do
+    OpenTelemetry::Instrumentation::ActionPack::Handlers.unsubscribe
+    instrumentation.instance_variable_set(:@config, config)
+    instrumentation.instance_variable_set(:@installed, false)
+
+    instrumentation.install(config)
+  end
+
+  it 'success subscribe the notification' do
+    subscriptions = OpenTelemetry::Instrumentation::ActionPack::Handlers.instance_variable_get(:@subscriptions)
+    _(subscriptions.count).must_equal 1
+    _(subscriptions[0].pattern).must_equal 'process_action.action_controller'
+  end
+
+  it 'success unsubscribe the notification' do
+    OpenTelemetry::Instrumentation::ActionPack::Handlers.unsubscribe
+    subscriptions = OpenTelemetry::Instrumentation::ActionPack::Handlers.instance_variable_get(:@subscriptions)
+    _(subscriptions).must_be_nil
+  end
+end