opentelemetry-instrumentation-active_support 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1852a8b123120f16f182d8c90a618c1fa26199e55bd7cbec455131f43f69b4f6
-  data.tar.gz: 2f6e719ac8a31dc081020cec7dadfc4dc79077bd567d0dc7e67eb4d8ffda0c3c
+  metadata.gz: cfcf89481aac5a7aa04656664ec69783bc4c95fa728cff0731565bcb2b187bff
+  data.tar.gz: 1abba1ddb9eeed1da5bde82b8e67ca61aaa6f3dff1af8c7a2f562f489bb74ab5
 SHA512:
-  metadata.gz: 5bbe103450f24ceb73320c6703a4c560c0140919f0dc4a970b405c758b97fdc7638f84f7a05d348d80423717f6a0864f351a3efd5da4ca7875b0ae775440cbab
-  data.tar.gz: e26a15ede4719613f77efc98c00d4fc1e1dc38948e2dd77262dbbcfa5faea59e5d5cf870f13c5446d93250eaecbbb9a802f00e8ba462cd88c694cb7310964df0
+  metadata.gz: d6e7a1346d085079fb90d9c953591850e4de21dc77936da728ccd601ce9637ebc77d72062d4cab6f8d44a030324f5ca49741939fea1f5c96ba85bc4d08302933
+  data.tar.gz: fd25af3cff46d84834924865544b5d6cced2000cc49aa0c1cfa6bb32d781d78a1b636cb1015adf7720495e9f96af65332ed05b4ed2733073d4a433e564b3ed43

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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 

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

@@ -8,8 +8,6 @@ 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.
@@ -17,7 +15,6 @@ 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
-      # Rails 5 https://github.com/rails/rails/blob/8030cff808657faa44828de001cd3b80364597de/activesupport/lib/active_support/notifications/fanout.rb#L16
       def self.subscribe(
         tracer,
         pattern,
@@ -34,7 +31,7 @@ module OpenTelemetry
         subscriber_object = ::ActiveSupport::Notifications.subscribe(pattern, subscriber)
 
         ::ActiveSupport::Notifications.notifier.synchronize do
-          subscribers = find_subscribers(pattern)
+          subscribers = ::ActiveSupport::Notifications.notifier.instance_variable_get(:@string_subscribers)[pattern]
 
           if subscribers.nil?
             OpenTelemetry.handle_error(
@@ -51,17 +48,6 @@ module OpenTelemetry
         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.2'
+      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.2
+  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
@@ -269,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.2/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.2
+  documentation_uri: https://rubydoc.info/gems/opentelemetry-instrumentation-active_support/0.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: