scout_apm 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7a080ba227f9128b5043ef6cef44057aca54aa
-  data.tar.gz: 7efd65ac1bfc634bba4833cce60e5853f972f0fe
+  metadata.gz: 499e2fb1ca29ef0ca1a596acf1ef561efc9b8f05
+  data.tar.gz: 4ac01fb2789e05be922d6121eabae98b72af4198
 SHA512:
-  metadata.gz: 2348d0ebc6ce4cc01b2f04f7dcba41376d55869f88d2aa5c1337079dcbc37bdd2dff527f6c1c73b26738eeaa735e26268273ebde4ba9f328e048d4926fd0c3c0
-  data.tar.gz: b925e5905c463df7673fbba9d867d3f8f27f21f5eaf6420360454130e12485fe5e621b8634843b30e08420443f548e9037f7dd9405befd68133325f290811a9c
+  metadata.gz: 553499a35ca3b92571b649277feda1d2e195ccf091eefb85f2e0ca5279a36c3e8ea90a0a0073104ee9db398a2c1984d87ace59e706e76b8dda8b02e39ed67f1c
+  data.tar.gz: db4cc309f2c46c2f4a77f84c7f1c1ab66b7488f08d87310f1c18daa3ba62b0554a170c501cd407050cb89a52417b255c0269b70274c26e64d6ddc9def35c7a70

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 2.3.2
+
+* More robust startup sequence when using `rails server` vs. directly launching an app server
+* Avoid incompatibility with 3rd party gems that aggressively obtain database connections
+
 # 2.3.1
 
 * Fix DevTrace bug

data/lib/scout_apm/agent.rb

@@ -39,6 +39,7 @@ module ScoutApm
     # be started (when forking).
     def initialize(options = {})
       @started = false
+      @shutting_down = false
       @process_start_time = Time.now
       @options ||= options
 
@@ -172,7 +173,7 @@ module ScoutApm
     # Sends a ping to APM right away, smoothes out onboarding
     # Collects up any relevant info (framework, app server, system time, ruby version, etc)
     def app_server_load_hook
-      AppServerLoad.new.run
+      @app_server_load ||= AppServerLoad.new.run
     end
 
     def exit_handler_supported?
@@ -236,6 +237,10 @@ module ScoutApm
       @started
     end
 
+    def shutting_down?
+      @shutdown == true
+    end
+
     # The worker thread will automatically start UNLESS:
     # * A supported application server isn't detected (example: running via Rails console)
     # * A supported application server is detected, but it forks. In this case,
@@ -256,18 +261,28 @@ module ScoutApm
 
     # Creates the worker thread. The worker thread is a loop that runs continuously. It sleeps for +Agent#period+ and when it wakes,
     # processes data, either saving it to disk or reporting to Scout.
-    def start_background_worker
+    # => true if thread & worker got started
+    # => false if it wasn't started (either due to already running, or other preconditions)
+    def start_background_worker(quiet=false)
       if !apm_enabled?
-        logger.debug "Not starting background worker as monitoring isn't enabled."
+        logger.debug "Not starting background worker as monitoring isn't enabled." unless quiet
+        return false
+      end
+      if background_worker_running?
+        logger.info "Not starting background worker, already started" unless quiet
         return false
       end
-      logger.info "Not starting background worker, already started" and return if background_worker_running?
+      if shutting_down?
+        logger.info "Not starting background worker, already in process of shutting down" unless quiet
+        return false
+      end
+
       logger.info "Initializing worker thread."
 
       install_exit_handler
 
       @recorder = create_recorder
-      logger.info("recorder is now: #{@recorder.class}")
+      logger.info("Recorder is now: #{@recorder.class}")
 
       @background_worker = ScoutApm::BackgroundWorker.new
       @background_worker_thread = Thread.new do
@@ -277,6 +292,8 @@ module ScoutApm
           clean_old_percentiles
         }
       end
+
+      return true
     end
 
     def clean_old_percentiles

data/lib/scout_apm/app_server_load.rb

@@ -41,6 +41,10 @@ module ScoutApm
         :paas               => to_s_safe(ScoutApm::Environment.instance.platform_integration.name),
         :git_sha            => to_s_safe(ScoutApm::Environment.instance.git_revision.sha)
       }
+    ensure
+      # Sometimes :database_engine and :database_adapter can cause a reference to an AR connection.
+      # Make sure we release all AR connections held by this thread.
+      ActiveRecord::Base.clear_active_connections! if Utils::KlassHelper.defined?("ActiveRecord::Base")
     end
 
     # Calls `.to_s` on the object passed in.

data/lib/scout_apm/tracked_request.rb

@@ -292,8 +292,26 @@ module ScoutApm
         trace = converter.call
         ScoutApm::InstantReporting.new(trace, instant_key).call
       end
+
+      if web? || job?
+        ensure_background_worker
+      end
     end
 
+    # Ensure the background worker thread is up & running - a fallback if other
+    # detection doesn't achieve this at boot.
+    def ensure_background_worker
+      agent = ScoutApm::Agent.instance
+      agent.start(:skip_app_server_check => true) unless agent.started?
+
+      if agent.start_background_worker(:quiet)
+        agent.logger.info("Force Started BG Worker")
+      end
+    rescue => e
+      true
+    end
+
+
     # Only call this after the request is complete
     def unique_name
       return nil if ignoring_request?

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.3.1"
+  VERSION = "2.3.2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest