plain_apm 0.9.4 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbc80ac73a8d6b499ba00f4ec728d83359225be1563dc81f61599b7c9dbdab9d
-  data.tar.gz: a885c23479749c60b4aa62df8e199bedfafd22190ab4578d5ee42cf2664b3cce
+  metadata.gz: c04ad1d3800e79ca5956ab34d933a7d22a978c339c38a101dbc372cdea8cb34b
+  data.tar.gz: c69b2e6c160f7143ccbc8c4bc6e85f80af2e1fcb327e446bc68d92ce1ab03a23
 SHA512:
-  metadata.gz: f02c96c5f98ca5a2d8d36ba0c4c5e8454799572e0dcc455d940f5b73151346de21c767cdf6b20b1bc0f25140d404f535c71e40f7bdc296963b23020bc7b7f1c5
-  data.tar.gz: 2ed255c00a300a1b6f8de0a64947e354462fab28a254847bd86eed49f89632cf49a8e0d1935b71196b061dc8bef009b0153a1aa5a09cd634dd078e8fd2bdd343
+  metadata.gz: 1294d748d9cedc00e5433dd8a520f5a69a6458ab749a314115565bdac63bebaaeaf4c533432d04db8c55a3a1eee07612ae633e205a5c79fed488b3baba1105a3
+  data.tar.gz: 95a27cb67aeb768088ceb852ad6be44adce0c81ba40f1e54f9dac65f874dc6d01e70ce14b9d2b09e8af6a9bee865d377e512253cabe604c2d2d495cb1235d55a

data/lib/plain_apm/helpers.rb

@@ -1,14 +1,17 @@
 module PlainApm
   module Helpers
     def plain_apm_context(context = {})
-      return unless PlainApm.agent.enabled?
+      return context unless PlainApm.agent.enabled?
       PlainApm::Extensions::Context.context.merge!(context)
     end
 
     def plain_apm_instrument(name, context = {}, &block)
-      return unless PlainApm.agent.enabled? && defined?(ActiveSupport::Notifications)
-      sanitized_name = name.gsub(/\W/, "_").gsub(/(?!^)([A-Z])/) { |m| "_#{m}" }.squeeze("_").downcase
-      ActiveSupport::Notifications.instrument("#{sanitized_name}.manual_plain_apm", **context, &block)
+      if PlainApm.agent.enabled? && defined?(ActiveSupport::Notifications)
+        sanitized_name = name.gsub(/\W/, "_").gsub(/(?!^)([A-Z])/) { |m| "_#{m}" }.squeeze("_").downcase
+        ActiveSupport::Notifications.instrument("#{sanitized_name}.manual_plain_apm", **context, &block)
+      else
+        yield if block
+      end
     end
   end
 end

data/lib/plain_apm/hooks/action_view.rb

@@ -45,11 +45,8 @@ module PlainApm
 
       # strip rails root
       def identifier(id)
-        return id unless defined?(Rails) && Rails.respond_to?(:root)
-
-        root = Rails.root.to_s
-
-        id.start_with?(root) ? id[root.size + 1..-1] : id # standard:disable Style/SlicingWithRange
+        return id if self.class.rails_root.nil? || id.nil?
+        id.start_with?(self.class.rails_root) ? id[self.class.rails_root.length + 1..-1] : id # standard:disable Style/SlicingWithRange
       end
     end
   end

data/lib/plain_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainApm
-  VERSION = "0.9.4"
+  VERSION = "0.9.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - PlainAPM Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest