scout_apm 0.1.12 → 0.1.13

data/lib/scout_apm/instruments/net_http.rb

@@ -1,14 +1,37 @@
-if defined?(::Net) && defined?(Net::HTTP)
-  ScoutApm::Agent.instance.logger.debug "Instrumenting Net::HTTP"
-  Net::HTTP.class_eval do
-    include ScoutApm::Tracer
-
-    def request_with_scout_instruments(*args,&block)
-      self.class.instrument("HTTP/request", :desc => "#{(@address+args.first.path.split('?').first)[0..99]}") do
-        request_without_scout_instruments(*args,&block)
+module ScoutApm
+  module Instruments
+    class NetHttp
+      attr_reader :logger
+
+      def initalize(logger=ScoutApm::Agent.instance.logger)
+        @logger = logger
+        @installed = false
+      end
+
+      def installed?
+        @installed
+      end
+
+      def install
+        @installed = true
+
+        if defined?(::Net) && defined?(::Net::HTTP)
+          ScoutApm::Agent.instance.logger.debug "Instrumenting Net::HTTP"
+
+          ::Net::HTTP.class_eval do
+            include ScoutApm::Tracer
+
+            def request_with_scout_instruments(*args,&block)
+              self.class.instrument("HTTP/request", :desc => "#{(@address+args.first.path.split('?').first)[0..99]}") do
+                request_without_scout_instruments(*args,&block)
+              end
+            end
+            alias request_without_scout_instruments request
+            alias request request_with_scout_instruments
+          end
+        end
+
       end
     end
-    alias request_without_scout_instruments request
-    alias request request_with_scout_instruments
   end
 end

data/lib/scout_apm/layaway.rb

@@ -4,97 +4,101 @@
 #
 # Data is stored in a Hash, where the keys are Time.to_i on the minute. The value is a Hash {:metrics => Hash, :slow_transactions => Array}.
 # When depositing data, the new data is either merged with an existing time or placed in a new key.
-class ScoutApm::Layaway
-  attr_accessor :file
-  def initialize
-    @file = ScoutApm::LayawayFile.new
-  end
+module ScoutApm
+  class Layaway
+    attr_accessor :file
+
+    def initialize
+      @file = ScoutApm::LayawayFile.new
+    end
+
+    def deposit_and_deliver
+      new_metrics = ScoutApm::Agent.instance.store.metric_hash
+      log_deposited_metrics(new_metrics)
+      log_deposited_slow_transactions(ScoutApm::Agent.instance.store.slow_transactions)
+      to_deliver = {}
+      file.read_and_write do |old_data|
+        old_data ||= Hash.new
+        # merge data
+        # if (1) there's data in the file and (2) there isn't any data yet for the current minute, this means we've
+        # collected all metrics for the previous slots and we're ready to deliver.
+        #
+        # Example w/2 processes:
+        #
+        # 12:00:34 ---
+        # Process 1: old_data.any? => false, so deposits.
+        # Process 2: old_data_any? => true and old_data[12:00].nil? => false, so deposits.
+        #
+        # 12:01:34 ---
+        # Process 1: old_data.any? => true and old_data[12:01].nil? => true, so delivers metrics.
+        # Process 2: old_data.any? => true and old_data[12:01].nil? => false, so deposits.
+        if old_data.any? and old_data[slot].nil?
+          to_deliver = old_data
+          old_data = Hash.new
+        elsif old_data.any?
+          ScoutApm::Agent.instance.logger.debug "Not yet time to deliver payload for slot [#{Utils::Time.to_s(old_data.keys.sort.last)}]"
+        else
+          ScoutApm::Agent.instance.logger.debug "There is no data in the layaway file to deliver."
+        end
+        old_data[slot]=ScoutApm::Agent.instance.store.merge_data_and_clear(old_data[slot] || {:metrics => {}, :slow_transactions => []})
+        log_saved_data(old_data,new_metrics)
+        old_data
+      end
+      to_deliver.any? ? validate_data(to_deliver) : {}
+    end
 
-  def deposit_and_deliver
-    new_metrics = ScoutApm::Agent.instance.store.metric_hash
-    log_deposited_metrics(new_metrics)
-    log_deposited_slow_transactions(ScoutApm::Agent.instance.store.slow_transactions)
-    to_deliver = {}
-    file.read_and_write do |old_data|
-      old_data ||= Hash.new
-      # merge data
-      # if (1) there's data in the file and (2) there isn't any data yet for the current minute, this means we've
-      # collected all metrics for the previous slots and we're ready to deliver.
-      #
-      # Example w/2 processes:
-      #
-      # 12:00:34 ---
-      # Process 1: old_data.any? => false, so deposits.
-      # Process 2: old_data_any? => true and old_data[12:00].nil? => false, so deposits.
-      #
-      # 12:01:34 ---
-      # Process 1: old_data.any? => true and old_data[12:01].nil? => true, so delivers metrics.
-      # Process 2: old_data.any? => true and old_data[12:01].nil? => false, so deposits.
-      if old_data.any? and old_data[slot].nil?
-        to_deliver = old_data
-        old_data = Hash.new
-      elsif old_data.any?
-        ScoutApm::Agent.instance.logger.debug "Not yet time to deliver payload for slot [#{Time.at(old_data.keys.sort.last).strftime("%m/%d/%y %H:%M:%S %z")}]"
+    # Ensures the data we're sending to the server isn't stale.
+    # This can occur if the agent is collecting data, and app server goes down w/data in the local storage.
+    # When it is restarted later data will remain in local storage but it won't be for the current reporting interval.
+    #
+    # If the data is stale, an empty Hash is returned. Otherwise, the data from the most recent slot is returned.
+    def validate_data(data)
+      data = data.to_a.sort
+      now = Time.now
+      if (most_recent = data.first.first) < now.to_i - 2*60
+        ScoutApm::Agent.instance.logger.debug "Local Storage is stale (#{Utils::Time.to_s(most_recent)}). Not sending data."
+        {}
       else
-        ScoutApm::Agent.instance.logger.debug "There is no data in the layaway file to deliver."
+        data.first.last
       end
-      old_data[slot]=ScoutApm::Agent.instance.store.merge_data_and_clear(old_data[slot] || {:metrics => {}, :slow_transactions => []})
-      log_saved_data(old_data,new_metrics)
-      old_data
+    rescue
+      ScoutApm::Agent.instance.logger.debug $!.message
+      ScoutApm::Agent.instance.logger.debug $!.backtrace
     end
-    to_deliver.any? ? validate_data(to_deliver) : {}
-  end
 
-  # Ensures the data we're sending to the server isn't stale.
-  # This can occur if the agent is collecting data, and app server goes down w/data in the local storage.
-  # When it is restarted later data will remain in local storage but it won't be for the current reporting interval.
-  #
-  # If the data is stale, an empty Hash is returned. Otherwise, the data from the most recent slot is returned.
-  def validate_data(data)
-    data = data.to_a.sort
-    now = Time.now
-    if (most_recent = data.first.first) < now.to_i - 2*60
-      ScoutApm::Agent.instance.logger.debug "Local Storage is stale (#{Time.at(most_recent).strftime("%m/%d/%y %H:%M:%S %z")}). Not sending data."
-      {}
-    else
-      data.first.last
+    # Data is stored under timestamp-keys, aligned to the beginning of the
+    # current minute
+    def slot
+      t = Time.now
+      t -= t.sec
+      t.to_i
     end
-  rescue
-    ScoutApm::Agent.instance.logger.debug $!.message
-    ScoutApm::Agent.instance.logger.debug $!.backtrace
-  end
 
-  # Data is stored under timestamp-keys (without the second).
-  def slot
-    t = Time.now
-    t -= t.sec
-    t.to_i
-  end
+    def log_deposited_metrics(new_metrics)
+      request_count = new_metrics.
+        to_a.
+        select    { |meta, stats| meta.metric_name =~ /\AController/ }.
+        map       { |meta, stats| stats.call_count }.
+        inject(0) { |total, i| total + i }
 
-  def log_deposited_metrics(new_metrics)
-    controller_count = 0
-    new_metrics.each do |meta,stats|
-      if meta.metric_name =~ /\AController/
-        controller_count += stats.call_count
-      end
+      ScoutApm::Agent.instance.logger.debug "Depositing #{request_count} requests into #{Utils::Time.to_s(slot)} slot."
     end
-    ScoutApm::Agent.instance.logger.debug "Depositing #{controller_count} requests into #{Time.at(slot).strftime("%m/%d/%y %H:%M:%S %z")} slot."
-  end
 
-  def log_deposited_slow_transactions(new_slow_transactions)
-    ScoutApm::Agent.instance.logger.debug "Depositing #{new_slow_transactions.size} slow transactions into #{Time.at(slot).strftime("%m/%d/%y %H:%M:%S %z")} slot."
-  end
+    def log_deposited_slow_transactions(new_slow_transactions)
+      ScoutApm::Agent.instance.logger.debug "Depositing #{new_slow_transactions.size} slow transactions into #{Utils::Time.to_s(slot)} slot."
+    end
 
-  def log_saved_data(old_data,new_metrics)
-    ScoutApm::Agent.instance.logger.debug "Saving the following #{old_data.size} time slots locally:"
-    old_data.each do |k,v|
-      controller_count = 0
-      new_metrics.each do |meta,stats|
-        if meta.metric_name =~ /\AController/
-          controller_count += stats.call_count
+    def log_saved_data(old_data,new_metrics)
+      ScoutApm::Agent.instance.logger.debug "Saving the following #{old_data.size} time slots locally:"
+      old_data.each do |k,v|
+        controller_count = 0
+        new_metrics.each do |meta,stats|
+          if meta.metric_name =~ /\AController/
+            controller_count += stats.call_count
+          end
         end
+        ScoutApm::Agent.instance.logger.debug "#{Utils::Time.to_s(k)} => #{controller_count} requests and #{v[:slow_transactions].size} slow transactions"
       end
-      ScoutApm::Agent.instance.logger.debug "#{Time.at(k).strftime("%m/%d/%y %H:%M:%S %z")} => #{controller_count} requests and #{v[:slow_transactions].size} slow transactions"
     end
   end
 end

data/lib/scout_apm/layaway_file.rb

@@ -1,72 +1,74 @@
 # Logic for the serialized file access
-class ScoutApm::LayawayFile
-  def path
-    "#{ScoutApm::Agent.instance.default_log_path}/scout_apm.db"
-  end
+module ScoutApm
+  class LayawayFile
+    def path
+      "#{ScoutApm::Agent.instance.default_log_path}/scout_apm.db"
+    end
 
-  def dump(object)
-    Marshal.dump(object)
-  end
+    def dump(object)
+      Marshal.dump(object)
+    end
 
-  def load(dump)
-    if dump.size == 0
-      ScoutApm::Agent.instance.logger.debug("No data in layaway file.")
-      return nil
+    def load(dump)
+      if dump.size == 0
+        ScoutApm::Agent.instance.logger.debug("No data in layaway file.")
+        return nil
+      end
+      Marshal.load(dump)
+    rescue ArgumentError, TypeError => e
+      ScoutApm::Agent.instance.logger.debug("Error loading data from layaway file: #{e.inspect}")
+      ScoutApm::Agent.instance.logger.debug(e.backtrace.inspect)
+      nil
     end
-    Marshal.load(dump)
-  rescue ArgumentError, TypeError => e
-    ScoutApm::Agent.instance.logger.debug("Error loading data from layaway file: #{e.inspect}")
-    ScoutApm::Agent.instance.logger.debug(e.backtrace.inspect)
-    nil
-  end
 
-  def read_and_write
-    File.open(path, File::RDWR | File::CREAT) do |f|
-      f.flock(File::LOCK_EX)
-      begin
-        result = (yield get_data(f))
-        f.rewind
-        f.truncate(0)
-        if result
-          write(f, dump(result))
+    def read_and_write
+      File.open(path, File::RDWR | File::CREAT) do |f|
+        f.flock(File::LOCK_EX)
+        begin
+          result = (yield get_data(f))
+          f.rewind
+          f.truncate(0)
+          if result
+            write(f, dump(result))
+          end
+        ensure
+          f.flock(File::LOCK_UN)
         end
-      ensure
-        f.flock(File::LOCK_UN)
       end
+    rescue Errno::ENOENT, Exception  => e
+      ScoutApm::Agent.instance.logger.error("Unable to access the layaway file [#{e.message}]. The user running the app must have read+write access.")
+      ScoutApm::Agent.instance.logger.debug(e.backtrace.split("\n"))
+      # ensure the in-memory metric hash is cleared so data doesn't continue to accumulate.
+      ScoutApm::Agent.instance.store.metric_hash = {}
     end
-  rescue Errno::ENOENT, Exception  => e
-    ScoutApm::Agent.instance.logger.error("Unable to access the layaway file [#{e.message}]. The user running the app must have read+write access.")
-    ScoutApm::Agent.instance.logger.debug(e.backtrace.split("\n"))
-    # ensure the in-memory metric hash is cleared so data doesn't continue to accumulate.
-    ScoutApm::Agent.instance.store.metric_hash = {}
-  end
 
-  def get_data(f)
-    data = read_until_end(f)
-    result = load(data)
-    f.truncate(0)
-    result
-  end
+    def get_data(f)
+      data = read_until_end(f)
+      result = load(data)
+      f.truncate(0)
+      result
+    end
 
-  def write(f, string)
-    result = 0
-    while (result < string.length)
-      result += f.write_nonblock(string)
+    def write(f, string)
+      result = 0
+      while (result < string.length)
+        result += f.write_nonblock(string)
+      end
+    rescue Errno::EAGAIN, Errno::EINTR
+      IO.select(nil, [f])
+      retry
     end
-  rescue Errno::EAGAIN, Errno::EINTR
-    IO.select(nil, [f])
-    retry
-  end
 
-  def read_until_end(f)
-    contents = ""
-    while true
-      contents << f.read_nonblock(10_000)
+    def read_until_end(f)
+      contents = ""
+      while true
+        contents << f.read_nonblock(10_000)
+      end
+    rescue Errno::EAGAIN, Errno::EINTR
+      IO.select([f])
+      retry
+    rescue EOFError
+      contents
     end
-  rescue Errno::EAGAIN, Errno::EINTR
-    IO.select([f])
-    retry
-  rescue EOFError
-    contents
   end
 end

data/lib/scout_apm/server_integrations/unicorn.rb

@@ -11,7 +11,14 @@ module ScoutApm
         :unicorn
       end
 
-      def forking?; true; end
+      def forking?
+        return true unless (defined?(::Unicorn) && defined?(::Unicorn::Configurator))
+        ObjectSpace.each_object(::Unicorn::Configurator).first[:preload_app].tap {|x|
+          logger.info "Unicorn is forking? #{x}"
+        }
+      rescue
+        true
+      end
 
       def present?
         if defined?(::Unicorn) && defined?(::Unicorn::HttpServer)
@@ -37,3 +44,4 @@ module ScoutApm
     end
   end
 end
+