scout_apm 2.1.30 → 2.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94cee593281d02b80d99aa3bf55a66fb4ef1adf9
-  data.tar.gz: a5aff2d47256429910ff7eb2e4f0c145bdca69f7
+  metadata.gz: eb46c36dc0f4c1ccda7a499e8f24b3a169b18f96
+  data.tar.gz: 931412d8a6a6fda9f07e3b996414da0670590e1a
 SHA512:
-  metadata.gz: 4a38d11380c58574636bf7ed6e086f890989edd7e7ef5a395e4d9cfecd11dc12c30206a85ea4f25324b28c4d92e49cad7be3e2e0ccd332a75f93497cc03b96d8
-  data.tar.gz: dd758e13ce68396da594a7d6bc8a04dc9f3f300d7bda905cb3676ca36a74b347ea9ace9f818b652b92150dfdb85d23656ad802c713660098f095b14d8ab88c11
+  metadata.gz: e496c29a689f6b651766f219c4e89b42bf7b105c270601f101e3790a53df2eba8e1cfb43df0c4d54f3faffff7c195819307d97bdabe49740e454c6eff1fc7dd4
+  data.tar.gz: ff5fd16fc53b58e2bb9a9dfd4198a56428e197f7a3b49c463acbc66ef1f6d2ff96cc2f630244165c143e55293f9bf0811c3dda58c55d2c01f89158425ed346a7

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 2.1.31
+
+* Better detection of Resque queue names
+* Fix passing arguments through Active Record instrumentation. (Thanks to Nick Quaranto for providing the fix)
+* Stricter checks to prevent agent from starting in Rails console
+
 # 2.1.30
 
 * Add Resque support.

data/lib/scout_apm/agent.rb

@@ -89,6 +89,11 @@ module ScoutApm
         return false unless force?
       end
 
+      if environment.interactive?
+        logger.warn "Agent attempting to load in interactive mode. #{force? ? 'Forcing agent to start' : 'Not starting agent'}"
+        return false unless force?
+      end
+
       if app_server_missing?(options) && background_job_missing?
         if force?
           logger.warn "Agent starting (forced)"

data/lib/scout_apm/background_worker.rb

@@ -36,12 +36,6 @@ module ScoutApm
 
       loop do
         begin
-          # Bail out if @keep_running is false
-          unless @keep_running
-            ScoutApm::Agent.instance.logger.debug "Background Worker: breaking from loop"
-            break
-          end
-
           now = Time.now
 
           # Sleep the correct amount of time to reach next_time
@@ -51,6 +45,12 @@ module ScoutApm
             now = Time.now
           end
 
+          # Bail out if @keep_running is false
+          unless @keep_running
+            ScoutApm::Agent.instance.logger.debug "Background Worker: breaking from loop"
+            break
+          end
+
           @task.call
 
           # Adjust the next time to run forward by @periods until it is in the future

data/lib/scout_apm/environment.rb

@@ -153,6 +153,11 @@ module ScoutApm
       background_job_integration && background_job_integration.name
     end
 
+    # If both stdin & stdout are interactive and the Rails::Console constant is defined
+    def interactive?
+      defined?(::Rails::Console) && $stdout.isatty && $stdin.isatty
+    end
+
     ### ruby checks
 
     def rubinius?

data/lib/scout_apm/instruments/active_record.rb

@@ -122,7 +122,7 @@ module ScoutApm
             current_layer.desc = desc
           end
 
-          log_without_scout_instruments(sql, name, &block)
+          log_without_scout_instruments(*args, &block)
 
         # OR: Start a new layer, we didn't pick up instrumentation earlier in the stack.
         else
@@ -130,7 +130,7 @@ module ScoutApm
           layer.desc = desc
           req.start_layer(layer)
           begin
-            log_without_scout_instruments(sql, name, &block)
+            log_without_scout_instruments(*args, &block)
           ensure
             req.stop_layer
           end

data/lib/scout_apm/instruments/resque.rb

@@ -3,11 +3,10 @@ module ScoutApm
     module Resque
       def around_perform_with_scout_instruments(*args)
         job_name = self.to_s
-        queue = @queue
+        queue = find_queue
 
         req = ScoutApm::RequestManager.lookup
         req.job!
-        # req.annotate_request(:queue_latency => latency(msg))
 
         begin
           req.start_layer(ScoutApm::Layer.new('Queue', queue))
@@ -24,6 +23,12 @@ module ScoutApm
           req.stop_layer if started_queue
         end
       end
+
+      def find_queue
+        return @queue if @queue
+        return queue if self.respond_to?(:queue)
+        return "unknown"
+      end
     end
   end
 end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.1.30"
+  VERSION = "2.1.31"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.1.30
+  version: 2.1.31
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest