ruby-metrics 0.9.3 → 0.9.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: '04971d78af7ca682008c7d66db2eac34111c089bb17778cc18ff434843707126'
+  data.tar.gz: e1ec094ef4a2082d12df838b211fac9cebaf207bf4fabb33fb3b30eaef1f97ff
+SHA512:
+  metadata.gz: 60b859a4037eb7f22d2bbaa0965cc1ed55845817a613701a9a3f19bba088c6886feb68aad020e421506d330fb87eafa612b0c364773d850dbcd92d9e95798e56
+  data.tar.gz: 1b2f48bee677fadfffb53335058aa036985f64f9ce2f6f7901bae3fe8b996dc26c36b83d0303d1ea93065e5eef6cf298ff8c4328c8c13df0182592b694c2d02a

data/Rakefile

@@ -15,7 +15,7 @@ task :build do
   FileUtils.mv(Dir['*.gem'], 'pkg')
 end
 
-desc "Tags version as #{Metrics::VERSION}, pushes to remote, and pushes gem"
+desc 'Tags version, pushes to remote, and pushes gem'
 task :release => :build do
   puts "Releasing v#{Metrics::VERSION}"
   sh 'git', 'tag', '-m', "Version #{Metrics::VERSION}",  "v#{Metrics::VERSION}"

data/lib/ruby-metrics/instruments/histogram.rb

@@ -5,20 +5,20 @@ require 'ruby-metrics/statistics/exponential_sample'
 module Metrics
   module Instruments
     class Histogram < Instrument
+      attr_reader :count
 
       def initialize(type = :uniform)
-        @count = 0
-        case type
-        when :uniform
-          @sample = Metrics::Statistics::UniformSample.new
-        when :exponential
-          @sample = Metrics::Statistics::ExponentialSample.new
-        end
-        @min = nil
-        @max = nil
-        @sum = 0
-        @variance_s = 0
-        @variance_m = -1
+        @sample =
+          case type
+          when :uniform
+            Metrics::Statistics::UniformSample.new
+          when :exponential
+            Metrics::Statistics::ExponentialSample.new
+          else
+            raise ArgumentError, "Unknown type #{type.inspect}"
+          end
+
+        clear
       end
 
       def update(value)
@@ -27,7 +27,7 @@ module Metrics
       	@sample.update(value)
       	update_max(value)
       	update_min(value)
-        update_variance(value);
+        update_variance(value)
       end
 
       def clear
@@ -41,111 +41,80 @@ module Metrics
       end
 
       def quantiles(percentiles)
-        # Calculated using the same logic as R and Ecxel use
+        # Calculated using the same logic as R and Excel use
         # as outlined by the NIST here: http://www.itl.nist.gov/div898/handbook/prc/section2/prc252.htm
-        count = @count
-        scores = {}
-        values = @sample.values[0..count-1]
 
+        sorted_values = @sample.values[0...@count].sort
+        scores = { }
         percentiles.each do |pct|
-          scores[pct] = 0.0
-        end
-
-        if count > 0
-          values.sort!
-          percentiles.each do |pct|
-            idx = pct * (values.length - 1) + 1.0
-            if idx <= 1
-              scores[pct] = values[0]
-            elsif idx >= values.length
-              scores[pct] = values[values.length-1]
+          scores[pct] =
+            if @count == 0
+              0.0
             else
-              lower = values[idx.to_i - 1]
-              upper = values[idx.to_i]
-              scores[pct] = lower + (idx - idx.floor) * (upper - lower)
-            end
+              index = pct * (sorted_values.length - 1) + 1.0
+              if index <= 1
+                sorted_values.first
+              elsif index >= sorted_values.length
+                sorted_values.last
+              else
+                lower = sorted_values[index.to_i - 1]
+                upper = sorted_values[index.to_i]
+                lower + (index - index.floor) * (upper - lower)
+              end
           end
         end
-
-        return scores
+        scores
       end
 
       def update_min(value)
-        if (@min == nil || value < @min)
+        if @min.nil? || value < @min
           @min = value
         end
       end
 
       def update_max(value)
-        if (@max == nil || value > @max)
+        if @max.nil? || value > @max
           @max = value
         end
       end
 
       def update_variance(value)
-        count = @count
-        old_m = @variance_m
-        new_m = @variance_m + ((value - old_m) / count)
-        new_s = @variance_s + ((value - old_m) * (value - new_m))
+        new_m = @variance_m + ((value - @variance_m) / @count)
+        new_s = @variance_s + ((value - @variance_m) * (value - new_m))
 
         @variance_m = new_m
         @variance_s = new_s
       end
 
       def variance
-        count = @count
-        variance_s = @variance_s
-
-        if count <= 1
-          return 0.0
+        if @count <= 1
+          0.0
         else
-          return variance_s.to_f / (count - 1).to_i
+          @variance_s.to_f / (@count - 1)
         end
       end
 
-      def count
-        count = @count
-        return count
-      end
-
-
       def max
-        max = @max
-        if max != nil
-          return max
-        else
-          return 0.0
-        end
+        @max || 0.0
       end
 
       def min
-        min = @min
-        if min != nil
-          return min
-        else
-          return 0.0
-        end
+        @min || 0.0
       end
 
       def mean
-        count = @count
-        sum = @sum
-
-        if count > 0
-          return sum / count
+        if @count > 0
+          @sum / @count
         else
-          return 0.0
+          0.0
         end
       end
 
       def std_dev
-        count = @count
-        variance = self.variance()
-
-        if count > 0
-          return Math.sqrt(variance)
+        if @count > 0
+          Math.sqrt(variance)
         else
-          return 0.0
+          0.0
         end
       end
 
@@ -155,11 +124,11 @@ module Metrics
 
       def as_json(*_)
         {
-          :min => self.min,
-          :max => self.max,
-          :mean => self.mean,
-          :variance => self.variance,
-          :percentiles => self.quantiles([0.25, 0.50, 0.75, 0.95, 0.97, 0.98, 0.99])
+          :min         => min,
+          :max         => max,
+          :mean        => mean,
+          :variance    => variance,
+          :percentiles => quantiles(Timer::DEFAULT_PERCENTILES)
         }
       end
 

data/lib/ruby-metrics/instruments/instrument.rb

@@ -6,9 +6,8 @@ module Metrics
       end
 
       def tag(key, value)
-        @tags ||= {}
-        @tags[key] = value
+        tags[key] = value
       end
     end
   end
-end
+end

data/lib/ruby-metrics/instruments/meter.rb

@@ -7,37 +7,35 @@ module Metrics
       include Metrics::TimeConversion
 
       # From http://www.teamquest.com/pdfs/whitepaper/ldavg2.pdf
-      INTERVAL = 5.0
-      INTERVAL_IN_NS = 5000000000.0
-      ONE_MINUTE_FACTOR     = 1 - Math.exp(-INTERVAL / 60.0)
-      FIVE_MINUTE_FACTOR    = 1 - Math.exp(-INTERVAL / (60.0 * 5.0))
-      FIFTEEN_MINUTE_FACTOR = 1 - Math.exp(-INTERVAL / (60.0 * 15.0))
-
-      attr_reader :count
-      attr_reader :units
+      INTERVAL_SECONDS = 5.0
+      ONE_MINUTE_FACTOR     = 1 - Math.exp(-INTERVAL_SECONDS / 60.0)
+      FIVE_MINUTE_FACTOR    = 1 - Math.exp(-INTERVAL_SECONDS / (60.0 * 5.0))
+      FIFTEEN_MINUTE_FACTOR = 1 - Math.exp(-INTERVAL_SECONDS / (60.0 * 15.0))
+
+      attr_reader :count, :units
       alias_method :counted, :count
 
       def initialize(options = {})
-        @one_minute_rate = @five_minute_rate = @fifteen_minute_rate = 0.0
-        @count  = 0
-        @initialized = false
-        @start_time = Time.now.to_f
         @units = options[:units]
+        clear
 
         @timer_thread = Thread.new do
           begin
             loop do
-              self.tick
-              sleep(INTERVAL)
+              tick
+              sleep(INTERVAL_SECONDS)
             end
           rescue Exception => e
             logger.error "Error in timer thread: #{e.class.name}: #{e}\n  #{e.backtrace.join("\n  ")}"
-          end # begin
-        end # thread new
-
+          end
+        end
       end
 
       def clear
+        @one_minute_rate = @five_minute_rate = @fifteen_minute_rate = 0.0
+        @count  = 0
+        @initialized = false
+        @start_time = Time.now.to_f
       end
 
       def mark(count = 1)
@@ -45,19 +43,18 @@ module Metrics
       end
 
       def calc_rate(rate, factor, count)
-        rate = rate.to_f + (factor.to_f * (count.to_f - rate.to_f))
-        rate.to_f
+        rate.to_f + factor.to_f * (count.to_f - rate.to_f)
       end
 
       def tick
-        count = @count.to_f  / Seconds.to_nsec(INTERVAL).to_f
+        count = @count.to_f / Seconds.to_nsec(INTERVAL_SECONDS).to_f
 
-        if (@initialized)
+        if @initialized
           @one_minute_rate      = calc_rate(@one_minute_rate,     ONE_MINUTE_FACTOR,     count)
           @five_minute_rate     = calc_rate(@five_minute_rate,    FIVE_MINUTE_FACTOR,    count)
           @fifteen_minute_rate  = calc_rate(@fifteen_minute_rate, FIFTEEN_MINUTE_FACTOR, count)
         else
-          @one_minute_rate = @five_minute_rate = @fifteen_minute_rate  = (count)
+          @one_minute_rate = @five_minute_rate = @fifteen_minute_rate  = count
           @initialized = true
         end
 
@@ -77,21 +74,20 @@ module Metrics
       end
 
       def mean_rate(rate_unit = :seconds)
-        count = @count
-        if count == 0
-          return 0.0
+        if @count == 0
+          0.0
         else
           elapsed = Time.now.to_f - @start_time.to_f
-          mult = scale_time_units(:seconds, rate_unit)
-          count.to_f / (mult * elapsed.to_f)
+          scale_factor = scale_time_units(:seconds, rate_unit)
+          @count.to_f / (elapsed * scale_factor)
         end
       end
 
       def as_json(*_)
         {
-          :one_minute_rate => self.one_minute_rate,
-          :five_minute_rate => self.five_minute_rate,
-          :fifteen_minute_rate => self.fifteen_minute_rate
+          :one_minute_rate      => one_minute_rate,
+          :five_minute_rate     => five_minute_rate,
+          :fifteen_minute_rate  => fifteen_minute_rate
         }
       end
 

data/lib/ruby-metrics/instruments/timer.rb

@@ -8,6 +8,8 @@ module Metrics
 
       attr_reader :duration_unit, :rate_unit, :units
 
+      DEFAULT_PERCENTILES = [0.25, 0.50, 0.75, 0.95, 0.97, 0.98, 0.99]
+
       def initialize(options = {})
         @meter          = Meter.new
         @histogram      = ExponentialHistogram.new
@@ -20,17 +22,17 @@ module Metrics
       end
 
       def clear
+        @meter.clear
         @histogram.clear
       end
 
       def update(duration, unit)
-        mult = convert_to_ns(1, unit)
-        self.update_timer(duration * mult)
+        update_timer(convert_to_ns(duration, unit))
       end
 
-      def time(&block)
+      def time
         start_time = Time.now.to_f
-        result = block.call
+        result = yield
         time_diff = Time.now.to_f - start_time
         time_in_ns = convert_to_ns time_diff, :seconds
         update_timer(time_in_ns)
@@ -73,24 +75,17 @@ module Metrics
         scale_duration_to_ns @histogram.std_dev, @duration_unit
       end
 
-      def quantiles(percentiles = [0.99,0.97,0.95,0.75,0.5,0.25])
-        result = {}
-
-        @histogram.quantiles(percentiles).each do |k,v|
+      def quantiles(percentiles = DEFAULT_PERCENTILES)
+        @histogram.quantiles(percentiles).inject({}) do |result, (k, v)|
           result[k] = scale_duration_to_ns v, @duration_unit
+          result
         end
-
-        result
       end
 
       def values
-        result = []
-
-        @histogram.values.each do |value|
-          result << (scale_duration_to_ns value, @duration_unit)
+        @histogram.values.map do |value|
+          scale_duration_to_ns value, @duration_unit
         end
-
-        result
       end
 
       def update_timer(duration)
@@ -113,7 +108,7 @@ module Metrics
             :min => min,
             :max => max,
             :mean => mean,
-            :percentiles => quantiles([0.25, 0.50, 0.75, 0.95, 0.97, 0.98, 0.99]),
+            :percentiles => quantiles,
             :unit => @duration_unit
           }
         }
@@ -125,7 +120,7 @@ module Metrics
 
       private
       def scale_duration_to_ns(value, unit)
-        value.to_f / convert_to_ns(1, unit).to_f
+        value.to_f / convert_to_ns(1.0, unit)
       end
     end
   end

data/lib/ruby-metrics/integration/rack_endpoint.rb

@@ -12,7 +12,7 @@ module Metrics
                       :requests, :uncaught_exceptions,
                       :status_codes
         
-        def initialize(options ={})
+        def initialize(options = {})
           @options  = options
           @agent    = @options.delete(:agent) || Agent.new
         end

data/lib/ruby-metrics/integration/rack_middleware.rb

@@ -15,54 +15,41 @@ module Metrics
     module Rack
       class Middleware
         
-        attr_accessor :app, :options, :agent,
-                      # integration metrics
-                      :requests, :uncaught_exceptions,
-                      :status_codes
-        
+        attr_accessor :app, :options, :agent
+
         def initialize(app, options ={})
           @app      = app
           @options  = {:show => "/stats"}.merge(options)
           @agent    = @options.delete(:agent) || Agent.new
-          
-          # Integration Metrics
-          @requests             = @agent.timer(:_requests)
-          @uncaught_exceptions  = @agent.counter(:_uncaught_exceptions)
-          
-          # HTTP Status Codes
-          @status_codes = {
-            1 => @agent.counter(:_status_1xx),
-            2 => @agent.counter(:_status_2xx),
-            3 => @agent.counter(:_status_3xx),
-            4 => @agent.counter(:_status_4xx),
-            5 => @agent.counter(:_status_5xx)
-          }
         end
-        
+
         def call(env)
           return show(env) if show?(env)
           
           env['metrics.agent'] = @agent
           
-          status, headers, body = self.requests.time{ @app.call(env) }
-          
-          if status_counter = self.status_codes[status / 100]
-            status_counter.incr
-          end
-          
+          status, headers, body = time_request { @app.call(env) }
+
+          incr_status_code_counter(status / 100)
+
           [status, headers, body]
         rescue Exception
           # TODO: add "last_uncaught_exception" with string of error
-          self.uncaught_exceptions.incr
+          incr_uncaught_exceptions
           raise
         end
-        
-        def show?(env, test = self.options[:show])
+
+      private
+        def show?(env, test = options[:show])
           case
-          when String === test;         env['PATH_INFO'] == test
-          when Regexp === test;         env['PATH_INFO'] =~ test
-          when test.respond_to?(:call); test.call(env)
-          else                          test
+          when String === test
+            env['PATH_INFO'] == test
+          when Regexp === test
+            env['PATH_INFO'] =~ test
+          when test.respond_to?(:call)
+            test.call(env)
+          else
+            test
           end
         end
         
@@ -75,7 +62,18 @@ module Metrics
             [body]
           ]
         end
-        
+
+        def time_request(&block)
+          @agent.timer(:_requests).time(&block)
+        end
+
+        def incr_uncaught_exceptions
+          @agent.counter(:_uncaught_exceptions).incr
+        end
+
+        def incr_status_code_counter(hundred)
+          @agent.counter(:"_status_#{hundred}xx").incr
+        end
       end
     end
   end

data/lib/ruby-metrics/reporter.rb

@@ -20,7 +20,7 @@ module Metrics
       agent = options[:agent] 
 
       Thread.new {
-        while(@running)
+        while @running
           agent.reporters.each do |name, service|
             service.report(agent)
           end

data/lib/ruby-metrics/reporters/ganglia.rb

@@ -7,8 +7,7 @@ module Metrics
   module Reporters
     class GangliaReporter
 
-      attr_reader :host_ip
-      attr_reader :host_port
+      attr_reader :host_ip, :host_port
 
       def initialize(options = {})
         @host_ip = options[:host_ip]
@@ -17,18 +16,19 @@ module Metrics
 
       def send_data(data)
         puts "Sending data: #{data.inspect}"
-        data_type = case data[:value].class.to_s
-                    when "Fixnum"
-                      "uint32"
-                    when "Float"
-                      "float"
-                    when "String"
-                      "string"
-                    else
-                      "unknown"
-                    end
+        data_type =
+          case data[:value]
+          Fixnum
+            "uint32"
+          Float
+            "float"
+          String
+            "string"
+          else
+            "unknown"
+          end
 
-        Ganglia::GMetric.send(@host_ip, @host_port.to_i, {
+        Ganglia::GMetric.send(@host_ip, @host_port.to_i,
            :spoof => 0,
            :name => data[:name],
            :units => data[:units],
@@ -36,44 +36,45 @@ module Metrics
            :value => data[:value],
            :tmax => 60,
            :dmax => 300,
-        })
+        )
       end
 
       def report(agent)
-
         agent.instruments.each do |name, instrument|
-          nothing_to_do = false
-          data =  { :name => name, :units => instrument.units }
           case instrument
-            when Metrics::Instruments::Counter
-              value = instrument.to_i
-              data.merge! :value => value.to_i
-              send_data data
-            when Metrics::Instruments::Gauge
-              if instrument.get.is_a? Hash
-                instrument.get.each do |key, value|
-                  data.merge! :name => "#{name}_#{key}", :value => value
-                  send_data data
-                end
-              else 
-                data.merge! :value => instrument.get
-                send_data data
-              end
-            when Metrics::Instruments::Timer
-              [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :min, :max, :mean].each do |attribute|
-                data.merge!(:name => "#{name}_#{attribute}", :value => instrument.send(attribute))
-                send_data data
+          when Metrics::Instruments::Counter
+            send_data :name  => name,
+                      :value => instrument.to_i,
+                      :units => instrument.units
+          when Metrics::Instruments::Gauge
+            if instrument.get.is_a? Hash
+              instrument.get.each do |key, value|
+                send_data :name  => "#{name}_#{key}",
+                          :value => value,
+                          :units => instrument.units
               end
-            when Metrics::Instruments::Meter
-              [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :mean_rate].each do |attribute|
-                data.merge!(:name => "#{name_attribute}", :value => instrument.send(attribute) )
-              end
-            else 
-              puts "Unhandled instrument"
+            else
+              send_data :name  => name,
+                        :value => instrument.get,
+                        :units => instrument.units
+            end
+          when Metrics::Instruments::Timer
+            [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :min, :max, :mean].each do |attribute|
+              send_data :name  => "#{name}_#{attribute}",
+                        :value => instrument.send(attribute),
+                        :units => instrument.units
+            end
+          when Metrics::Instruments::Meter
+            [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :mean_rate].each do |attribute|
+              send_data :name  => "#{name_attribute}",
+                        :value => instrument.send(attribute),
+                        :units => instrument.units
+            end
+          else
+            puts "Unhandled instrument"
           end
         end
       end
     end
   end
 end
-

data/lib/ruby-metrics/reporters/librato.rb

@@ -33,48 +33,50 @@ module Metrics
         https.start do |http| 
           result = http.request(req) 
           case result
-            when Net::HTTPCreated
-              # OK
-              puts "SENT!"
-            else
-              puts "FAILED TO SEND: #{https.inspect}"
+          when Net::HTTPCreated
+            # OK
+            puts "SENT!"
+          else
+            puts "FAILED TO SEND: #{https.inspect}"
           end
         end
       end
 
       def report(agent)
-
         agent.instruments.each do |name, instrument|
-          nothing_to_do = false
           measure_time = Time.now.to_i
 
-          case instrument.class.to_s
-            when "Metrics::Instruments::Counter"
-              value = instrument.to_i
-              post_url = "#{API_URL}/counters/#{name}.json" 
-              post_data = {:measure_time => measure_time, :value => value.to_i}
-              send_data(post_url, post_data)
-            when "Metrics::Instruments::Gauge"
-              post_url = "#{API_URL}/gauges/#{name}.json"
-              if instrument.get.is_a? Hash
-                instrument.get.each do |key, value|
-                  post_data = {:measure_time => measure_time, :source => key, :value => value}
-                  send_data(post_url, post_data)
-                end
-              else 
-                post_data = {:measure_time => measure_time, :value => instrument.get}
-                send_data(post_url, post_data)
-              end
-            when "Metrics::Instruments::Timer"
-              post_url = "#{API_URL}/gauges/#{name}.json"
-              common_data = {:measure_time => measure_time}
+          case instrument
+          when Metrics::Instruments::Counter
+            send_data "#{API_URL}/counters/#{name}.json",
+                      :measure_time => measure_time,
+                      :value        => instrument.to_i
 
-              [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :min, :max, :mean].each do |attribute|
-                post_data = {:source => attribute, :value => instrument.send(attribute)}.merge(common_data)
-                send_data(post_url, post_data)
+          when Metrics::Instruments::Gauge
+            post_url = "#{API_URL}/gauges/#{name}.json"
+            if instrument.get.is_a? Hash
+              instrument.get.each do |key, value|
+                send_data post_url,
+                          :measure_time => measure_time,
+                          :source       => key,
+                          :value        => value
               end
-            else 
-              puts "Unhandled instrument"
+            else
+              send_data post_url,
+                        :measure_time => measure_time,
+                        :value        => instrument.get
+            end
+
+          when Metrics::Instruments::Timer
+            [:count, :fifteen_minute_rate, :five_minute_rate, :one_minute_rate, :min, :max, :mean].each do |attribute|
+              send_data "#{API_URL}/gauges/#{name}.json",
+                        :measure_time => measure_time,
+                        :source       => attribute,
+                        :value        => instrument.send(attribute)
+            end
+
+          else
+            puts "Unhandled instrument"
           end
         end
       end

data/lib/ruby-metrics/statistics/exponential_sample.rb

@@ -1,24 +1,23 @@
 module Metrics
   module Statistics
     class ExponentialSample
+      RESCALE_WINDOW_SECONDS = 60 * 60 # 1 hour
+
       def initialize(size = 1028, alpha = 0.015)
-        @values = Hash.new
-        @count  = 0
         @size   = size
         @alpha  = alpha
-        @rescale_window = 3600  #seconds -- 1 hour
-        self.clear
+        clear
       end
       
       def clear
-        @values           = Hash.new
+        @values           = { }
         @start_time       = tick
-        @next_scale_time  = Time.now.to_f + @rescale_window
+        @next_scale_time  = Time.now.to_f + RESCALE_WINDOW_SECONDS
         @count            = 0
       end
       
       def size
-        [@values.keys.length, @count].min
+        [@values.size, @count].min
       end
       
       def tick
@@ -32,59 +31,50 @@ module Metrics
       def update_with_timestamp(value, timestamp)
         priority = weight(timestamp.to_f - @start_time.to_f) / rand
         @count += 1
-        newcount = @count
-        if (newcount <= @size)
+        if @count <= @size
           @values[priority] = value
         else
-          firstkey = @values.keys[0]
-          if firstkey && (firstkey < priority)
+          first_key = @values.keys.first
+          if first_key && first_key < priority
             @values[priority] = value
             
-            while(@values.delete(firstkey) == nil)
-              firstkey = @values.keys[0]
+            while values.any? && @values.delete(first_key).nil?
+              first_key = @values.keys.first
             end
           end
         end
         
         now = Time.now.to_f
-        next_scale_time = @next_scale_time
-        
-        if (now >= next_scale_time)
-          self.rescale(now, next_scale_time)
+
+        if now >= @next_scale_time
+          rescale(now + RESCALE_WINDOW_SECONDS)
         end
       end
-      
-      
-      def rescale(now, next_scale_time)
-        if @next_scale_time == next_scale_time
-          # writelock
-          @next_scale_time = now + @rescale_window
-          old_start_time = @start_time
-          @start_time = tick
-          time_delta = @start_time - old_start_time
-          keys = @values.keys
-          keys.each do |key|
-            value = @values.delete(key)
-            new_key = (key * Math.exp(-@alpha * time_delta))
-            @values[new_key] = value
-          end
-          # unlock
-        end  
-      end
-      
-      def weight(factor)
-        return @alpha.to_f * factor.to_f
-      end
-      
+
       def values
         # read-lock?
-        result = Array.new
-        keys = @values.keys.sort
-        keys.each do |key|
-          result << @values[key]
+        @values.keys.sort.map do |key|
+          @values[key]
         end
-        
-        result
+      end
+
+    private
+      def rescale(next_scale_time)
+        # writelock
+        @next_scale_time = next_scale_time
+        old_start_time = @start_time
+        @start_time = tick
+        time_delta = @start_time - old_start_time
+        @values.keys.each do |key|
+          value = @values.delete(key)
+          new_key = key * Math.exp(-@alpha * time_delta)
+          @values[new_key] = value
+        end
+        # unlock
+      end
+      
+      def weight(factor)
+        @alpha.to_f * factor.to_f
       end
     end
   end

data/lib/ruby-metrics/statistics/uniform_sample.rb

@@ -3,22 +3,21 @@ module Metrics
     class UniformSample
       def initialize(size = 1028)
         @values = Array.new(size)
-        @count = 0
         @size = size
-        self.clear
+        clear
       end
-      
+
       def clear
-        (0..@values.length-1).each do |i|
+        (0...@values.size).each do |i|
           @values[i] = 0
         end
         @count = 0
       end
-      
+
       def size
-        @values.length
+        @values.size
       end
-      
+
       def update(value)
         if @count < @values.length
           @values[@count] = value
@@ -28,10 +27,10 @@ module Metrics
           @values[index] = value
         end
       end
-      
+
       def values
         @values.dup
       end
     end
   end
-end
+end

data/lib/ruby-metrics/time_units.rb

@@ -1,42 +1,36 @@
 module Metrics
-  
-  class TimeUnit 
-    def self.to_nsec(mult = 1)
-      raise NotImplementedError
-    end
-  end
-  
-  class Nanoseconds < TimeUnit
+
+  module Nanoseconds
     def self.to_nsec(mult = 1)
       mult
     end
   end
   
-  class Microseconds < TimeUnit
+  module Microseconds
     def self.to_nsec(mult = 1)
       1000 * mult
     end
   end
   
-  class Milliseconds < TimeUnit
+  module Milliseconds
     def self.to_nsec(mult = 1)
       1000000 * mult
     end
   end
   
-  class Seconds < TimeUnit
+  module Seconds
     def self.to_nsec(mult = 1)
       1000000000 * mult
     end
   end
   
-  class Minutes < TimeUnit
+  module Minutes
     def self.to_nsec(mult = 1)
       60000000000 * mult
     end
   end
   
-  class Hours < TimeUnit
+  module Hours
     def self.to_nsec(mult = 1)
       3600000000000 * mult
     end
@@ -53,11 +47,11 @@ module Metrics
     }
   
     def convert_to_ns(value, unit)
-      (UNITS[unit].to_nsec.to_f * value.to_f)
+      UNITS[unit].to_nsec.to_f * value.to_f
     end
 
     def scale_time_units(source, dest)
-      (UNITS[source].to_nsec.to_f) / (UNITS[dest].to_nsec.to_f)
+      UNITS[source].to_nsec.to_f / UNITS[dest].to_nsec.to_f
     end
   end
 end

data/lib/ruby-metrics/version.rb

@@ -1,3 +1,3 @@
 module Metrics
-  VERSION = '0.9.3'
+  VERSION = '0.9.4'
 end

data/ruby-metrics.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.description = %q{A Ruby implementation of metrics inspired by @coda's JVM metrics for those of us in Ruby land}
   s.license     = 'MIT'
 
-  s.add_dependency 'json', '~> 1.5', '>= 1.5.5'
+  s.add_dependency 'json', '~> 2.3', '>= 2.3.0'
 
   s.add_development_dependency 'rspec', '~> 2.14', '>= 2.14.0'
   s.add_development_dependency 'simplecov', '~> 0.3', '>= 0.3.8'

data/spec/instruments/histogram_spec.rb

@@ -71,7 +71,7 @@ describe Metrics::Instruments::Histogram do
 
       it "should clear data correctly" do
         sample = Metrics::Statistics::UniformSample.new    
-        sample.should_receive(:clear)
+        sample.should_receive(:clear).twice
         Metrics::Statistics::UniformSample.should_receive(:new).and_return sample
 
         histogram = Metrics::Instruments::Histogram.new

data/spec/instruments/timer_spec.rb

@@ -29,7 +29,7 @@ describe Metrics::Instruments::Timer do
     end
     
     it "should have quantiles of zero" do
-      @timer.quantiles.should == {0.99=>0.0, 0.97=>0.0, 0.95=>0.0, 0.75=>0.0, 0.5=>0.0, 0.25=>0.0}
+      @timer.quantiles.should == {0.25=>0.0, 0.50=>0.0, 0.75=>0.0, 0.95=>0.0, 0.97=>0.0, 0.98=>0.0, 0.99=>0.0 }
     end
     
     it "should have a mean rate of zero" do
@@ -85,7 +85,7 @@ describe Metrics::Instruments::Timer do
     end
     
     it "should accurately calculate percentiles" do 
-      @timer.quantiles.should == {0.99=>39.6, 0.97=>38.8, 0.95=>38.0, 0.75=>30.0, 0.5=>20.0, 0.25=>20.0}
+      @timer.quantiles.should == {0.25=>20.0, 0.5=>20.0, 0.75=>30.0, 0.95=>38.0, 0.97=>38.8, 0.98=>39.2, 0.99=>39.6}
     end
     
     it "should contain the series added" do

data/spec/integration/rack_middleware_spec.rb

@@ -54,7 +54,7 @@ describe Metrics::Integration::Rack::Middleware do
       it "should count all requests" do
         lambda do
           get '/'
-        end.should change{ app.requests.count }.by(1)
+        end.should change{ app.agent.timer(:_requests).count }.by(1)
       end
       
       it "should count uncaught exceptions" do
@@ -63,22 +63,22 @@ describe Metrics::Integration::Rack::Middleware do
           lambda do
             get '/'
           end.should raise_error
-        end.should change{ app.uncaught_exceptions.to_i }.by(1)
+        end.should change{ app.agent.counter(:_uncaught_exceptions).to_i }.by(1)
       end
       
       it "should time request length" do
         length = 0.1
         @app = lambda{ |env| sleep(length); [200, {}, ['']] }
         get '/'
-        app.requests.mean.should be_within(length / 10).of(length)
+        app.agent.timer(:_requests).mean.should be_within(length / 10).of(length)
       end
-      
-      [ 200, 304, 404, 500].each do |status|
+
+      [200, 304, 404, 500].each do |status|
         it "should count #{status} HTTP status code as #{status / 100}xx" do
           @app = lambda{ |env| [status, {}, []] }
           lambda do
             get '/'
-          end.should change{ app.status_codes[status / 100].to_i }.by(1)
+          end.should change{ app.agent.counter(:"_status_#{status / 100}xx").to_i }.by(1)
         end
       end
       

metadata

@@ -1,102 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: ruby-metrics
 version: !ruby/object:Gem::Version
-  version: 0.9.3
-  prerelease: 
+  version: 0.9.4
 platform: ruby
 authors:
 - John Ewart
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
+        version: '2.3'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.8
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.7
 description: A Ruby implementation of metrics inspired by @coda's JVM metrics for
@@ -107,10 +98,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .bundle/config
-- .gitignore
-- .rvmrc
-- .travis.yml
+- ".bundle/config"
+- ".gitignore"
+- ".rvmrc"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -162,30 +153,40 @@ files:
 - spec/spec_helper.rb
 - spec/statistics/exponential_sample_spec.rb
 - spec/statistics/uniform_sample_spec.rb
-- spec/time_units_spec.rb
 homepage: https://github.com/johnewart/ruby-metrics
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
-signing_key: 
-specification_version: 3
+rubygems_version: 3.1.2
+signing_key:
+specification_version: 4
 summary: Metrics for Ruby
-test_files: []
+test_files:
+- spec/agent_spec.rb
+- spec/instruments/counter_spec.rb
+- spec/instruments/gauge_spec.rb
+- spec/instruments/histogram_spec.rb
+- spec/instruments/meter_spec.rb
+- spec/instruments/timer_spec.rb
+- spec/integration/rack_endpoint_spec.rb
+- spec/integration/rack_middleware_spec.rb
+- spec/reporter_spec.rb
+- spec/reporters/opentsdb_spec.rb
+- spec/spec_helper.rb
+- spec/statistics/exponential_sample_spec.rb
+- spec/statistics/uniform_sample_spec.rb

data/spec/time_units_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-describe Metrics::TimeUnit do
-  it "should raise NotImplementedError for #to_nsec" do
-    begin
-      Metrics::TimeUnit.to_nsec
-    rescue NotImplementedError
-      true
-    else
-      fail
-    end
-  end
-end