metricize 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee4500b798220d2e7720c6b7fbf24dbb4dfee6a
-  data.tar.gz: 654246270c58ae875d0d6f23f1099c38da87acc8
+  metadata.gz: 50fc0c83fce168261f1ef1ecb57e45a1b479584b
+  data.tar.gz: 99ab9d17c1453a90a7653acefe1da2eec6b958cc
 SHA512:
-  metadata.gz: eb76d39f56af655011c4037c155e326fca7c91ce6d1c8bd43b4843e5a22f731ccafe9ecc19b12fd2051dbc82b3fa8c4e29083a577db43c1051e3983b946c9442
-  data.tar.gz: 5004d43b141bf78fe02aedcc82fa038f00ad7a257fb0701a3a2db69cc0310859da6b23bca14a9dec123ce3c279ff152da939fba5f8bd70011ffb9c4ca5d0453b
+  metadata.gz: 2c8b2bdfc77e0b6448707173c7b6f5f4d434441cae636a62aab45f1ff367beedb60e4c5f06bb9beb550f0e79402c0ca2205e96a19fef5d74f8247bba7a4adcd3
+  data.tar.gz: 56be1f2d4cfce176300a8d0dd0d7f45cb63ad52c2efa8517358d43e9f002997f1a042d0006151c87e309d74ef9a005e83531500c27b452c5bb48f52064ba5478

data/lib/metricize/client.rb

@@ -4,10 +4,9 @@ module Metricize
 
     def initialize(options = {})
       @prefix = options[:prefix]
-      @sampling_ratio = options[:sampling_ratio] || 0.10
+      @log_sampling_ratio = options[:log_sampling_ratio] || 0.10
       establish_logger(options)
       initialize_redis(options)
-      establish_redis_connection
     end
 
     def increment(name, options = {})
@@ -43,7 +42,7 @@ module Metricize
       with_error_handling do
         @redis.lpush(@queue_name, data)
       end
-      return unless rand < @sampling_ratio
+      return unless rand < @log_sampling_ratio
       msg = "#{name.gsub('.', '_')}=#{value}" # splunk chokes on dots in field names
       msg << ", metric_source=#{options[:source].gsub('.', '_')}" if options[:source]
       log_message msg, :info

data/lib/metricize/forwarder.rb

@@ -7,10 +7,9 @@ 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
+      @batch_size        = options[:batch_size] || 5000
       establish_logger(options)
       initialize_redis(options)
-      establish_redis_connection
     end
 
     def go!
@@ -29,9 +28,9 @@ module Metricize
 
     def lshift_queue
       return [] unless queue_length > 0
-      current_batch = @redis.lrange(@queue_name, 0, @max_batch_size - 1)
+      current_batch = @redis.lrange(@queue_name, 0, @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)
+      @redis.ltrim(@queue_name, 0, -1-@batch_size)
       current_batch.map {|metric| JSON.parse(metric, :symbolize_names => true) }
     end
 

data/lib/metricize/shared.rb

@@ -15,6 +15,7 @@ module Metricize
       @queue_host  = options[:queue_host] || '127.0.0.1'
       @queue_port  = options[:queue_port] || 6379
       @queue_name  = options[:queue_name] || 'metricize_queue'
+      establish_redis_connection
     end
 
     def establish_logger(options)

data/lib/metricize/version.rb

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

data/spec/lib/metricize_spec.rb

@@ -8,7 +8,7 @@ describe Metricize do
                                              :username => 'name@example.com',
                                              :logger   => logger) }
 
-  let(:client) { Metricize::Client.new( :prefix => 'prefix', :logger => logger ) }
+  let(:client) { Metricize::Client.new( :prefix => 'prefix', :logger => logger, :log_sampling_ratio => 1.0 ) }
 
   before do
     Timecop.freeze(Time.at(1234))
@@ -57,7 +57,7 @@ describe Metricize do
   end
 
   it "limits the number of metrics forwarded to the remote in a single request" do
-    forwarder.instance_variable_set(:@max_batch_size, 3)
+    forwarder.instance_variable_set(:@batch_size, 3)
     7.times { | n| client.increment('stat.name' + n.to_s) }
     forwarder.go!
     expect(forwarder.send(:queue_length)).to eq 4
@@ -133,8 +133,8 @@ describe Metricize do
   end
 
   it "logs in splunk format a sampling of metrics" do
+    client = Metricize::Client.new( :prefix => 'prefix', :logger => logger, :log_sampling_ratio => 0.10 )
     srand(1234)
-    logger.should_receive(:info) # ignore initial connection message
     logger.should_receive(:info).with(/prefix_value1=10.0/m).exactly(9).times
     100.times { client.measure('value1', 10) }
     logger.should_receive(:info).with(/prefix_value2=20.0/m).exactly(6).times

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metricize
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Matt McNeil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler