pliny-librato 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d432f6b4a5b01f98e0ead542ae5e43c15823852d
-  data.tar.gz: d73cfb2d9a49fe63e6c71baa56385419a51d9464
+  metadata.gz: 071981ac7440cbc14b5460f37cd9fc3323fddf54
+  data.tar.gz: b8d68e261e3cbe9cb2c5f82570a97018eaec9007
 SHA512:
-  metadata.gz: fafc04571c053f2eb05cbfe0baba3e38ef698ecc6eacf0c516c6f7ec4d2adfc483e3243e1a76e55c7d147078fe6296cf50c0310c6c1daff18f1e7e4cc3cf6ebb
-  data.tar.gz: da313c6aa6c543af1921714b3c54839f12125741caabbb57b6826eb4e6a7e54a58c447615801d3e5071c01431beb6dbede6b8f5ab91d995122af35b3b31715e3
+  metadata.gz: bc150f45c85b638a513af396a2f4fbf90de287ffcb5597ea9e4a9ce952f80d2de8ea90d833f1e2dd9c43c0de6d6136029b461666b7aa067e4d894063f049ba07
+  data.tar.gz: 6cfa86f846a58a4c4af218ba123b2d4548c3832a49b6c3658dd322a831c44138892af3abef8f7e5808ec477301f8693d52fd189b7137454182ea4fa99bdcfb14

data/CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 0.6.1
+
+### Fixes
+
+- Fixes a thread safety issue introduced in 0.6.0. [#13](https://github.com/heroku/pliny-librato/pull/13)
+
 ## 0.6.0
 
 ### Added

data/lib/pliny/librato/metrics/backend.rb

@@ -9,11 +9,15 @@ module Pliny
       # from Pliny::Metrics onto a queue that gets submitted in batches.
       class Backend
         def initialize(source: nil, interval: 60)
+          @source        = source
           @interval      = interval
           @mutex         = Mutex.new
           @counter_cache = ::Librato::Collector::CounterCache.new(default_tags: nil)
           @aggregator    = ::Librato::Metrics::Aggregator.new
-          @librato_queue = ::Librato::Metrics::Queue.new(
+        end
+
+        def new_librato_queue
+          ::Librato::Metrics::Queue.new(
             source: source,
             skip_measurement_times: true
           )
@@ -46,7 +50,7 @@ module Pliny
 
         private
 
-        attr_reader :interval, :timer, :counter_cache, :aggregator, :librato_queue
+        attr_reader :source, :interval, :timer, :counter_cache, :aggregator
 
         def start_timer
           @timer = Thread.new do
@@ -58,12 +62,18 @@ module Pliny
         end
 
         def flush_librato
+          queue = new_librato_queue
+
           sync do
-            counter_cache.flush_to(librato_queue)
-            librato_queue.merge!(aggregator)
+            # Gather all counters / measures from the aggregator / counter_cache.
+            counter_cache.flush_to(queue)
+            queue.merge!(aggregator)
             aggregator.clear
           end
-          librato_queue.submit
+
+          # Submit explicitly, given the queue won't pass autosubmit_check
+          # (because @autosubmit_count=nil @autosubmit_interval=nil)
+          queue.submit
         end
 
         def sync(&block)

data/lib/pliny/librato/version.rb

@@ -1,5 +1,5 @@
 module Pliny
   module Librato
-    VERSION = '0.6.0'.freeze
+    VERSION = '0.6.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny-librato
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andrew Appleton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics