metricize 0.4.5 → 0.4.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Yzk4NDUxZjlhZjY0YmQ1ZGI1NjEzYzQ1YmNmM2MyOGZlNjY4NWJmZg==
-  data.tar.gz: !binary |-
-    MmEyYTBiYjM4YmY4YzJlNTM3YjkxMGU4MDE1Y2M0YmFkMTJkNmI3OA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NGJlNjNlNzM0NmNjZGE0YWY2MmRhYzllODAxOTljNTQyYWFmNWRjZTMzOGVh
-    MDc2ZjMzZmJmNDc1YTRlMWRjMWFjNzdkZDExMjM0ODg4NmUwYjFhZTFhNDM2
-    OWRiZTkyZmYxYjc0MTBlNGRkODUyZDkyMzU4NmM5MmVjYTVlOTU=
-  data.tar.gz: !binary |-
-    MmY5NmYwMWI0OGNlMTE4YTQ5YWY0NmUwYWI2YmYzMzM4ODk1MGU5ZGJjZDJh
-    OTlkYjg0ODNhYjllMzA5OGJlMmI2ZmYyZGVlYzQzZTM2MzVhNGRmYTBlMGE2
-    NTljNjU5OWQ2NDg2ODZiOTdmMGVjZTA2NGQwYzI5NjkxYjI1MDc=
+SHA1:
+  metadata.gz: ba2d742a43d5df4f2744e1f9ee423097c953b947
+  data.tar.gz: 59f255649011baa295b25490ed3cd05dbdbab605
+SHA512:
+  metadata.gz: 9131eb3bea2f4291c9578e2e7852ad330b80ecae486c1b91199164dfcd4b37ae4ff1c2dc5a8d13cd3922bd1a233ea4081ab11b77843af4c75c1b2ecd16b5b725
+  data.tar.gz: 3cefc14f6532f3d3f6dd00d070ffcb61983ca7efdcf7b99de445cc69121599f79c8c52019d5952f7ad7d8630424161c37ac8c3aebaf84c234305f6055708f2e0

data/lib/metricize.rb

@@ -11,4 +11,4 @@ require "metricize/shared"
 require "metricize/forwarder"
 require "metricize/client"
 require "metricize/stats"
-require "metricize/null_client"
+require "metricize/null_objects"

data/lib/metricize/client.rb

@@ -4,6 +4,7 @@ module Metricize
 
     def initialize(options = {})
       @prefix = options[:prefix]
+      @sampling_ratio = options[:sampling_ratio] || 0.10
       establish_logger(options)
       initialize_redis(options)
       establish_redis_connection
@@ -39,10 +40,13 @@ module Metricize
 
     def push_to_queue(name, value, options)
       data = prepare_metric(name, value, options).to_json
-      @redis.lpush(@queue_name, data)
+      with_error_handling do
+        @redis.lpush(@queue_name, data)
+      end
+      return unless rand < @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
+      log_message msg, :info
     end
 
     def build_metric_name(name)

data/lib/metricize/forwarder.rb

@@ -19,12 +19,12 @@ module Metricize
     private
 
     def process_metric_queue
-      queue = retrieve_queue_contents
-      return if queue.empty?
-      store_metrics(add_aggregate_info(queue))
-      clear_queue
-    rescue RuntimeError => e
-      log_message "Error: " + e.message, :error
+      with_error_handling do
+        queue = retrieve_queue_contents
+        return if queue.empty?
+        store_metrics(add_aggregate_info(queue))
+        clear_queue
+      end
     end
 
     def retrieve_queue_contents
@@ -81,7 +81,9 @@ module Metricize
         value_groups[key] << metric[:value]
       end
       value_groups.each do |key, values|
-        print_histogram(key, values)
+        with_error_handling do
+          print_histogram(key, values)
+        end
         gauges << add_stat_by_key(key, values.size, '.count').merge(counter_attributes)
         gauges << add_stat_by_key(key, values.max, ".max")
         gauges << add_stat_by_key(key, values.min, ".min")
@@ -118,8 +120,6 @@ module Metricize
                        "#{name}.mean=#{round(values.mean, 2)}\n" +
                        "#{name}.stddev=#{round(values.standard_deviation, 2)}\n"
       log_message(chart_output, :info)
-    rescue => e
-      log_message("#{e}: Could not print histogram for #{name} with these input values: #{values.inspect}", :error)
     end
 
     def add_stat_by_key(key, value, suffix = "")
@@ -129,12 +129,5 @@ module Metricize
       metric
     end
 
-    def calculate_percentile(values, percentile)
-      return values.first if values.size == 1
-      values_sorted = values.sort
-      k = (percentile*(values_sorted.length-1)+1).floor - 1
-      values_sorted[k]
-    end
-
   end
 end

data/lib/metricize/shared.rb

@@ -3,8 +3,10 @@ module Metricize
 
     def establish_redis_connection
       log_message "metricize_version=#{VERSION} connecting to Redis at #{@queue_host}:#{@queue_port}", :info
-      @redis = Redis.connect(:host => @queue_host, :port => @queue_port)
-      @redis.ping
+      with_error_handling do
+        @redis = Redis.connect(:host => @queue_host, :port => @queue_port)
+        @redis.ping
+      end
     end
 
     private
@@ -33,6 +35,12 @@ module Metricize
       ((value * factor).round) / factor
     end
 
+    def with_error_handling
+      yield
+    rescue StandardError => e
+      log_message %Q(#{e.class}:#{e.message}\n#{e.backtrace.join("\n")}), :error
+    end
+
   end
 end
 

data/lib/metricize/version.rb

@@ -1,3 +1,3 @@
 module Metricize
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/spec/lib/metricize_spec.rb

@@ -1,5 +1,7 @@
 require "spec_helper"
 
+class TestError < StandardError; end
+
 describe Metricize do
   let(:logger) { double.as_null_object }
   let(:forwarder) { Metricize::Forwarder.new( :password => 'api_key',
@@ -120,6 +122,13 @@ describe Metricize do
     forwarder.go!
   end
 
+  it "logs in splunk format a sampling of metrics" do
+    logger.should_receive(:info).with(/prefix_value1=10.0/m).at_least(5).times
+    100.times { client.measure('value1', 10) }
+    logger.should_receive(:info).with(/prefix_value2=20.0/m).at_most(20).times
+    100.times { client.measure('value2', 20) }
+  end
+
   it "raises an error when measure is called without a numeric value" do
     expect { client.measure('boom', {}) }.to raise_error(ArgumentError, /no numeric value provided in measure call/)
     expect { client.measure('boom', 'NaN') }.to raise_error(ArgumentError, /no numeric value provided in measure call/)
@@ -234,11 +243,23 @@ describe Metricize do
     forwarder.go!
   end
 
-  it "retries sending if it encounters an error" do
+  it "rescues and logs redis errors in client" do
+    Redis.any_instance.stub(:lpush).and_raise(TestError)
+    logger.should_receive(:error).with(/Client.*TestError/)
     client.increment('counter1')
-    RestClient.stub(:post).and_raise(RestClient::Exception)
+  end
+
+  it "rescues and logs redis errors in forwarder" do
+    client.increment('counter1')
+    Redis.any_instance.stub(:lrange).and_raise(TestError)
+    logger.should_receive(:error).with(/Forwarder.*TestError/)
     forwarder.go!
-    RestClient.should_receive(:post)
+  end
+
+  it "rescues and logs errors when printing histograms" do
+    10.times { client.measure('value1', 1.0) }
+    AsciiCharts::Cartesian.any_instance.stub(:draw).and_raise(TestError)
+    logger.should_receive(:error).with(/Forwarder.*TestError/)
     forwarder.go!
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metricize
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Matt McNeil
@@ -11,145 +11,145 @@ cert_chain: []
 date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: timecop
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: fakeredis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: simplecov
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: rest-client
   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
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: redis
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
   prerelease: false
-  name: ascii_charts
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ascii_charts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple client/forwarder system to aggregate metrics and periodically
   send them to a stats service
 email:
@@ -166,7 +166,7 @@ files:
 - lib/metricize.rb
 - lib/metricize/client.rb
 - lib/metricize/forwarder.rb
-- lib/metricize/null_client.rb
+- lib/metricize/null_objects.rb
 - lib/metricize/shared.rb
 - lib/metricize/stats.rb
 - lib/metricize/version.rb
@@ -183,12 +183,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []