opentelemetry-instrumentation-active_support 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f176c672e74012c083445db8a79aeeb861aee8512a7971fc1b32f5a9822db4
-  data.tar.gz: 92e4d9bc6f2d03cefe32742475d9d0f995992973e39d17e7f927dbd309494505
+  metadata.gz: 1852a8b123120f16f182d8c90a618c1fa26199e55bd7cbec455131f43f69b4f6
+  data.tar.gz: 2f6e719ac8a31dc081020cec7dadfc4dc79077bd567d0dc7e67eb4d8ffda0c3c
 SHA512:
-  metadata.gz: 0aaaea12edef1c279f3a8a79c0d97cdccc3fc5b1eaf77b332db70f404608ff0b05792a6a28986af138361707b69965b61c4308bd1426c3de1b94daa97f8f1a6c
-  data.tar.gz: adfd543c90c9436a0da5cd77880295dd3aa700ef1c1d2c9ebc71aca2c929647b8309547a648915a3ebc92dcc25640bf2457c9360104ae81db4375ca9926163d7
+  metadata.gz: 5bbe103450f24ceb73320c6703a4c560c0140919f0dc4a970b405c758b97fdc7638f84f7a05d348d80423717f6a0864f351a3efd5da4ca7875b0ae775440cbab
+  data.tar.gz: e26a15ede4719613f77efc98c00d4fc1e1dc38948e2dd77262dbbcfa5faea59e5d5cf870f13c5446d93250eaecbbb9a802f00e8ba462cd88c694cb7310964df0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release History: opentelemetry-instrumentation-active_support
 
+### v0.2.2 / 2023-01-14
+
+* FIXED: Drop Rails dependency for ActiveSupport Instrumentation 
+
 ### v0.2.1 / 2023-01-14
 
 * DOCS: Fix gem homepage 

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

@@ -8,13 +8,16 @@ module OpenTelemetry
   module Instrumentation
     # rubocop:disable Style/Documentation
     module ActiveSupport
+      NOTIFIER_MAJOR_VERSION_6 = 6
+
       # 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::ActiveSupport::SpanSubscriber
       # gets invoked first
-      #
+      # Rails 6+ https://github.com/rails/rails/blob/0f0ec9908e25af36df2d937dc431f626a4102b3d/activesupport/lib/active_support/notifications/fanout.rb#L51
+      # Rails 5 https://github.com/rails/rails/blob/8030cff808657faa44828de001cd3b80364597de/activesupport/lib/active_support/notifications/fanout.rb#L16
       def self.subscribe(
         tracer,
         pattern,
@@ -29,18 +32,36 @@ module OpenTelemetry
         )
 
         subscriber_object = ::ActiveSupport::Notifications.subscribe(pattern, subscriber)
+
         ::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)
+          subscribers = find_subscribers(pattern)
+
+          if subscribers.nil?
+            OpenTelemetry.handle_error(
+              message: 'Unable to move OTEL ActiveSupport Notifications subscriber to the front of the notifications list which may cause incomplete traces.' \
+                       'Please report an issue here: ' \
+                       'https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues/new?labels=bug&template=bug_report.md&title=ActiveSupport%20Notifications%20subscribers%20list%20is%20nil'
+            )
           else
-            s = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).pop
-            ::ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers).unshift(s)
+            subscribers.unshift(
+              subscribers.delete(subscriber_object)
+            )
           end
         end
         subscriber_object
       end
 
+      def self.find_subscribers(pattern)
+        active_support_major_version = ::ActiveSupport.version.canonical_segments.first
+
+        # TODO: Drop support for Rails 5 since it is EOL since 2022-06-01
+        if active_support_major_version >= NOTIFIER_MAJOR_VERSION_6
+          ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern]
+        else
+          ::ActiveSupport::Notifications.notifier.instance_variable_get(:@subscribers)
+        end
+      end
+
       class SpanSubscriber
         ALWAYS_VALID_PAYLOAD_TYPES = [TrueClass, FalseClass, String, Numeric, Symbol].freeze
 

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

@@ -7,7 +7,7 @@
 module OpenTelemetry
   module Instrumentation
     module ActiveSupport
-      VERSION = '0.2.1'
+      VERSION = '0.2.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-active_support
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - OpenTelemetry Authors
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -255,10 +269,10 @@ homepage: https://github.com/open-telemetry/opentelemetry-ruby-contrib
 licenses:
 - Apache-2.0
 metadata:
-  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-active_support/0.2.1/file/CHANGELOG.md
+  changelog_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-active_support/0.2.2/file/CHANGELOG.md
   source_code_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/tree/main/instrumentation/active_support
   bug_tracker_uri: https://github.com/open-telemetry/opentelemetry-ruby-contrib/issues
-  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-active_support/0.2.1
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-active_support/0.2.2
 post_install_message: 
 rdoc_options: []
 require_paths: