metricize 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8cf931a25d42cfb633f176985e4384de6c6511
-  data.tar.gz: 9988f0a09c4f64195605fc8ca6cd7c4f806650f2
+  metadata.gz: cee4500b798220d2e7720c6b7fbf24dbb4dfee6a
+  data.tar.gz: 654246270c58ae875d0d6f23f1099c38da87acc8
 SHA512:
-  metadata.gz: c60726cfc70f886bf2ca1b6e4a67f510ac49842237cb7a367602dec91343167d1abe2a5fc9f6956ece80b92e33af9300448e5bccca91738e0cbc0b0f4700a1c6
-  data.tar.gz: ce714c019aa029f2eab3abd0d6278f11107dd890418d49251328bad093a607fb0aeff93ffaa0b2c869b20dcdf7d786f05d338655804f76f6e2c59c859dba9ef4
+  metadata.gz: eb76d39f56af655011c4037c155e326fca7c91ce6d1c8bd43b4843e5a22f731ccafe9ecc19b12fd2051dbc82b3fa8c4e29083a577db43c1051e3983b946c9442
+  data.tar.gz: 5004d43b141bf78fe02aedcc82fa038f00ad7a257fb0701a3a2db69cc0310859da6b23bca14a9dec123ce3c279ff152da939fba5f8bd70011ffb9c4ca5d0453b

data/lib/metricize/forwarder.rb

@@ -7,12 +7,13 @@ module Metricize
       @username          = options.fetch(:username)
       @remote_url        = options[:remote_url]     || 'metrics-api.librato.com/v1/metrics'
       @remote_timeout    = options[:remote_timeout] || 10
+      @max_batch_size    = options[:max_batch_size] || 5000
       establish_logger(options)
       initialize_redis(options)
+      establish_redis_connection
     end
 
     def go!
-      establish_redis_connection
       process_metric_queue
     end
 
@@ -20,23 +21,28 @@ module Metricize
 
     def process_metric_queue
       with_error_handling do
-        queue = retrieve_queue_contents
+        queue = lshift_queue
         return if queue.empty?
         store_metrics(add_aggregate_info(queue))
-        clear_queue
       end
     end
 
-    def retrieve_queue_contents
-      log_message "checking... queue_length=#{queue_length = @redis.llen(@queue_name)}", :info
+    def lshift_queue
       return [] unless queue_length > 0
-      queue = @redis.lrange(@queue_name, 0, -1)
-      queue.map {|metric| JSON.parse(metric, :symbolize_names => true) }
+      current_batch = @redis.lrange(@queue_name, 0, @max_batch_size - 1)
+      # ltrim indexes are 0 based and somewhat confusing -- see http://redis.io/commands/ltrim
+      @redis.ltrim(@queue_name, 0, -1-@max_batch_size)
+      current_batch.map {|metric| JSON.parse(metric, :symbolize_names => true) }
+    end
+
+    def queue_length
+      log_message "queue_length=#{length = @redis.llen(@queue_name)}", :info
+      length
     end
 
     def clear_queue
       log_message "clearing queue"
-      @redis.del @queue_name if @redis
+      @redis.del @queue_name
     end
 
     def store_metrics(data)

data/lib/metricize/version.rb

@@ -1,3 +1,3 @@
 module Metricize
-  VERSION = "0.4.7"
+  VERSION = "0.5.0"
 end

data/metricize.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "fakeredis"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "pry"
 
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "json"

data/spec/lib/metricize_spec.rb

@@ -49,13 +49,23 @@ describe Metricize do
     forwarder.go!
   end
 
-  it "clears queue and does not send again after a successful request" do
+  it "clears sent items after a successful request and does not send to remote again if queue is empty" do
     client.increment('stat.name')
     forwarder.go!
     RestClient.should_not_receive(:post)
     forwarder.go!
   end
 
+  it "limits the number of metrics forwarded to the remote in a single request" do
+    forwarder.instance_variable_set(:@max_batch_size, 3)
+    7.times { | n| client.increment('stat.name' + n.to_s) }
+    forwarder.go!
+    expect(forwarder.send(:queue_length)).to eq 4
+    forwarder.go!
+    expect(forwarder.send(:queue_length)).to eq 1
+    forwarder.go!
+    expect(forwarder.send(:queue_length)).to eq 0
+  end
   it "removes special characters and spaces and converts the metric names and sources to dotted decimal snake_case" do
     client.increment(' My UNRULY stat!@#$%^&*\(\) ')
     RestClient.should_receive(:post).with(anything, /my_unruly_stat/, anything)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metricize
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt McNeil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement