scout_apm 3.0.0.pre15 → 3.0.0.pre16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8acb94ef4095b224ee2d08a3d5a25410b104447b
-  data.tar.gz: 7d6493404c2dcd0346d6465d240cb428eb1f23ab
+  metadata.gz: 48d7c95db58d0248a431b10cb8501128892ed804
+  data.tar.gz: cee8126c3395ee5b45c2c42b4523d95e901f2817
 SHA512:
-  metadata.gz: e3f6cd0b3fb6413bc36a18b69a7e24ed6cb65d7f32f0b0d9ce5bef7b71b41640e80a34c8255540b9d8171312bca630bf35d79568ad7976bb6d0e83f7fe8f4253
-  data.tar.gz: 885869be52cb6836df31063bcb2818433511e6001115490e926256de2c70d924452a1feed70ad4a8501155388520ae8efff12a77584f653e6499ae269c2212e5
+  metadata.gz: 84c6a1840c5bbdba0770967ded0a6de09d396080c384044c723a53a872ce0b6fec3aa83bf930f8f8f3709f9a50f6b896e3641d53dbe7f9428769ff158b5a49d8
+  data.tar.gz: fe384265d5792579373739d283da2efbcd3eb4fb1f32b0e4281100154b8050b321f7c8bf751ca38fb136e06e5c33cab9366359c80a22e0d90ac9feed180140fa

data/lib/scout_apm.rb

@@ -15,7 +15,6 @@ require 'thread'
 require 'time'
 require 'yaml'
 require 'rbconfig'
-require 'webrick'
 
 #####################################
 # Gem Requires

data/lib/scout_apm/agent.rb

@@ -43,18 +43,18 @@ module ScoutApm
       install_background_job_integrations
       install_app_server_integration
 
-      # XXX: Should this happen at application start?
-      # Should this ever happen after fork?
-      # We start a thread in this, which can screw stuff up when we then fork.
-      #
-      # Save it into a variable to prevent it from ever running twice
-      @app_server_load ||= AppServerLoad.new(context).run
-
       logger.info "Scout Agent [#{ScoutApm::VERSION}] installed"
 
       context.installed!
 
       if ScoutApm::Agent::Preconditions.check?(context) || force
+        # XXX: Should this happen at application start?
+        # Should this ever happen after fork?
+        # We start a thread in this, which can screw stuff up when we then fork.
+        #
+        # Save it into a variable to prevent it from ever running twice
+        @app_server_load ||= AppServerLoad.new(context).run
+
         start
       end
     end
@@ -124,9 +124,7 @@ module ScoutApm
 
     def should_load_instruments?
       return true if context.config.value('dev_trace')
-      # XXX: If monitor is true, we want to install, right?
-      # return false if context.config.value('monitor')
-      context.environment.app_server_integration.found? || context.environment.background_job_integration
+      context.environment.app_server_integration.found? || context.environment.background_job_integrations.any?
     end
 
     #################################

data/lib/scout_apm/background_job_integrations/sidekiq.rb

@@ -102,10 +102,16 @@ module ScoutApm
           end
         elsif job_class == DELAYED_WRAPPER_KLASS
           begin
+            # Extract the info out of the wrapper
             yml = msg['args'].first
             deserialized_args = YAML.load(yml)
             klass, method, *rest = deserialized_args
-            job_class = [klass,method].map(&:to_s).join(".")
+
+            # If this is an instance of a class, get the class itself
+            # Prevents instances from coming through named like "#<Foo:0x007ffd7a9dd8a0>"
+            klass = klass.class unless klass.is_a? Module
+
+            job_class = [klass, method].map(&:to_s).join(".")
           rescue
             DELAYED_WRAPPER_KLASS
           end

data/lib/scout_apm/layaway.rb

@@ -51,7 +51,8 @@ module ScoutApm
 
     def write_reporting_period(reporting_period, files_limit = MAX_FILES_LIMIT)
       if at_layaway_file_limit?(files_limit)
-        logger.error("Hit layaway file limit. Not writing to layaway file")
+        # 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")
         return false
       end
       filename = file_for(reporting_period.timestamp)
@@ -59,9 +60,22 @@ module ScoutApm
       layaway_file.write(reporting_period)
     end
 
-    # Claims a given timestamp (getting a lock on a particular filename),
-    # then yields ReportingPeriods collected up from all the files.
-    # If the yield returns truthy, delete the layaway files that made it up.
+    # Claims a given timestamp by getting an exclusive lock on a timestamped
+    # coordinator file. The coordinator file never contains data, it's just a
+    # syncronization mechanism.
+    #
+    # Once the 'claim' is obtained:
+    #   * load and yield each ReportingPeriod from the layaway files.
+    #   * if there are reporting periods:
+    #     * yields any ReportingPeriods collected up from all the files.
+    #     * deletes all of the layaway files (including the coordinator) for the timestamp
+    #   * if not
+    #     * delete the coordinator
+    #   * remove any stale layaway files that may be hanging around.
+    #   * Finally unlock and ensure the coordinator file is cleared.
+    #
+    # If a claim file can't be obtained, return false without doing any work
+    # Another process is handling the reporting.
     def with_claim(timestamp)
       coordinator_file = glob_pattern(timestamp, :coordinator)
 
@@ -86,14 +100,14 @@ module ScoutApm
 
               logger.debug("Deleting the now-reported layaway files for #{timestamp.to_s}")
               delete_files_for(timestamp) # also removes the coodinator_file
-
-              logger.debug("Checking for any Stale layaway files")
-              delete_stale_files(timestamp.to_time - STALE_AGE)
             else
               File.unlink(coordinator_file)
               logger.debug("No layaway files to report")
             end
 
+            logger.debug("Checking for any Stale layaway 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}")

data/lib/scout_apm/remote/server.rb

@@ -17,6 +17,8 @@ module ScoutApm
       end
 
       def start
+        require 'webrick'
+
         @server = WEBrick::HTTPServer.new(
           :BindAddress => bind,
           :Port => port,

data/lib/scout_apm/version.rb

@@ -1,3 +1,3 @@
 module ScoutApm
-  VERSION = "3.0.0.pre15"
+  VERSION = "3.0.0.pre16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre15
+  version: 3.0.0.pre16
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -372,7 +372,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.5.2.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring