scout_apm 3.0.0.pre19 → 3.0.0.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0393ebae36fc959586f76135f0772c9353b2fb82
-  data.tar.gz: d64a6fc7477a274b1a4712895ad62066b2653e4d
+  metadata.gz: f047a3fde038ff766a4257bd06039aaa57bc5eda
+  data.tar.gz: 2e3aecc744bff0176bb449f0bade29a43ff2810d
 SHA512:
-  metadata.gz: c9281d472ab3df97780f5518a28c7e059c2e031693a47f91ad96d61b955a07678eb5960ee108a18a1b95d09355bd01f70f9aef3d9a9cbea09468c51ea77812ca
-  data.tar.gz: ff8d0ea6114d2de8052780d029dc2c7451ff2e8ee40248e4912959f9fca0308fa0719066ec2e93e391d2c98dfb2ec3353b1883dd0854f084c89f6d6531554b25
+  metadata.gz: 57f0e123ba394164ea2263195a204f77787e254e8396bb5a0ca346523470f4e447e53b456005a082949e6f7f6a9154ac55b71cf701b19a7e8517f709591761fd
+  data.tar.gz: 555e23d6f39fd9c1ea919ab15f7fa28b868fef854c7f0dec610db7bc9ea20438de8d30a1c6c932e7d389cd5bd40f2a3b58af53b29e9fe44e965c8ff8b7ca2d8a

data/CHANGELOG.markdown

@@ -2,6 +2,14 @@
 
 * ScoutProf BETA
 
+# 2.4.7
+
+* Fix issue recording backtraces
+
+# 2.4.6
+
+* Fix an edge case for Resque instrumentation
+
 # 2.4.5
 
 * More robust installation of instruments at startup

data/lib/scout_apm/agent_context.rb

@@ -41,7 +41,7 @@ module ScoutApm
       @remote_server = ScoutApm::Remote::Server.new(
         bind,
         port,
-        ScoutApm::Remote::Router.new(ScoutApm::SynchronousRecorder.new(logger), logger),
+        ScoutApm::Remote::Router.new(ScoutApm::SynchronousRecorder.new(self), logger),
         logger
       )
 

data/lib/scout_apm/db_query_metric_set.rb

@@ -4,7 +4,6 @@ module ScoutApm
     include Enumerable
 
     attr_reader :metrics # the raw metrics. You probably want #metrics_to_report
-    attr_reader :context
 
     def marshal_dump
       [ @metrics ]
@@ -22,6 +21,12 @@ module ScoutApm
       @metrics = Hash.new
     end
 
+    # Need to look this up again if we end up as nil. Which I guess can happen
+    # after a Marshal load?
+    def context
+      @context ||= ScoutApm::Agent.instance.context
+    end
+
     def each
       metrics.each do |_key, db_query_metric_stat|
         yield db_query_metric_stat

data/lib/scout_apm/logger.rb

@@ -8,11 +8,12 @@
 # :stdout => true                          - explicitly force the log to write to stdout (if set, ignore log_file_path)
 # :stderr => true                          - explicitly force the log to write to stderr (if set, ignore log_file_path)
 # :logger_class => Class or String         - a class to use as the underlying logger. Defaults to Ruby's Logger. See notes
-# :log_level => symbol, string, or integer - defualts to INFO level
+# :log_level => symbol, string, or integer - defaults to INFO level
 #
 # The :logger_class option
 #   - allows any class to be used as the underlying logger. Currently requires to respond to:
 #     - debug, info, warn, error, fatal in both string and block form.
+#     - debug?, info?, warn?, error?, fatal?
 #     - #level= with a number (0 = debug, 1 = info, 2= warn, 3=error, 4=fatal)
 #     - #formatter= that takes a Ruby Logger::Formatter class. This method must be here, but the value may be ignored
 #
@@ -39,6 +40,12 @@ module ScoutApm
     def error(*args, &block); @logger.error(*args, &block); end
     def fatal(*args, &block); @logger.fatal(*args, &block); end
 
+    def debug?; @logger.debug?; end
+    def info?; @logger.info?; end
+    def warn?; @logger.warn?; end
+    def error?; @logger.error?; end
+    def fatal?; @logger.fatal?; end
+
     def log_level=(level)
       @logger.level = log_level_from_opts(level)
     end

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
@@ -67,6 +75,10 @@ module ScoutApm
       layer.start_sampling
 
       start_request(layer) unless @root_layer
+
+      if REQUEST_TYPES.include?(layer.type)
+        real_request!
+      end
       @layers.push(layer)
     end
 
@@ -110,6 +122,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
@@ -133,7 +154,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
@@ -245,16 +266,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?
 
@@ -278,7 +289,7 @@ module ScoutApm
 
       # If we didn't have store, but we're trying to record anyway, go
       # figure that out. (this happens in Remote Agent scenarios)
-      restore_store if @store.nil?
+      restore_from_dump! if @agent_context.nil?
 
       # Bail out early if the user asked us to ignore this uri
       return if @agent_context.ignored_uris.ignore?(annotations[:uri])
@@ -317,6 +328,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
@@ -457,11 +481,14 @@ module ScoutApm
       @call_set = nil
       @store = nil
       @recorder = nil
+      @agent_context = nil
     end
 
     # Go re-fetch the store based on what the Agent's official one is. Used
     # after hydrating a dumped TrackedRequest
-    def restore_store
+    def restore_from_dump!
+      @agent_context = ScoutApm::Agent.instance.context
+      @recorder = @agent_context.recorder
       @store = @agent_context.store
     end
   end

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre19"
+  VERSION = "3.0.0.pre20"
 end

data/test/unit/logger_test.rb

@@ -1,10 +1,12 @@
 require 'test_helper'
+require 'fileutils'
 
 require 'scout_apm/logger'
 
 class LoggerTest < Minitest::Test
   def setup
     @env_root = Pathname.new(File.dirname(__FILE__)) + "../../"
+    FileUtils.mkdir_p(@env_root + "log")
   end
 
   def test_detect_stdout

metadata

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