scout_apm 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20990a5a7adefbcb87f28ddb286a4bf867de5351
-  data.tar.gz: b21b4bc5da902f58a3aaedee308dab194c282de3
+  metadata.gz: 07c4a946a4d02fc35ba227fe874ca2e743e19d77
+  data.tar.gz: 28d3f6e28caea313d1815766ed150739d51dd81c
 SHA512:
-  metadata.gz: c37715e2944f6ca6813b86f646c0c7e2760de0b620990577802c8de76a543a7bae3b4ea5ca95fe5d7c9b85928f7055ead625f0412de92a83e7b78ef3dec68d47
-  data.tar.gz: adcaa59ce8c6f536f83bb61987fc5755c29938c669f0a27796e2f442739f593e543cd84687283c2242e1cc2ff8f4bf744173c34b90b0fd2aedfab559326677fc
+  metadata.gz: 44f9540db9e162bb66524011724cf11b11c5f02f6694f265a186407c73237eca99ca6799b9bcba07f25b6e9601da4d012c87cfc3f826a72dae2f8953d11b53d1
+  data.tar.gz: cb4fc4b106c966584cca12eb84167a67efebb7c79ebc079c360ee938eee7ca3369fb24d58c0b0e6fa818194857a66890cc2f1167e47a77e87d8d749c0ab3f87c

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.4.7
+
+* Fix issue recording backtraces
+
 # 2.4.6
 
 * Fix an edge case for Resque instrumentation

data/lib/scout_apm/tracked_request.rb

@@ -38,6 +38,13 @@ module ScoutApm
     # An object that responds to `record!(TrackedRequest)` to store this tracked request
     attr_reader :recorder
 
+    # When we see these layers, it means a real request is going through the
+    # system. We toggle a flag to turn on some slightly more expensive
+    # instrumentation (backtrace collection and the like) that would be too
+    # expensive in situations where the framework is constantly churning. We
+    # see that on Sidekiq.
+    REQUEST_TYPES = ["Controller", "Job"]
+
     def initialize(agent_context, store)
       @agent_context = agent_context
       @store = store #this is passed in so we can use a real store (normal operation) or fake store (instant mode only)
@@ -52,6 +59,7 @@ module ScoutApm
       @instant_key = nil
       @mem_start = mem_usage
       @recorder = agent_context.recorder
+      @real_request = false
 
       ignore_request! if @recorder.nil?
     end
@@ -65,6 +73,10 @@ module ScoutApm
       return ignoring_start_layer if ignoring_request?
 
       start_request(layer) unless @root_layer
+
+      if REQUEST_TYPES.include?(layer.type)
+        real_request!
+      end
       @layers.push(layer)
     end
 
@@ -105,6 +117,15 @@ module ScoutApm
       end
     end
 
+    def real_request!
+      @real_request = true
+    end
+
+    # Have we seen a "controller" or "job" layer so far?
+    def real_request?
+      @real_request
+    end
+
     # Grab the currently running layer. Useful for adding additional data as we
     # learn it. This is useful in ActiveRecord instruments, where we start the
     # instrumentation early, and gradually learn more about the request that
@@ -128,7 +149,7 @@ module ScoutApm
       # Only capture backtraces if we're in a real "request". Otherwise we
       # can spend lot of time capturing backtraces from the internals of
       # Sidekiq, only to throw them away immediately.
-      return false unless (web? || job?)
+      return false unless real_request?
 
       # Capture any individually slow layer.
       return true if layer.total_exclusive_time > backtrace_threshold
@@ -218,16 +239,6 @@ module ScoutApm
       @headers = headers
     end
 
-    # This request is a job transaction iff it has a 'Job' layer
-    def job?
-      layer_finder.job != nil
-    end
-
-    # This request is a web transaction iff it has a 'Controller' layer
-    def web?
-      layer_finder.controller != nil
-    end
-
     def instant?
       return false if ignoring_request?
 
@@ -290,6 +301,19 @@ module ScoutApm
       end
     end
 
+    # This request is a job transaction iff it has a 'Job' layer
+    # Use this only during recording
+    def job?
+      layer_finder.job != nil
+    end
+
+    # This request is a web transaction iff it has a 'Controller' layer
+    # Use this only during recording
+    def web?
+      layer_finder.controller != nil
+    end
+
+
     def layer_finder
       @layer_finder ||= LayerConverters::FindLayerByType.new(self)
     end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.6"
+  VERSION = "2.4.7"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest