scout_apm 2.4.23 → 2.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca36cb923b4f091bfcec9d51f7258a09fd6359b3
-  data.tar.gz: f5e53408efdd0cedd50ad36e72c9cb6cba221fe3
+  metadata.gz: 3876e11520a259f36044e5363edcb5aeeb4b21fa
+  data.tar.gz: cc1b0079ab39e11f40a864c49ef2fbe47047b186
 SHA512:
-  metadata.gz: 033447f6ced47a6cb86a8487b09b5655d7136f375ebd63b41fd8443108c3bc8f71f90a3150f8236b16f637ee99d5fcfb20afa132318674c4f47d621aeb15899b
-  data.tar.gz: c7bbe7f1624a0a72aba52c5f768015cb54e95b3d1979c638743e6acce770203c3d41b001e1dafc7079ea561f14f798cbd5d1b52dc2f16809c0715e39662229d5
+  metadata.gz: d027fd21baa97648867063ec267c53f1dab7cf1060c5f13a9c69f1ce70b89a78465fe0fdda20ddc4d44ea6b281c5673f3661fb0cb7f3b34982e4081e45041942
+  data.tar.gz: aee3351685dc70a95857ffc63bc8dfad81e6414ddb53146eaca3483fc0bd94ef29024da47079f62bc1d568cbc979afc20d6f960fa53e25b123136202fd10badd

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.4.24
+
+* Fix for prepending view instruments in the case of templates that lack a `virtual_path` (#257).
+
 # 2.4.23
 
 * Extend #251 to use prepend on all view instruments (#255)

data/lib/scout_apm/instruments/action_view.rb

@@ -3,11 +3,12 @@
 #
 # The prepend version was added for Rails 6 support - ActiveRecord prepends on
 # top of PartialRenderer#collection_with_template, which can (and does) cause
-# infinite loops with our alias_method approach
+# infinite loops with our alias_method approach.
+#
+# Even though Rails 6 forced us to use a prepend version, it is now used for
+# all Rubies that support it.
 module ScoutApm
   module Instruments
-    # Instrumentation for Rails 3, 4, 5 is the same, using tracer.
-    # Rails 6 switches to using Module#prepend
     class ActionView
       attr_reader :context
 
@@ -25,8 +26,7 @@ module ScoutApm
       end
 
       def prependable?
-        return true if context.environment.supports_module_prepend?
-        false
+        context.environment.supports_module_prepend?
       end
 
       def install
@@ -79,6 +79,7 @@ module ScoutApm
           req = ScoutApm::RequestManager.lookup
 
           template_name = @template.virtual_path rescue "Unknown Partial"
+          template_name ||= "Unknown Partial"
           layer_name = template_name + "/Rendering"
 
           layer = ScoutApm::Layer.new("View", layer_name)
@@ -96,6 +97,7 @@ module ScoutApm
           req = ScoutApm::RequestManager.lookup
 
           template_name = @template.virtual_path rescue "Unknown Collection"
+          template_name ||= "Unknown Collection"
           layer_name = template_name + "/Rendering"
 
           layer = ScoutApm::Layer.new("View", layer_name)
@@ -115,6 +117,7 @@ module ScoutApm
           req = ScoutApm::RequestManager.lookup
 
           template_name = args[0].virtual_path rescue "Unknown"
+          template_name ||= "Unknown"
           layer_name = template_name + "/Rendering"
 
           layer = ScoutApm::Layer.new("View", layer_name)

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "2.4.23"
+  VERSION = "2.4.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.23
+  version: 2.4.24
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest