scout_apm 2.4.15 → 2.4.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28790463a370f23fbe18e2147ee6f930f9cb2e5c
-  data.tar.gz: 73d2ada7c62fe31cdeac67101f1a2edee66a6577
+  metadata.gz: f3f60117002c54a06a541a4b23f585aa84ac6b71
+  data.tar.gz: 1452280fc1a2c1a9804d79a853dfbc34f1ab957e
 SHA512:
-  metadata.gz: 65ec65774a64c65738bab1281ecfb800997991b8d95b8ab9ab2ee2748928afdb8e9ce0ed6480110d31a3f52e5f08ab11b80afbeca9bcc65b302979916f5a0e8a
-  data.tar.gz: 0e77807792aa8f0650febc608365ae0821d3f6a34ed181704a331c63a064e3e3c3e83b94752e2f468ccdde66a12b4579ca2d8b6c06ddc6ab6bddb71c503f411c
+  metadata.gz: 693a5899262d98f0b78902f7694840ba6543643ae8ac4ad947fec3e5857470d9dee86842b5be970f6c7c1d93c4352c5cd0aec3c7688af096773d8a734659f163
+  data.tar.gz: b1861d620b74275e6387fe0b3ecce55a9596bc79f7499edcf6a216434afe252b724e596309a6bfac7b1293f3a4c69e881e64697803459b48ff0c263fd427687a

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 2.4.16
+
+* Fix synchronization bug in Store (#205, PR #210)
+
 # 2.4.15
 
 * Fix bug that causes no data to be reported to Scout when DataDog is installed (#211)

data/lib/scout_apm/store.rb

@@ -5,8 +5,10 @@ module ScoutApm
   class Store
     def initialize(context)
       @context = context
-      @mutex = Mutex.new
-      @reporting_periods = Hash.new { |h,k| h[k] = StoreReportingPeriod.new(k, @context) }
+      @mutex = Monitor.new
+      @reporting_periods = Hash.new { |h,k|
+        @mutex.synchronize { h[k] = StoreReportingPeriod.new(k, @context) }
+      }
       @samplers = []
     end
 
@@ -87,8 +89,13 @@ module ScoutApm
     def write_to_layaway(layaway, force=false)
       logger.debug("Writing to layaway#{" (Forced)" if force}")
 
-      @reporting_periods.select { |time, rp| force || (time.timestamp < current_timestamp.timestamp) }.
-                         each   { |time, rp| write_reporting_period(layaway, time, rp) }
+      to_report = @mutex.synchronize {
+        @reporting_periods.select { |time, rp|
+          force || (time.timestamp < current_timestamp.timestamp)
+        }
+      }
+
+      to_report.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.
@@ -98,14 +105,12 @@ module ScoutApm
     end
 
     def write_reporting_period(layaway, time, rp)
-      @mutex.synchronize {
         layaway.write_reporting_period(rp)
-      }
     rescue => e
       logger.warn("Failed writing data to layaway file: #{e.message} / #{e.backtrace}")
     ensure
       logger.debug("Before delete, reporting periods length: #{@reporting_periods.size}")
-      deleted_items = @reporting_periods.delete(time)
+      deleted_items = @mutex.synchronize { @reporting_periods.delete(time) }
       logger.debug("After delete, reporting periods length: #{@reporting_periods.size}. Did delete #{deleted_items}")
     end
     private :write_reporting_period

data/lib/scout_apm/version.rb

@@ -1,4 +1,4 @@
 module ScoutApm
-  VERSION = "2.4.15"
+  VERSION = "2.4.16"
 end
 

data/lib/scout_apm.rb

@@ -6,6 +6,7 @@ end
 #####################################
 require 'cgi'
 require 'logger'
+require 'monitor'
 require 'net/http'
 require 'openssl'
 require 'pp'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_apm
 version: !ruby/object:Gem::Version
-  version: 2.4.15
+  version: 2.4.16
 platform: ruby
 authors:
 - Derek Haynes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-07 00:00:00.000000000 Z
+date: 2018-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -390,8 +390,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: scout_apm
-rubygems_version: 2.4.5.5
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby application performance monitoring
-test_files: []
+test_files:
+- test/data/config_test_1.yml
+- test/test_helper.rb
+- test/unit/agent_test.rb
+- test/unit/background_job_integrations/sidekiq_test.rb
+- test/unit/config_test.rb
+- test/unit/context_test.rb
+- test/unit/db_query_metric_set_test.rb
+- test/unit/db_query_metric_stats_test.rb
+- test/unit/environment_test.rb
+- test/unit/extensions/periodic_callbacks_test.rb
+- test/unit/extensions/transaction_callbacks_test.rb
+- test/unit/fake_store_test.rb
+- test/unit/git_revision_test.rb
+- test/unit/histogram_test.rb
+- test/unit/ignored_uris_test.rb
+- test/unit/instruments/active_record_instruments_test.rb
+- test/unit/instruments/net_http_test.rb
+- test/unit/instruments/percentile_sampler_test.rb
+- test/unit/layaway_test.rb
+- test/unit/layer_children_set_test.rb
+- test/unit/layer_converters/depth_first_walker_test.rb
+- test/unit/layer_converters/metric_converter_test.rb
+- test/unit/layer_converters/stubs.rb
+- test/unit/limited_layer_test.rb
+- test/unit/logger_test.rb
+- test/unit/metric_set_test.rb
+- test/unit/remote/test_message.rb
+- test/unit/remote/test_router.rb
+- test/unit/remote/test_server.rb
+- test/unit/scored_item_set_test.rb
+- test/unit/serializers/payload_serializer_test.rb
+- test/unit/slow_job_policy_test.rb
+- test/unit/slow_request_policy_test.rb
+- test/unit/sql_sanitizer_test.rb
+- test/unit/store_test.rb
+- test/unit/tracer_test.rb
+- test/unit/tracked_request_test.rb
+- test/unit/transaction_test.rb
+- test/unit/transaction_time_consumed_test.rb
+- test/unit/utils/active_record_metric_name_test.rb
+- test/unit/utils/backtrace_parser_test.rb
+- test/unit/utils/numbers_test.rb
+- test/unit/utils/scm.rb