opentelemetry-instrumentation-action_view 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62bb2b892d835cb28873c5dd2e5a682ef3a041853a05a8cad2e697c5d4e55d55
-  data.tar.gz: 3033a19d95b625d9503344aa907d5fdd51ef8275c7f3a9e9978aee3eafd6416f
+  metadata.gz: 52213cc69860a40c5c84fc88b32f585458285d463500c38a608b8684aef576c9
+  data.tar.gz: 12d0053a8a39b0ed6fc83cc5b6b0a5de86b18210ae9ce996a58bd5b416b97698
 SHA512:
-  metadata.gz: 2ebd63ee4576b464dccce7fe51abd02c3b3eb86411a1d4b709e39c2590c0d09999ae8dc5f63c551be1f4a4003ec89dd1972c58eb29138d175312a6839a66fe5e
-  data.tar.gz: 54cd21b7714c1d78790eed3ab1627b6eaf5142f26016b3e3dbd57083adda41466500effbbb5170d5693fa190d89fdc4df9b428ba3a2e507639101126ef5fd6f3
+  metadata.gz: b0dbd124ffe15d87bf11c464bd8b4f5b1641aedfdf6f5581f4ae71f27a3d8f14dd8da43f85ca8a5568904bf36858c35e166e57c02fc5709d6c008cdb37cb773e
+  data.tar.gz: e1c6cd8cf9d832bf1733bd682a65ef0e9a0967a102786334ec9832edef104c297c76eea086a1146a5c9f6d83941cfe2803dee5d29ba47e70f313b289d8ec650f

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Release History: opentelemetry-instrumentation-action_view
 
+### v0.2.0 / 2021-12-01
+
+* ADDED: Move activesupport notification subsciber out of action_view gem 
+* FIXED: Instrumentation of Rails 7 
+
 ### v0.1.3 / 2021-10-06
 
 * FIXED: Do not replace fanout 

data/lib/opentelemetry/instrumentation/action_view/instrumentation.rb

@@ -28,7 +28,6 @@ module OpenTelemetry
         private
 
         def require_dependencies
-          require_relative 'span_subscriber'
           require_relative 'railtie'
         end
       end

data/lib/opentelemetry/instrumentation/action_view/railtie.rb

@@ -16,13 +16,11 @@ module OpenTelemetry
       # This Railtie sets up subscriptions to relevant ActionView notifications
       class Railtie < ::Rails::Railtie
         config.after_initialize do
-          SUBSCRIPTIONS.each do |subscription_name|
-            subscriber = OpenTelemetry::Instrumentation::ActionView::SpanSubscriber.new(
-              name: subscription_name,
-              tracer: ActionView::Instrumentation.instance.tracer
-            )
+          ::OpenTelemetry::Instrumentation::ActiveSupport::Instrumentation.instance.install({})
 
-            ::OpenTelemetry::Instrumentation::ActionView.subscribe(subscription_name, subscriber)
+          SUBSCRIPTIONS.each do |subscription_name|
+            config = ActionView::Instrumentation.instance.config
+            ::OpenTelemetry::Instrumentation::ActiveSupport.subscribe(ActionView::Instrumentation.instance.tracer, subscription_name, config[:notification_payload_transform], config[:disallowed_notification_payload_keys])
           end
         end
       end

data/lib/opentelemetry/instrumentation/action_view/version.rb

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActionView
-      VERSION = '0.1.3'
+      VERSION = '0.2.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-action_view
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-07 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-active_support
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-base
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -208,16 +222,15 @@ files:
 - lib/opentelemetry/instrumentation/action_view.rb
 - lib/opentelemetry/instrumentation/action_view/instrumentation.rb
 - lib/opentelemetry/instrumentation/action_view/railtie.rb
-- lib/opentelemetry/instrumentation/action_view/span_subscriber.rb
 - lib/opentelemetry/instrumentation/action_view/version.rb
 homepage: https://github.com/open-telemetry/opentelemetry-ruby
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-action_view/v0.1.3/file.CHANGELOG.html
+  changelog_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-action_view/v0.2.0/file.CHANGELOG.html
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby/tree/main/instrumentation/action_view
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby/issues
-  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-action_view/v0.1.3
+  documentation_uri: https://open-telemetry.github.io/opentelemetry-ruby/opentelemetry-instrumentation-action_view/v0.2.0
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/opentelemetry/instrumentation/action_view/span_subscriber.rb

@@ -1,111 +0,0 @@
-# frozen_string_literal: true
-
-# Copyright The OpenTelemetry Authors
-#
-# SPDX-License-Identifier: Apache-2.0
-
-module OpenTelemetry
-  module Instrumentation
-    # rubocop:disable Style/Documentation
-    module ActionView
-      # The SpanSubscriber is a special ActiveSupport::Notification subscription
-      # handler which turns notifications into generic spans, taking care to handle
-      # context appropriately.
-
-      # A very hacky way to make sure that OpenTelemetry::Instrumentation::ActionView::SpanSubscriber
-      # gets invoked first
-      def self.subscribe(pattern = nil, callable = nil)
-        ActiveSupport::Notifications.subscribe(pattern, callable)
-        ::ActiveSupport::Notifications.notifier.synchronize do
-          if ::Rails::VERSION::MAJOR == 6
-            s = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern].pop
-            ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern].unshift(s)
-          else
-            s = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).pop
-            ::ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).unshift(s)
-          end
-        end
-      end
-
-      class SpanSubscriber
-        ALWAYS_VALID_PAYLOAD_TYPES = [TrueClass, FalseClass, String, Numeric, Symbol].freeze
-
-        def initialize(name:, tracer:)
-          @span_name = name.split('.')[0..1].reverse.join(' ').freeze
-          @tracer = tracer
-        end
-
-        def start(name, id, payload)
-          span = @tracer.start_span(@span_name, kind: :internal)
-          token = OpenTelemetry::Context.attach(
-            OpenTelemetry::Trace.context_with_span(span)
-          )
-          payload.merge!(
-            __opentelemetry_span: span,
-            __opentelemetry_ctx_token: token
-          )
-
-          [span, token]
-        end
-
-        def finish(name, id, payload) # rubocop:disable Metrics/AbcSize
-          span = payload.delete(:__opentelemetry_span)
-          token = payload.delete(:__opentelemetry_ctx_token)
-          return unless span && token
-
-          payload = transform_payload(payload)
-          attrs = payload.map do |k, v|
-            [k.to_s, sanitized_value(v)] if valid_payload_key?(k) && valid_payload_value?(v)
-          end
-          span.add_attributes(attrs.compact.to_h)
-
-          if (e = payload[:exception_object])
-            span.record_exception(e)
-            span.status = OpenTelemetry::Trace::Status.error("Unhandled exception of type: #{e.class}")
-          end
-
-          span.finish
-          OpenTelemetry::Context.detach(token)
-        end
-
-        private
-
-        def instrumentation_config
-          ActionView::Instrumentation.instance.config
-        end
-
-        def transform_payload(payload)
-          return payload if instrumentation_config[:notification_payload_transform].nil?
-
-          instrumentation_config[:notification_payload_transform].call(payload)
-        end
-
-        def valid_payload_key?(key)
-          %i[exception exception_object].none?(key) && instrumentation_config[:disallowed_notification_payload_keys].none?(key)
-        end
-
-        def valid_payload_value?(value)
-          if value.is_a?(Array)
-            return true if value.empty?
-
-            value.map(&:class).uniq.size == 1 && ALWAYS_VALID_PAYLOAD_TYPES.any? { |t| value.first.is_a?(t) }
-          else
-            ALWAYS_VALID_PAYLOAD_TYPES.any? { |t| value.is_a?(t) }
-          end
-        end
-
-        # We'll accept symbols as values, but stringify them; and we'll stringify symbols within an array.
-        def sanitized_value(value)
-          if value.is_a?(Array)
-            value.map { |v| v.is_a?(Symbol) ? v.to_s : v }
-          elsif value.is_a?(Symbol)
-            value.to_s
-          else
-            value
-          end
-        end
-      end
-    end
-  end
-  # rubocop:enable Style/Documentation
-end