scout_apm 1.2.0.pre1 → 1.2.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 908063c42f604e0073f59f50d2fab04966553a20
-  data.tar.gz: 0bc50d1533419d27d62ca3692472d08e764536f7
+  metadata.gz: 7d6c0d1a7b075d83263b5dff40c8fbe2b4eab1fc
+  data.tar.gz: 5f73ca06343930f4bf382db202354ab7acaf12a8
 SHA512:
-  metadata.gz: f72beb94361832f4cd64faf3e618a83bef3989232ee68deb16472508ec82ef58b2cfea0973f95225d57b68c995a0724ded878acfa424c0c30b90f4b2d3cb63c0
-  data.tar.gz: 4dca8b6565dac5f29abe8deafa353da9512a5508981098e096b7cafb47585391cd77f8cb58a1f5c8a7e04250ff339e82d9c34d726af91d195b17bd2b11325ea0
+  metadata.gz: 01dced334f85cb89959a6cbd382ca46379d92294c0d559dabb30863db505ed2118e040eb96dd5e9d7266448dd491976f0e6639ac2727ca10edc0592cf6bb68cc
+  data.tar.gz: 9fadb1d142476b67db70d32d8e49446df6a3092aa6458d2606560f8e732ee441b753e428cce9693bf3287a6aeef37aca8c93d54529241f6529c324c9e6c3f6f3

data/lib/scout_apm.rb

@@ -8,6 +8,7 @@ require 'cgi'
 require 'logger'
 require 'net/http'
 require 'openssl'
+require 'pp'
 require 'set'
 require 'socket'
 require 'thread'

data/lib/scout_apm/layaway.rb

@@ -26,8 +26,11 @@ module ScoutApm
     def add_reporting_period(time, reporting_period)
       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)
+        existing_data.merge(time => reporting_period) {|key, old_val, new_val|
+          ScoutApm::Agent.instance.logger.debug("Merging Layaway - Time: #{key.to_s}, OldMetrics: #{old_val.metrics.length}, OldSlowTrans: #{old_val.slow_transactions.length}, NewMetrics: #{new_val.metrics.length}, NewSlowTrans: #{new_val.slow_transactions.length}" )
+          result = old_val.merge_metrics!(new_val.metrics).merge_slow_transactions!(new_val.slow_transactions)
+          ScoutApm::Agent.instance.logger.debug("Result - Metrics: #{result.metrics.length}, SlowTrans: #{result.slow_transactions.length}" )
+          result
         }
       end
     end

data/lib/scout_apm/request_manager.rb

@@ -14,12 +14,14 @@ module ScoutApm
       if req && req.recorded?
         nil
       else
+        ScoutApm::Agent.instance.logger.info("Found Existing Request")
         req
       end
     end
 
     # Create a new TrackedRequest object for this thread
     def self.create
+      ScoutApm::Agent.instance.logger.info("Starting a new Request")
       Thread.current[:scout_request] = TrackedRequest.new
     end
   end

data/lib/scout_apm/store.rb

@@ -7,6 +7,7 @@ module ScoutApm
     attr_reader :reporting_periods
 
     def initialize
+      @mutex = Mutex.new
       @reporting_periods = Hash.new { |h,k| h[k] = StoreReportingPeriod.new(k) }
     end
 
@@ -16,7 +17,9 @@ module ScoutApm
 
     # Save newly collected metrics
     def track!(metrics, options={})
-      reporting_periods[current_timestamp].merge_metrics!(metrics)
+      @mutex.synchronize {
+        reporting_periods[current_timestamp].merge_metrics!(metrics)
+      }
     end
 
     def track_one!(type, name, value, options={})
@@ -28,16 +31,20 @@ module ScoutApm
 
     # Save a new slow transaction
     def track_slow_transaction!(slow_transaction)
-      reporting_periods[current_timestamp].merge_slow_transactions!(slow_transaction)
+      @mutex.synchronize {
+        reporting_periods[current_timestamp].merge_slow_transactions!(slow_transaction)
+      }
     end
 
     # Take each completed reporting_period, and write it to the layaway passed
     def write_to_layaway(layaway)
-      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)
-                             }
+      @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)
+                              }
+      }
     end
   end
 

data/lib/scout_apm/tracked_request.rb

@@ -85,6 +85,7 @@ module ScoutApm
     # * Collect stackprof info
     # * Send the request off to be stored
     def stop_request
+      ScoutApm::Agent.instance.logger.debug("stop_request: #{annotations[:uri]}" )
       StackProf.stop
       @stackprof = StackProf.results
 

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "1.2.0.pre1"
+  VERSION = "1.2.0.pre2"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 1.2.0.pre1
+  version: 1.2.0.pre2
 platform: ruby
 authors:
 - Derek Haynes