pliny-librato 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f64355e55742cd9a4eade6f2620a6fb64ad2e0eb
-  data.tar.gz: b1bb8a0c6a7809bb88c62750f108553c87548056
+  metadata.gz: d432f6b4a5b01f98e0ead542ae5e43c15823852d
+  data.tar.gz: d73cfb2d9a49fe63e6c71baa56385419a51d9464
 SHA512:
-  metadata.gz: d9f1e300b6f5defdd99af9b4ba57ad5a1773543d18f018ca639b68533efe68cec2e2d0d2d78f2e7a70c8e3a5ea184e6a4fb6ce2128e687b1cac727c41536674f
-  data.tar.gz: aa4c903d27c9da3ee019096e1a5f0c65114babf6785835164bc1413b9d9a47ab5ccf1e5bc9b7e8f1913039f48629af6080404fb20e5c40c755f577a1f1a3e728
+  metadata.gz: fafc04571c053f2eb05cbfe0baba3e38ef698ecc6eacf0c516c6f7ec4d2adfc483e3243e1a76e55c7d147078fe6296cf50c0310c6c1daff18f1e7e4cc3cf6ebb
+  data.tar.gz: da313c6aa6c543af1921714b3c54839f12125741caabbb57b6826eb4e6a7e54a58c447615801d3e5071c01431beb6dbede6b8f5ab91d995122af35b3b31715e3

data/CHANGELOG.md

@@ -6,6 +6,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
 
+## 0.6.0
+
+### Added
+
+- `Aggregator` and `CounterCache` from `librato-rack` are now leveraged
+  to reduce the number of metrics submitted for a given flush. This will
+  reduce the total number of measurements submitted, and have a much lower
+  impact on Librato's rate limiting.
+
+### Removed
+
+- `count` is no longer supported as an initialization option. The queue is
+   only flushed based on the provided `interval`, or by calling `#stop`.
+
 ## 0.5.2
 
 ### Fixed

data/README.md

@@ -24,13 +24,18 @@ Or install it yourself as:
 
 ## Usage
 
-Add a new initializer `config/initializers/librato.rb`:
+Update (or add) your metrics initializer `config/initializers/metrics.rb` with:
 
 ```ruby
-Librato::Metrics.authenticate(Config.librato_email, Config.librato_key)
-librato_backend = Pliny::Librato::Metrics::Backend.new(source: "myapp.production")
-librato_backend.start
-Pliny::Metrics.backends << librato_backend
+if Config.librato_email && Config.librato_key
+  Librato::Metrics.authenticate(Config.librato_email, Config.librato_key)
+  Pliny::Metrics.backends = [Pliny::Librato::Metrics::Backend.new(
+    source: "#{Config.app_name}.#{Config.app_env}",
+    interval: 30
+  ).tap(&:start)]
+else
+  Pliny::Metrics.backends = [Pliny::Metrics::Backends::Logger]
+end
 ```
 
 Now `Pliny::Metrics` methods will build a queue and automatically send metrics
@@ -43,8 +48,7 @@ Pliny::Metrics.measure(:bar) do
 end
 ```
 
-By default, it will send queued metrics every minute, and anytime the
-queue reaches 500 metrics. These settings can be configured on initialization.
+By default, it will send queued metrics every minute, but can be configured on initialization.
 
 ## Shutdown
 By default, any unsubmitted metrics on the queue will not be sent at shutdown.

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

@@ -1,5 +1,6 @@
 require 'librato/metrics'
 require 'pliny/error_reporters'
+require 'librato/collector'
 
 module Pliny
   module Librato
@@ -7,43 +8,45 @@ module Pliny
       # Implements the Pliny::Metrics.backends API. Puts any metrics sent
       # from Pliny::Metrics onto a queue that gets submitted in batches.
       class Backend
-        POISON_PILL = :'❨╯°□°❩╯︵┻━┻'
-
-        def initialize(source: nil, interval: 60, count: 500)
+        def initialize(source: nil, interval: 60)
           @interval      = interval
           @mutex         = Mutex.new
-          @metrics_queue = Queue.new
+          @counter_cache = ::Librato::Collector::CounterCache.new(default_tags: nil)
+          @aggregator    = ::Librato::Metrics::Aggregator.new
           @librato_queue = ::Librato::Metrics::Queue.new(
-            source:           source,
-            autosubmit_count: count
+            source: source,
+            skip_measurement_times: true
           )
         end
 
         def report_counts(counts)
-          metrics_queue.push(counts)
+          sync do
+            counts.each do |name, val|
+              counter_cache.increment(name, val)
+            end
+          end
         end
 
         def report_measures(measures)
-          metrics_queue.push(measures)
+          sync do
+            aggregator.add(measures)
+          end
         end
 
         def start
-          start_counter
           start_timer
           self
         end
 
         def stop
-          metrics_queue.push(POISON_PILL)
           # Ensure timer is not running when we terminate it
           sync { timer.terminate }
-          counter.join
           flush_librato
         end
 
         private
 
-        attr_reader :interval, :timer, :counter, :metrics_queue, :librato_queue
+        attr_reader :interval, :timer, :counter_cache, :aggregator, :librato_queue
 
         def start_timer
           @timer = Thread.new do
@@ -54,21 +57,13 @@ module Pliny
           end
         end
 
-        def start_counter
-          @counter = Thread.new do
-            loop do
-              msg = metrics_queue.pop
-              msg == POISON_PILL ? break : enqueue_librato(msg)
-            end
-          end
-        end
-
-        def enqueue_librato(msg)
-          sync { librato_queue.add(msg) }
-        end
-
         def flush_librato
-          sync { librato_queue.submit }
+          sync do
+            counter_cache.flush_to(librato_queue)
+            librato_queue.merge!(aggregator)
+            aggregator.clear
+          end
+          librato_queue.submit
         end
 
         def sync(&block)

data/lib/pliny/librato/version.rb

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

data/pliny-librato.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'librato-metrics', '~> 2.0'
   spec.add_dependency 'pliny',           '>= 0.20.0'
+  spec.add_dependency 'librato-rack',    '~> 2.0'
 
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'pry', '~> 0.10'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny-librato
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Andrew Appleton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librato-metrics
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: librato-rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement