scout_apm 1.2.0.pre9 → 1.2.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22b9c34f9b51714fc5ca244de10e9029839b323b
-  data.tar.gz: 7f29e1ccdc6cc7630c9264236fca46c685800521
+  metadata.gz: c329d301fd9c8155277eb3be6398d8e357284e72
+  data.tar.gz: de1c84ebc4232d67a1f9e4a7d6e9de1c93b5202a
 SHA512:
-  metadata.gz: ff14d5a54dd4f6fcd8d6f2035cb6bed4870d40b06bc4b4edd3f2ddffd5af3a95104a0c72a5fb7bd17daa2ec6308dd67b9b2a349108d482926c3cc120f61ee01a
-  data.tar.gz: c5f7941d4697bf5fb91fee5d19ffad362c65af3e6afaaad534e5a31589bf84228a146b90dfa13069f195134b5421aaf49bf1b57ac7569f630d95f323b2edcfcd
+  metadata.gz: dc8796324d43f82e2c54600a97adc8dc3f5dfe2151cb4ca1884167595ab592baff6e71ece59ebdef6b3761ddfe1f58a4df48841426c02f366151c38579659a5c
+  data.tar.gz: d9d828f8c65d7f0fd3921e581db8cfda64253b4af6d1b2e913daf980061cff650afbead986b24553f18029a58f2416c7e0a1fda8e0268bbb652890471e5e4227

data/lib/scout_apm/agent/reporting.rb

@@ -25,8 +25,11 @@ module ScoutApm
       end
 
       # In a running app, one process will get one period ready for delivery, the others will see 0.
+      MAX_AGE_TO_REPORT = 10.minutes
+
       def report_to_server
         reporting_periods = layaway.periods_ready_for_delivery
+        reporting_periods.reject! {|rp| rp.timestamp.age_in_seconds > MAX_AGE_TO_REPORT }
         reporting_periods.each do |rp|
           deliver_period(rp)
         end
@@ -40,6 +43,7 @@ module ScoutApm
           :unique_id     => ScoutApm::Utils::UniqueId.simple,
           :agent_version => ScoutApm::VERSION,
           :agent_time    => reporting_period.timestamp.to_s,
+          :agent_pid     => Process.pid,
         }
 
         log_deliver(metrics, slow_transactions, metadata)

data/lib/scout_apm/background_worker.rb

@@ -39,7 +39,7 @@ module ScoutApm
           end
         end
       rescue
-        ScoutApm::Agent.instance.logger.debug "Background Worker Exception!!!!!!!"
+        ScoutApm::Agent.instance.logger.debug "Background Worker Exception!"
         ScoutApm::Agent.instance.logger.debug $!.message
         ScoutApm::Agent.instance.logger.debug $!.backtrace
       end

data/lib/scout_apm/layaway.rb

@@ -27,13 +27,12 @@ module ScoutApm
       file.read_and_write do |existing_data|
         existing_data ||= Hash.new
         existing_data.merge(time => reporting_period) {|key, old_val, new_val|
-          old_val.merge_metrics!(new_val.metrics).merge_slow_transactions!(new_val.slow_transactions)
+          old_val.merge_metrics!(new_val.metrics_payload).merge_slow_transactions!(new_val.slow_transactions)
         }
       end
     end
 
     REPORTING_INTERVAL = 60 # seconds
-    MAX_INTERVALS = 5
 
     # Returns an array of ReportingPeriod objects that are ready to be pushed to the server
     def periods_ready_for_delivery

data/lib/scout_apm/layer_converter.rb

@@ -140,16 +140,16 @@ module ScoutApm
                          {:scope => scope_layer.legacy_metric_name}
                        end
 
-        meta_options.merge!(:desc => layer.desc) if layer.desc
 
         # Specific Metric
+        meta_options.merge!(:desc => layer.desc) if layer.desc
         meta = MetricMeta.new(layer.legacy_metric_name, meta_options)
         meta.extra.merge!(:backtrace => layer.backtrace) if layer.backtrace
         metric_hash[meta] ||= MetricStats.new( meta_options.has_key?(:scope) )
         stat = metric_hash[meta]
         stat.update!(layer.total_call_time, layer.total_exclusive_time)
 
-        # Merged Metric (no specifics, just sum up by type
+        # Merged Metric (no specifics, just sum up by type)
         meta = MetricMeta.new("#{layer.type}/all")
         metric_hash[meta] ||= MetricStats.new(false)
         stat = metric_hash[meta]

data/lib/scout_apm/request_queue_time.rb

@@ -20,6 +20,9 @@ module ScoutApm
       request_start = root_layer.start_time
       queue_time = (request_start - parsed_start).to_f
 
+      # If we end up with a negative value, just bail out and don't report anything
+      return {} if queue_time < 0
+
       meta = MetricMeta.new("QueueTime/Request", {:scope => scope_layer.legacy_metric_name})
       stat = MetricStats.new(true)
       stat.update!(queue_time)

data/lib/scout_apm/store.rb

@@ -40,10 +40,10 @@ module ScoutApm
     def write_to_layaway(layaway)
       @mutex.synchronize {
         reporting_periods.select { |time, rp| time.timestamp < current_timestamp.timestamp}.
-                          each { |time, reporting_period|
-                                layaway.add_reporting_period(time, reporting_period)
-                                reporting_periods.delete(time)
-                              }
+                          each   { |time, rp|
+                                   layaway.add_reporting_period(time, rp)
+                                   reporting_periods.delete(time)
+                                 }
       }
     end
   end
@@ -77,17 +77,6 @@ module ScoutApm
 
   # One period of Storage. Typically 1 minute
   class StoreReportingPeriod
-    # A hash of { MetricMeta => MetricStat }
-    # This holds metrics for specific parts of the application.
-    # "Controller/user/index", "ActiveRecord/SQL/users/find", "View/users/_gravatar" and similar.
-    #
-    # If over the course of a minute a metric is called more than once (very likely), it will be
-    # combined with the others of the same type, and summed/calculated.  The merging logic is in
-    # MetricStats
-    #
-    # Use the accessor function `metrics_payload` for most uses. It includes the calculated aggregate values
-    attr_reader :metrics
-
     # An array of SlowTransaction objects
     attr_reader :slow_transactions
 
@@ -96,16 +85,17 @@ module ScoutApm
     attr_reader :timestamp
 
     def initialize(timestamp)
-      @metrics = Hash.new
-      @slow_transactions = Array.new
       @timestamp = timestamp
+
+      @slow_transactions = Array.new
+      @aggregate_metrics = Hash.new
     end
 
     #################################
     # Add metrics as they are recorded
     #################################
     def merge_metrics!(metrics)
-      @metrics.merge!(metrics) { |key, old_stat, new_stat| old_stat.combine!(new_stat) }
+      metrics.each { |metric| absorb(metric) }
       self
     end
 
@@ -118,7 +108,7 @@ module ScoutApm
     # Retrieve Metrics for reporting
     #################################
     def metrics_payload
-      aggregate_metrics
+      @aggregate_metrics
     end
 
     def slow_transactions_payload
@@ -136,22 +126,20 @@ module ScoutApm
     # A hash of { MetricMeta => MetricStat }
     # This represents the aggregate metrics over the course of the minute.
     # "ActiveRecord/all", "View/all", "HTTP/all" and similar
-    def aggregate_metrics
-      hsh = Hash.new {|h,k| h[k] = MetricStats.new }
-
-      @metrics.inject(hsh) do |result, (meta, stat)|
-        if PASSTHROUGH_METRICS.include?(meta.type) # Leave as-is, don't attempt to combine
-          hsh[meta] = stat
-        elsif meta.type == "Errors" # Sadly special cased, we want both raw and aggregate values
-          hsh[meta] = stat
-          agg_meta = MetricMeta.new("Errors/Request", :scope => meta.scope)
-          hsh[agg_meta].combine!(stat)
-        else # Combine down to a single /all key
-          agg_meta = MetricMeta.new("#{meta.type}/all", :scope => meta.scope)
-          hsh[agg_meta].combine!(stat)
-        end
-
-        hsh
+    def absorb(metric)
+      meta, stat = metric
+
+      if PASSTHROUGH_METRICS.include?(meta.type) # Leave as-is, don't attempt to combine
+        @aggregate_metrics[meta] = stat
+      elsif meta.type == "Errors" # Sadly special cased, we want both raw and aggregate values
+        @aggregate_metrics[meta] = stat
+        agg_meta = MetricMeta.new("Errors/Request", :scope => meta.scope)
+        @aggregate_metrics[agg_meta] ||= MetricStats.new
+        @aggregate_metrics[agg_meta].combine!(stat)
+      else # Combine down to a single /all key
+        agg_meta = MetricMeta.new("#{meta.type}/all", :scope => meta.scope)
+        @aggregate_metrics[agg_meta] ||= MetricStats.new
+        @aggregate_metrics[agg_meta].combine!(stat)
       end
     end
   end

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0.pre9"
+  VERSION = "1.2.0.pre10"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre9
+  version: 1.2.0.pre10
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest