plain_apm 0.9.3 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2950f7d2e02a813b67a5bfb4c2ff7cc522acb8770404e3ef3dcef4e13aa4c4c
-  data.tar.gz: 4af16bf90b9904db8f5adf9efc6438aec2a6f31954a481f1a3384fbdadddf1d4
+  metadata.gz: 8700716a8232dd006ee1f152ff706b110e183180f31b174dad707073d56191cd
+  data.tar.gz: cab9abf563da3173c75448eaf1ab4a30d385d12190b64adb6c2a13bf9c154c3f
 SHA512:
-  metadata.gz: 6ceba3781efda4b4b60dc66f85ed07a065b47c624d7c6da2fbd42d52bc525cf2b95204d9030aa6e5540e7f6e5e6112b387a40008b29c69236cedcbeb9ae62e69
-  data.tar.gz: '08dcda87123a5e006442cfe574da4ee41c011a28880b559a19bb65871785eb06154ba19f86c00d159c7d0c3e40b22c9758b6a373150de1344a001062fab0cd96'
+  metadata.gz: 25ab862df530c784896f3b0de84fb53fc9838a6551fdbb774cef2927566abe920458f6669425a1204407d849d4be5bf7c2055523f6cade5fffceffc8bdfe68b6
+  data.tar.gz: 948fe60ffebd3fee6897145343c2c89dce907639bd7b4b584569b43108301b2be789908838cc97142f7a01f54d51d7f9f6fbb231873e83940b82a06050299f2d

data/lib/plain_apm/event_attributes.rb

@@ -125,8 +125,16 @@ module PlainApm
 
     def source_location(backtrace = nil)
       return if self.class.rails_root.nil?
-      call = (backtrace || caller).find { |frame| frame.start_with?(self.class.rails_root) } || return
-      call[(self.class.rails_root.size + 1)..-1]
+      root_length = self.class.rails_root.length
+
+      (backtrace || caller).each do |frame|
+        if frame.start_with?(self.class.rails_root)
+          path = frame[(root_length + 1)..-1]
+          return path if path.start_with?("app") || path.start_with?("lib")
+        end
+      end
+
+      nil
     end
 
     def self.included(other)

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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plain_apm
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.5
 platform: ruby
 authors:
 - PlainAPM Team