scout_apm 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7cca5bcac3a1e0003177c2278f946cc8f91162e
-  data.tar.gz: 1019c41baada305983347b46a89d201959fd6a0d
+  metadata.gz: 20990a5a7adefbcb87f28ddb286a4bf867de5351
+  data.tar.gz: b21b4bc5da902f58a3aaedee308dab194c282de3
 SHA512:
-  metadata.gz: 1e82600c59d5214af9f3e4eea0c41c9c5a2d3fffda05d6fa33f38cf65e410728bd82a789f39150a76b4569f9631a85af65cc8e6b84ceb1630b4f7eb96393cb14
-  data.tar.gz: 5a50add27950b1ee9080a6f803feed0ee8cfe05ac730dc19fc47980e5ec15729663f41c7b3889feca87380602f7a284005d6f4f821ebb9dd8f25a5c42dea947f
+  metadata.gz: c37715e2944f6ca6813b86f646c0c7e2760de0b620990577802c8de76a543a7bae3b4ea5ca95fe5d7c9b85928f7055ead625f0412de92a83e7b78ef3dec68d47
+  data.tar.gz: adcaa59ce8c6f536f83bb61987fc5755c29938c669f0a27796e2f442739f593e543cd84687283c2242e1cc2ff8f4bf744173c34b90b0fd2aedfab559326677fc

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 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

@@ -251,7 +251,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])
@@ -430,11 +430,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,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.5"
+  VERSION = "2.4.6"
 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: 2.4.5
+  version: 2.4.6
 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-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest