scout_apm 3.0.0.pre17 → 3.0.0.pre18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca61b61ba4135b8ee89ffb1efb4946f0c0afa44
-  data.tar.gz: d980d2baab58e6ceecf1d54aa97128180cf9052e
+  metadata.gz: cbd90a42f996c3061f49d47dab8030bd68da59bd
+  data.tar.gz: 05dd5875bc492ce4e8bcca1f590c20b0c39a7f03
 SHA512:
-  metadata.gz: 5bd058b09d66c99c304af71ca7343462d02dc588230253712462fdad6628f718bad8a33655de42f1eb27ae98e2cec39840f247173e4fe0cf1ef0110dbb727105
-  data.tar.gz: 2cd9079153c0d8f050055ae62e7d3c18531b6e90e6d5a4e12661c0cd5e598ab930584229304d2a44017347f00cb2fada6e407bfbc5b54a8ce871e3df91147f3d
+  metadata.gz: 62b89c1e2b9220e5e3e3f5ae008e2b858deaafce0b5119eff73ade0dd3b5c5f1447092057605819314dfef7fffd755b3e4a646b11ee5858e4ecaac090f6e2183
+  data.tar.gz: 9fc7f24849744a01258da4e8927e1bc0804d42b6dcb5d5b467a33042e7c89df245d8b67b75a2c03cb91d02a93a9b6566e6e3b1a5d2d006e90e77a5768209ff6f

data/CHANGELOG.markdown

@@ -2,6 +2,12 @@
 
 * ScoutProf BETA
 
+# 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.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/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_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,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre17"
+  VERSION = "3.0.0.pre18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre17
+  version: 3.0.0.pre18
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -373,46 +373,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.5.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files:
-- test/data/config_test_1.yml
-- test/test_helper.rb
-- test/unit/agent_test.rb
-- test/unit/background_job_integrations/sidekiq_test.rb
-- test/unit/config_test.rb
-- test/unit/context_test.rb
-- test/unit/db_query_metric_set_test.rb
-- test/unit/db_query_metric_stats_test.rb
-- test/unit/environment_test.rb
-- test/unit/fake_store_test.rb
-- test/unit/git_revision_test.rb
-- test/unit/histogram_test.rb
-- test/unit/ignored_uris_test.rb
-- test/unit/instruments/active_record_instruments_test.rb
-- test/unit/instruments/net_http_test.rb
-- test/unit/instruments/percentile_sampler_test.rb
-- test/unit/layaway_test.rb
-- test/unit/layer_children_set_test.rb
-- test/unit/layer_converters/depth_first_walker_test.rb
-- test/unit/layer_converters/metric_converter_test.rb
-- test/unit/layer_converters/stubs.rb
-- test/unit/limited_layer_test.rb
-- test/unit/logger_test.rb
-- test/unit/metric_set_test.rb
-- test/unit/remote/test_message.rb
-- test/unit/remote/test_router.rb
-- test/unit/remote/test_server.rb
-- test/unit/scored_item_set_test.rb
-- test/unit/serializers/payload_serializer_test.rb
-- test/unit/slow_job_policy_test.rb
-- test/unit/slow_request_policy_test.rb
-- test/unit/sql_sanitizer_test.rb
-- test/unit/store_test.rb
-- test/unit/test_tracked_request.rb
-- test/unit/utils/active_record_metric_name_test.rb
-- test/unit/utils/backtrace_parser_test.rb
-- test/unit/utils/numbers_test.rb
-- test/unit/utils/scm.rb
+test_files: []