pliny-librato 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d70a0b565fba48c9b53ad27bc88b6e9beacd7f94
-  data.tar.gz: 1e40f86dcdf0316c8792b0f667b42994a06d2291
+  metadata.gz: 362932985964ab9a8467c82061e5a6950a6d12ef
+  data.tar.gz: 1243663968f6966454a4a537185654f30725f9c3
 SHA512:
-  metadata.gz: d35115fbe573b69129f382e8b4f827ea83d21bebdc8955b0b4ac095643f19b4d7eb9daf62706260c5983d6ec6df84a88822c3448662df040b6e513f3bdf6f65a
-  data.tar.gz: a710b8488472f98981542272dbb371911364a6f04e64ce4063f638f3bf6f1ef90111e14854c493e449f1f2fcfab0fd23886346632ff865f8a65b89ccdb95285c
+  metadata.gz: c666a43801fda7e4730e8933dfdec3c76aecb2d31a681d6448f08506ece4c45c4bfcba8873aec9ce5e31b8b5ca6528206fe1e4a9f119a4755f60103b94d47f43
+  data.tar.gz: 96e7b31fe8e42ef8e7bc61b14306546ebaea28547c607f4d5c638b5b3711c4d6fd4e83429227a044fca6f17a35149a5224984de4c9a7ee6c35cc4e3b8a604e1b

data/CHANGELOG.md

@@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## 0.4.0
+
+### Added
+
+- The backend now queues metrics and sends in batches
+- You can specify the `count` and `interval` for batch sends when initializing
+  the backend.
+
+### Removed
+
+- `concurrent-ruby` is no longer a dependency.
+
 ## 0.3.0
 
 ### Changed
@@ -15,4 +27,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
   "count#" entries, which are also submitted as gauges.
 
 ## 0.2.0
+
+### Changed
+
 - Catch and report errors in async calls to the Librato API

data/Gemfile.lock

@@ -1,8 +1,7 @@
 PATH
   remote: .
   specs:
-    pliny-librato (0.2.0)
-      concurrent-ruby (~> 1.0)
+    pliny-librato (0.3.0)
       librato-metrics (~> 2.0)
       pliny (>= 0.20.0)
 
@@ -18,7 +17,6 @@ GEM
     aggregate (0.2.2)
     byebug (9.0.6)
     coderay (1.1.1)
-    concurrent-ruby (1.0.2)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     faraday (0.10.0)
@@ -26,7 +24,7 @@ GEM
     http_accept (0.1.6)
     i18n (0.7.0)
     json (1.8.3)
-    json_schema (0.15.0)
+    json_schema (0.16.0)
     librato-metrics (2.0.2)
       aggregate (~> 0.2.2)
       faraday
@@ -34,7 +32,7 @@ GEM
     minitest (5.10.1)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    pliny (0.20.1)
+    pliny (0.21.0)
       activesupport (~> 4.1, >= 4.1.0)
       http_accept (~> 0.1, >= 0.1.5)
       multi_json (~> 1.9, >= 1.9.3)
@@ -42,7 +40,7 @@ GEM
       sinatra (~> 1.4, >= 1.4.7)
       sinatra-router (~> 0.2, >= 0.2.3)
       thor (~> 0.19, >= 0.19.1)
-    prmd (0.12.0)
+    prmd (0.13.0)
       erubis (~> 2.7)
       json_schema (~> 0.3, >= 0.3.1)
     pry (0.10.4)

data/README.md

@@ -27,7 +27,8 @@ Librato::Metrics.authenticate(Config.librato_email, Config.librato_key)
 Pliny::Metrics.backends << Pliny::Librato::Metrics::Backend.new(source: "myapp.production")
 ```
 
-Now `Pliny::Metrics` methods send directly to Librato:
+Now `Pliny::Metrics` methods will build a queue and automatically send metrics
+to Librato.
 
 ```ruby
 Pliny::Metrics.count(:foo, 3)
@@ -36,6 +37,9 @@ Pliny::Metrics.measure(:bar) do
 end
 ```
 
+By default, it will send queued metrics every minute, or whenever the
+queue reaches 1000 metrics. These settings can be configured on initialization.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -44,4 +48,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/pliny-librato.
+Bug reports and pull requests are welcome on GitHub at https://github.com/heroku/pliny-librato.

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

@@ -1,39 +1,41 @@
-require "librato/metrics"
-require "concurrent"
-require "pliny/error_reporters"
-
-module Pliny::Librato
-  module Metrics
-    class Backend
-      include Concurrent::Async
-
-      def initialize(source: nil)
-        super()
-        @source = source
-      end
-
-      def report_counts(counts)
-        self.async.report(counts)
-      end
+require 'librato/metrics'
+require 'pliny/error_reporters'
+
+module Pliny
+  module Librato
+    module Metrics
+      # Implements the Pliny::Metrics.backends API. Puts any metrics sent
+      # from Pliny::Metrics onto a queue that gets submitted in batches.
+      class Backend
+        attr_reader :queue
+
+        def initialize(source: nil, interval: 60, count: 1000, queue: nil)
+          @queue = queue || ::Librato::Metrics::Queue.new(
+            source:              source,
+            autosubmit_interval: interval,
+            autosubmit_count:    count
+          )
+          flush_on_shutdown
+        end
 
-      def report_measures(measures)
-        self.async.report(measures)
-      end
+        def report_counts(counts)
+          report(counts)
+        end
 
-      def report(metrics)
-        ::Librato::Metrics.submit(serialize(metrics))
-      rescue => error
-        Pliny::ErrorReporters.notify(error)
-      end
+        def report_measures(measures)
+          report(measures)
+        end
 
-      private
+        private
 
-      attr_reader :librato_client, :source
+        def report(metrics)
+          queue.add(metrics)
+        rescue => error
+          Pliny::ErrorReporters.notify(error)
+        end
 
-      def serialize(metrics)
-        metrics.reduce({}) do |mets, (k, v)|
-          mets[k] = { type: :gauge, value: v, source: source }
-          mets
+        def flush_on_shutdown
+          Signal.trap('TERM') { queue.submit }
         end
       end
     end

data/lib/pliny/librato/version.rb

@@ -1,5 +1,5 @@
 module Pliny
   module Librato
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/pliny-librato.gemspec

@@ -4,30 +4,29 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'pliny/librato/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "pliny-librato"
+  spec.name          = 'pliny-librato'
   spec.version       = Pliny::Librato::VERSION
-  spec.authors       = ["Andrew Appleton", "Josh W Lewis"]
-  spec.email         = "andysapple@gmail.com"
+  spec.authors       = ['Andrew Appleton', 'Josh W Lewis']
+  spec.email         = 'andysapple@gmail.com'
 
-  spec.summary       = %q{A Librato metrics reporter backend for pliny}
-  spec.homepage      = "https://github.com/appleton/pliny-librato"
+  spec.summary       = 'A Librato metrics reporter backend for pliny'
+  spec.homepage      = 'https://github.com/appleton/pliny-librato'
 
-  spec.licenses      = ["MIT"]
+  spec.licenses      = ['MIT']
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_dependency "librato-metrics", "~> 2.0"
-  spec.add_dependency "pliny",           ">= 0.20.0"
+  spec.add_dependency 'librato-metrics', '~> 2.0'
+  spec.add_dependency 'pliny',           '>= 0.20.0'
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "pry", "~> 0.10"
-  spec.add_development_dependency "pry-byebug", "~> 3.4"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
-  spec.add_development_dependency "timecop", "~> 0.8.1"
+  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'pry', '~> 0.10'
+  spec.add_development_dependency 'pry-byebug', '~> 3.4'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.3'
+  spec.add_development_dependency 'timecop', '~> 0.8.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pliny-librato
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Andrew Appleton
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: librato-metrics
   requirement: !ruby/object:Gem::Requirement