opentelemetry-instrumentation-active_support 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15f176c672e74012c083445db8a79aeeb861aee8512a7971fc1b32f5a9822db4
-  data.tar.gz: 92e4d9bc6f2d03cefe32742475d9d0f995992973e39d17e7f927dbd309494505
+  metadata.gz: cfcf89481aac5a7aa04656664ec69783bc4c95fa728cff0731565bcb2b187bff
+  data.tar.gz: 1abba1ddb9eeed1da5bde82b8e67ca61aaa6f3dff1af8c7a2f562f489bb74ab5
 SHA512:
-  metadata.gz: 0aaaea12edef1c279f3a8a79c0d97cdccc3fc5b1eaf77b332db70f404608ff0b05792a6a28986af138361707b69965b61c4308bd1426c3de1b94daa97f8f1a6c
-  data.tar.gz: adfd543c90c9436a0da5cd77880295dd3aa700ef1c1d2c9ebc71aca2c929647b8309547a648915a3ebc92dcc25640bf2457c9360104ae81db4375ca9926163d7
+  metadata.gz: d6e7a1346d085079fb90d9c953591850e4de21dc77936da728ccd601ce9637ebc77d72062d4cab6f8d44a030324f5ca49741939fea1f5c96ba85bc4d08302933
+  data.tar.gz: fd25af3cff46d84834924865544b5d6cced2000cc49aa0c1cfa6bb32d781d78a1b636cb1015adf7720495e9f96af65332ed05b4ed2733073d4a433e564b3ed43

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Release History: opentelemetry-instrumentation-active_support
 
+### v0.3.0 / 2023-02-01
+
+* BREAKING CHANGE: Drop Rails 5 Support 
+
+* ADDED: Drop Rails 5 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

@@ -14,7 +14,7 @@ module OpenTelemetry
 
       # 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
       def self.subscribe(
         tracer,
         pattern,
@@ -29,13 +29,20 @@ 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 = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_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

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opentelemetry-instrumentation-active_support
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - OpenTelemetry Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-14 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -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.3.0/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.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: