scout_apm 2.4.3 → 2.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b8e456f2a8aa317fd9b2c6fdcbdd0b1fe5a5609
-  data.tar.gz: 5cff8d270a43db7458ccc0e3cb1ce69b9080f30d
+  metadata.gz: f9ba2d44228de2ea17e70a87425b7e7a3d6ebc34
+  data.tar.gz: ebf97e1ddd39bfeefc70a5d559b8040e3f7f5657
 SHA512:
-  metadata.gz: b64cc8052ef1a8aa7a23873f4c554bebedab4c33ec94f6c5cb1b76e918ba0c95e5d015666e95d3a1efe4bf658e0e652f0ca8390ebee949fb66e1b5cb0b280e73
-  data.tar.gz: feea8fc217559d5aad2ee4e53727f300bb50b37f515b2c97ec120be029014cb51b3890179681c6e7833045150a06512b3ac0e950f2fab2cb6cc78ee7d996e133
+  metadata.gz: f00ff64d371bcf47ba2cd5cf19f2b6c3091c2b6b1f5fefd8f82e2354490295750e155fc88165e2357ddc8110d396420e4e04374589687ea50a878797c411ec0b
+  data.tar.gz: 4c0e9ab6e524a65c94e97b4860e843945c55e4fca30c4870325b83a6747a9eb057342da9abc8ec6c8bab3920077aaea178c687261d2676ef79d6c07de74e48ea

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 2.4.4
+
+* Prevent agent from starting when monitor=false
+* Fix double-counting of HTTP requests when multiple http libraries are present
+* Fix an issue with Resque instrumentation
+
 # 2.4.3
 
 * Ensure a startup hook runs on forking webservers

data/lib/scout_apm/agent/preconditions.rb

@@ -22,7 +22,12 @@ module ScoutApm
 
         PRECONDITION_DETECTED_SERVER = {
           :message => proc {|environ| "Deferring agent start. Standing by for first request" },
-          :check => proc { |context| !app_server_missing?(context) && !background_job_missing?(context) },
+          :check => proc { |context|
+            app_server_missing = !context.environment.app_server_integration(true).found?
+            background_job_missing = context.environment.background_job_integrations.length == 0
+
+            !app_server_missing && !background_job_missing
+          },
         },
 
         PRECONDITION_ALREADY_STARTED = {
@@ -36,34 +41,29 @@ module ScoutApm
         },
       ]
 
-      def self.check?(context)
-        failed_preconditions = PRECONDITIONS.inject(Array.new) { |errors, condition|
-          met = condition[:check].call(context)
-          errors << condition[:message].call(context.environment) unless met
-          errors
-        }
+      def check?(context)
+        @check_result ||=
+          begin
+            failed_preconditions = PRECONDITIONS.inject(Array.new) { |errors, condition|
+              met = condition[:check].call(context)
+              errors << condition[:message].call(context.environment) unless met
+              errors
+            }
 
-        if failed_preconditions.any?
-          failed_preconditions.each {|msg| context.logger.warn(msg) }
-          force? # if forced, return true anyway
-        else
-          # No errors, we met preconditions
-          true
-        end
+            if failed_preconditions.any?
+              failed_preconditions.each {|msg| context.logger.warn(msg) }
+              force? # if forced, return true anyway
+            else
+              # No errors, we met preconditions
+              true
+            end
+          end
       end
 
       # XXX: Wire up options here and below in the appserver & bg server detections
-      def self.force?
+      def force?
         false
       end
-
-      def self.app_server_missing?(context)
-        !context.environment.app_server_integration(true).found? # && !options[:skip_app_server_check]
-      end
-
-      def self.background_job_missing?(context)
-        context.environment.background_job_integrations.length == 0
-      end
     end
   end
 end

data/lib/scout_apm/agent.rb

@@ -47,7 +47,8 @@ module ScoutApm
 
       context.installed!
 
-      if ScoutApm::Agent::Preconditions.check?(context) || force
+      @preconditions = ScoutApm::Agent::Preconditions.new
+      if @preconditions.check?(context) || force
         start
       end
     end
@@ -55,8 +56,12 @@ module ScoutApm
     # Unconditionally starts the agent. This includes verifying instruments are
     # installed, and starting the background worker.
     #
-    # Does not attempt to start twice.
-    def start(_opts={})
+    # The monitor precondition is checked explicitly, and we will *never* start with monitor = false
+    #
+    # This does not attempt to start twice
+    def start(opts={})
+      return unless context.config.value('monitor')
+
       if context.started?
         start_background_worker unless background_worker_running?
         return

data/lib/scout_apm/agent_context.rb

@@ -52,8 +52,8 @@ module ScoutApm
     # expected to have its accepting webserver up and running
     def become_remote_client!(host, port)
       logger.debug("Becoming Remote Agent (reporting to: #{host}:#{port})")
-      recorder = ScoutApm::Remote::Recorder.new(host, port, logger)
-      store = ScoutApm::FakeStore.new
+      @recorder = ScoutApm::Remote::Recorder.new(host, port, logger)
+      @store = ScoutApm::FakeStore.new
     end
 
 

data/lib/scout_apm/instruments/net_http.rb

@@ -26,7 +26,7 @@ module ScoutApm
             include ScoutApm::Tracer
 
             def request_with_scout_instruments(*args,&block)
-              self.class.instrument("HTTP", "request", :desc => request_scout_description(args.first)) do
+              self.class.instrument("HTTP", "request", :ignore_children => true, :desc => request_scout_description(args.first)) do
                 request_without_scout_instruments(*args, &block)
               end
             end

data/lib/scout_apm/remote/server.rb

@@ -41,7 +41,7 @@ module ScoutApm
 
             logger.debug("Remote: Server returned after #start call, thread exiting")
           rescue => e
-            logger.debug("Remote: Server Exception, #{e}")
+            logger.debug("Remote: Server Exception, #{e},\n#{e.backtrace.join("\n\t")}")
           end
         end
       end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.3"
+  VERSION = "2.4.4"
 end
 

metadata

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