scout_apm 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9ba2d44228de2ea17e70a87425b7e7a3d6ebc34
-  data.tar.gz: ebf97e1ddd39bfeefc70a5d559b8040e3f7f5657
+  metadata.gz: c7cca5bcac3a1e0003177c2278f946cc8f91162e
+  data.tar.gz: 1019c41baada305983347b46a89d201959fd6a0d
 SHA512:
-  metadata.gz: f00ff64d371bcf47ba2cd5cf19f2b6c3091c2b6b1f5fefd8f82e2354490295750e155fc88165e2357ddc8110d396420e4e04374589687ea50a878797c411ec0b
-  data.tar.gz: 4c0e9ab6e524a65c94e97b4860e843945c55e4fca30c4870325b83a6747a9eb057342da9abc8ec6c8bab3920077aaea178c687261d2676ef79d6c07de74e48ea
+  metadata.gz: 1e82600c59d5214af9f3e4eea0c41c9c5a2d3fffda05d6fa33f38cf65e410728bd82a789f39150a76b4569f9631a85af65cc8e6b84ceb1630b4f7eb96393cb14
+  data.tar.gz: 5a50add27950b1ee9080a6f803feed0ee8cfe05ac730dc19fc47980e5ec15729663f41c7b3889feca87380602f7a284005d6f4f821ebb9dd8f25a5c42dea947f

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+# 2.4.5
+
+* More robust installation of instruments at startup
+* Several (very) minor bug fixes
+
 # 2.4.4
 
 * Prevent agent from starting when monitor=false

data/lib/scout_apm.rb

@@ -196,5 +196,5 @@ if defined?(Rails) && defined?(Rails::VERSION) && defined?(Rails::VERSION::MAJOR
     end
   end
 else
-  ScoutApm::Agent.instance.start
+  ScoutApm::Agent.instance.install
 end

data/lib/scout_apm/agent.rb

@@ -35,15 +35,14 @@ module ScoutApm
     def install(force=false)
       context.config = ScoutApm::Config.with_file(context, context.config.value("config_file"))
 
-      context.logger.info "Scout Agent [#{ScoutApm::VERSION}] Initialized"
+      logger.info "Scout Agent [#{ScoutApm::VERSION}] Initialized"
 
-      @instrument_manager = ScoutApm::InstrumentManager.new(context)
-      @instrument_manager.install! if should_load_instruments? || force
+      instrument_manager.install! if should_load_instruments? || force
 
       install_background_job_integrations
       install_app_server_integration
 
-      logger.info "Scout Agent [#{ScoutApm::VERSION}] installed"
+      logger.info "Scout Agent [#{ScoutApm::VERSION}] Installed"
 
       context.installed!
 
@@ -69,6 +68,8 @@ module ScoutApm
 
       install unless context.installed?
 
+      instrument_manager.install! if should_load_instruments?
+
       context.started!
 
       log_environment
@@ -79,6 +80,10 @@ module ScoutApm
       start_background_worker
     end
 
+    def instrument_manager
+      @instrument_manager ||= ScoutApm::InstrumentManager.new(context)
+    end
+
     def log_environment
       bg_names = context.environment.background_job_integrations.map{|bg| bg.name }.join(", ")
 
@@ -123,10 +128,13 @@ module ScoutApm
       return !context.environment.forking?
     end
 
+    # monitor is the key configuration here. If it is true, then we want the
+    # instruments. If it is false, we mostly don't want them, unless you're
+    # asking for devtrace (ie. not reporting to apm servers as a real app, but
+    # only for local browsers).
     def should_load_instruments?
       return true if context.config.value('dev_trace')
-      return false unless context.config.value('monitor')
-      context.environment.app_server_integration.found? || context.environment.background_job_integrations.any?
+      context.config.value('monitor')
     end
 
     #################################

data/lib/scout_apm/fake_store.rb

@@ -37,5 +37,8 @@ module ScoutApm
 
     def add_sampler(sampler)
     end
+
+    def tick!
+    end
   end
 end

data/lib/scout_apm/layaway.rb

@@ -52,12 +52,16 @@ module ScoutApm
     def write_reporting_period(reporting_period, files_limit = MAX_FILES_LIMIT)
       if at_layaway_file_limit?(files_limit)
         # This will happen constantly once we hit this case, so only log the first time
-        @wrote_layaway_limit_error_message ||= logger.error("Hit layaway file limit. Not writing to layaway file")
+        @wrote_layaway_limit_error_message ||= logger.error("Layaway: Hit layaway file limit. Not writing to layaway file")
         return false
       end
+      logger.debug("Layaway: wrote time period: #{reporting_period.timestamp}")
       filename = file_for(reporting_period.timestamp)
       layaway_file = LayawayFile.new(context, filename)
       layaway_file.write(reporting_period)
+    rescue => e
+      logger.debug("Layaway: error writing: #{e.message}, #{e.backtrace.inspect}")
+      raise e
     end
 
     # Claims a given timestamp by getting an exclusive lock on a timestamped
@@ -98,19 +102,19 @@ module ScoutApm
             if rps.any?
               yield rps
 
-              logger.debug("Deleting the now-reported layaway files for #{timestamp.to_s}")
+              logger.debug("Layaway: Deleting the now-reported files for #{timestamp.to_s}")
               delete_files_for(timestamp) # also removes the coodinator_file
             else
               File.unlink(coordinator_file)
-              logger.debug("No layaway files to report")
+              logger.debug("Layaway: No files to report")
             end
 
-            logger.debug("Checking for any Stale layaway files")
+            logger.debug("Layaway: Checking for any stale files")
             delete_stale_files(timestamp.to_time - STALE_AGE)
 
             true
           rescue Exception => e
-            logger.debug("Caught an exception in with_claim, with the coordination file locked: #{e.message}, #{e.backtrace.inspect}")
+            logger.debug("Layaway: Caught an exception in with_claim, with the coordination file locked: #{e.message}, #{e.backtrace.inspect}")
             raise
           ensure
             # Unlock the file when done!
@@ -126,7 +130,7 @@ module ScoutApm
 
     def delete_files_for(timestamp)
       all_files_for(timestamp).each { |layaway|
-        logger.debug("Deleting layaway file: #{layaway}")
+        logger.debug("Layaway: Deleting file: #{layaway}")
         File.unlink(layaway)
       }
     end
@@ -137,10 +141,10 @@ module ScoutApm
         compact.
         uniq.
         select { |timestamp| timestamp.to_i < older_than.strftime(TIME_FORMAT).to_i }.
-          tap  { |timestamps| logger.debug("Deleting stale layaway files with timestamps: #{timestamps.inspect}") }.
+          tap  { |timestamps| logger.debug("Layaway: Deleting stale files with timestamps: #{timestamps.inspect}") }.
         map    { |timestamp| delete_files_for(timestamp) }
     rescue => e
-      logger.debug("Problem deleting stale files: #{e.message}, #{e.backtrace.inspect}")
+      logger.debug("Layaway: Problem deleting stale files: #{e.message}, #{e.backtrace.inspect}")
     end
 
     private
@@ -206,8 +210,7 @@ module ScoutApm
         map{ |timestamp, list| [timestamp, list.length] }
       ]
 
-
-      logger.debug("Total in #{directory}: #{files_in_temp}. Total Layaway Files: #{all_filenames.size}.  By Timestamp: #{count_per_timestamp.inspect}")
+      logger.debug("Layaway: Total Files in #{directory}: #{files_in_temp}. Total Layaway Files: #{all_filenames.size}.  By Timestamp: #{count_per_timestamp.inspect}")
     end
   end
 end

data/lib/scout_apm/layaway_file.rb

@@ -6,6 +6,7 @@ module ScoutApm
 
     def initialize(context, path)
       @path = path
+      @context = context
     end
 
     def logger
@@ -17,7 +18,7 @@ module ScoutApm
       deserialize(data)
     rescue NameError, ArgumentError, TypeError => e
       # Marshal error
-      logger.info("Unable to load data from Layaway file, resetting.")
+      logger.info("LayawayFile: Unable to load data")
       logger.debug("#{e.message}, #{e.backtrace.join("\n\t")}")
       nil
     end

data/lib/scout_apm/reporting.rb

@@ -24,6 +24,9 @@ module ScoutApm
     #
     # At any given point, there is data in each of those steps, moving its way through the process
     def process_metrics
+      # Do any per-minute work necessary for the store
+      context.store.tick!
+
       # Write the previous minute's data to the shared-across-process layaway file.
       context.store.write_to_layaway(context.layaway)
 

data/lib/scout_apm/store.rb

@@ -88,10 +88,15 @@ module ScoutApm
       logger.debug("Writing to layaway#{" (Forced)" if force}")
 
       @reporting_periods.select { |time, rp| force || (time.timestamp < current_timestamp.timestamp) }.
-                         each   { |time, rp| collect_samplers(rp) }.
                          each   { |time, rp| write_reporting_period(layaway, time, rp) }
     end
 
+    # For each tick (minute), be sure we have a reporting period, and that samplers are run for it.
+    def tick!
+      rp = current_period
+      collect_samplers(rp)
+    end
+
     def write_reporting_period(layaway, time, rp)
       @mutex.synchronize {
         layaway.write_reporting_period(rp)

data/lib/scout_apm/tracked_request.rb

@@ -299,10 +299,6 @@ module ScoutApm
     def ensure_background_worker
       agent = ScoutApm::Agent.instance
       agent.start
-
-      if agent.start_background_worker(:quiet)
-        agent.logger.info("Force Started BG Worker")
-      end
     rescue => e
       true
     end

data/lib/scout_apm/version.rb

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

metadata

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