afstatsd 0.0.6 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: fcd5274479446c117aaebad88da0017217811b42
+  data.tar.gz: c51a9ebb07b3a6bdc1a103abf482f8ad70b80ba0
+SHA512:
+  metadata.gz: a2bb4716829b8cf60545a28843ac7d5241f7bef16e2df343bbbeb8e1162ec0f63d8b4a3736307302bb0fb00bae1b4e9d0d65e7a38bfc1413af8f65f1a5a10055
+  data.tar.gz: 340cc6a81b6c9c35431738e148458596b60fbf8c35fb1ebf7955aa8fab544136794ac3066207c903bccfa7476fb92e562edc8ede9032bf28c983956c2db7151e

data/example/example.rb

@@ -1,10 +1,9 @@
 require 'afstatsd'
 
-#$statsd = Statsd.new 'statsd_server.my_company.com', 8125, 20
-
+#$statsd = Statsd.new 'localhost', 8125, 0, 'udp'
 $statsd = Statsd.new     # use defaults
-$statsd.namespace = 'test.ruby'
 
+$statsd.namespace = 'test.ruby'
 
 $statsd.increment 'counter1'
 $statsd.increment 'counter1'
@@ -13,34 +12,34 @@ $statsd.decrement 'counter1'        #counters accumulate
 $statsd.gauge 'gauge1', 1024
 $statsd.gauge 'gauge1', 1025
 $statsd.gauge 'gauge1', 1026
-$statsd.gauge 'gauge1', 1027      
+$statsd.gauge 'gauge1', 1027
 $statsd.gauge 'gauge1', 1028        # gauges get overwritten when aggregated
 
-$statsd.time('timing1'){sleep 0.01}        
-$statsd.time('timing1'){sleep 0.02}
-$statsd.time('timing1'){sleep 0.03}
-$statsd.time('timing1'){sleep 0.04}    # timings get averaged when aggregated
+$statsd.time('timing1'){sleep 0.1}
+$statsd.time('timing1'){sleep 0.2}
+$statsd.time('timing1'){sleep 0.3}
+$statsd.time('timing1'){sleep 0.4}    # timings get averaged when aggregated
 
 
 =begin
 
-100.times do 
-    $statsd.increment 'sampled', 0.1, 'sampled'
+100.times do
+    $statsd.increment 'sampled', 0.1
 end
 
-$statsd.set 'set1', 1099, "ez"    
+$statsd.set 'set1', 1099
 
 for i in 10..19 do
     $statsd.increment "counter#{i}"  # create a group of counters
-end    
+end
 
-1000.times do 
+1000.times do
     $statsd.increment 'fast'            # don't do this if aggregation is off
-end    
+end
 
 15.times do
     sleep 2
-    $statsd.increment 'slow'             
+    $statsd.increment 'slow'
 end
 
 =end
@@ -50,11 +49,11 @@ end
 threads = []
 start = Time.now
 for i in 0..9 do
-    threads << Thread.new(i) do |j| 
+    threads << Thread.new(i) do |j|
         start = Time.now
         1000000.times do
             $statsd.increment 'inthethread'
-#            sleep(0.01)
+            sleep(0.01)
         end
         puts "thread #{j} says: I took #{((Time.now - start)*1000).round} ms"
     end

data/lib/afstatsd.rb

@@ -7,9 +7,10 @@ require 'afstatsd/statsd_aggregator'
 require 'monitor'
 require 'fcntl'
 
-# = Statsd: A Statsd client (https://github.com/etsy/statsd)
+# = Statsd: An AppFirst Statsd client
+#   (https://github.com/appfirst/statsd_clients/tree/master/ruby)
 #
-# @example Set up a global Statsd client for a server on localhost:9125, 
+# @example Set up a global Statsd client for a server on localhost:9125,
 #                                aggregate 20 seconds worth of metrics
 #   $statsd = Statsd.new 'localhost', 8125, 20
 # @example Send some stats
@@ -43,7 +44,7 @@ class Statsd
     attr_reader :prefix
 
     # a postfix to append to all metrics
-    attr_reader :postfix 
+    attr_reader :postfix
 
     # count of messages that were dropped due to transmit error
     attr_reader :dropped
@@ -58,13 +59,13 @@ class Statsd
 
     # @param [String] host your statsd host
     # @param [Integer] port your statsd port
-    # @param [Integer] interval for aggregatore
-    def initialize(host = '127.0.0.1', port = 8125, interval = 20)
+    # @param [Integer] interval for aggregator
+    def initialize(host='127.0.0.1', port=8125, interval=20, transport='mq')
         self.host, self.port = host, port
         @prefix = nil
         @postfix = nil
         @aggregator = StatsdAggregator.new(interval)
-	if RUBY_PLATFORM =~ /linux/i
+        if RUBY_PLATFORM =~ /linux/i and transport == 'mq'
             set_transport :mq_transport
         else
             set_transport :udp_transport
@@ -134,20 +135,18 @@ class Statsd
     #
     # @param [String] stat stat name
     # @param [Numeric] sample_rate sample rate, 1 for always
-    # @param [String] optional note (AppFirst extension to StatsD)
     # @see #count
-    def increment(stat, sample_rate=1, note="")
-        count stat, 1, sample_rate, note
+    def increment(stat, sample_rate=1)
+        count stat, 1, sample_rate
     end
 
     # Sends a decrement (count = -1) for the given stat to the statsd server.
     #
     # @param [String] stat stat name
     # @param [Numeric] sample_rate sample rate, 1 for always
-    # @param [String] optional note (AppFirst extension to StatsD)
     # @see #count
-    def decrement(stat, sample_rate=1, note="")
-        count stat, -1, sample_rate, note
+    def decrement(stat, sample_rate=1)
+        count stat, -1, sample_rate
     end
 
     # Sends an arbitrary count for the given stat to the statsd server.
@@ -155,10 +154,9 @@ class Statsd
     # @param [String] stat stat name
     # @param [Integer] count count
     # @param [Numeric] sample_rate sample rate, 1 for always
-    # @param [String] optional note (AppFirst extension to StatsD)
-    def count(stat, count, sample_rate=1, note="")
+    def count(stat, count, sample_rate=1)
         if sample_rate == 1 or rand < sample_rate
-            send_metric StatsdMetrics::CMetric.new(expand_name(stat), count.round, sample_rate, note)
+            send_metric StatsdMetrics::CMetric.new(expand_name(stat), count.round, sample_rate)
         end
     end
 
@@ -170,11 +168,10 @@ class Statsd
     #
     # @param [String] stat stat name.
     # @param [Numeric] value gauge value.
-    # @param [String] optional note (AppFirst extension to StatsD)
     # @example Report the current user count:
     #   $statsd.gauge('user.count', User.count)
-    def gauge(stat, value, note="")
-        send_metric StatsdMetrics::GMetric.new(expand_name(stat), value, note)
+    def gauge(stat, value)
+        send_metric StatsdMetrics::GMetric.new(expand_name(stat), value)
     end
 
     # Sends an arbitary set value for the given stat to the statsd server.
@@ -186,11 +183,10 @@ class Statsd
     #
     # @param [String] stat stat name.
     # @param [Numeric] value event value.
-    # @param [String] optional note (AppFirst extension to StatsD)
     # @example Report a deployment happening:
     #   $statsd.set('deployment', DEPLOYMENT_EVENT_CODE)
-    def set(stat, value, note="")
-        send_metric StatsdMetrics::SMetric.new(expand_name(stat), value, note)
+    def set(stat, value)
+        send_metric StatsdMetrics::SMetric.new(expand_name(stat), value)
     end
 
     # Sends a timing (in ms) for the given stat to the statsd server. The
@@ -201,26 +197,24 @@ class Statsd
     # @param [String] stat stat name
     # @param [Integer] ms timing in milliseconds
     # @param [Numeric] sample_rate sample rate, 1 for always
-    # @param [String] optional note (AppFirst extension to StatsD)
-    def timing(stat, ms, sample_rate=1, note="")
+    def timing(stat, ms, sample_rate=1)
         if sample_rate == 1 or rand < sample_rate
-            send_metric StatsdMetrics::TMetric.new(expand_name(stat), ms.round, sample_rate, note)
-        end    
+            send_metric StatsdMetrics::TMetric.new(expand_name(stat), ms.round, sample_rate)
+        end
     end
 
     # Reports execution time of the provided block using {#timing}.
     #
     # @param [String] stat stat name
     # @param [Numeric] sample_rate sample rate, 1 for always
-    # @param [String] optional note (AppFirst extension to StatsD)
     # @yield The operation to be timed
     # @see #timing
     # @example Report the time (in ms) taken to activate an account
     #   $statsd.time('account.activate') { @account.activate! }
-    def time(stat, sample_rate=1, note="")
+    def time(stat, sample_rate=1)
         start = Time.now
         result = yield
-        timing(stat, ((Time.now - start) * 1000).round, sample_rate, note)
+        timing(stat, ((Time.now - start) * 1000).round, sample_rate)
         result
     end
 
@@ -230,70 +224,74 @@ class Statsd
         # All the metric types above funnel to here.  We will send or aggregate.
         if aggregating
             @aggregator.add metric
-        else 
+        else
             @transport.call(metric)
         end
     end
 
     def expand_name(name)
         # Replace Ruby module scoping with '.' and reserved chars (: | @) with underscores.
-        name = name.to_s.gsub('::', '.').tr(':|@', '_') 
+        name = name.to_s.gsub('::', '.').tr(':|@', '_')
         "#{prefix}#{name}#{postfix}"
     end
 
     def udp_transport(metric)
         if @debugging
-            puts "socket < #{metric}\n" #debug
-        end    
-        self.class.logger.debug { "Statsd: #{metric}" } if self.class.logger
-        socket.send(metric.to_s, 0, @host, @port)
+            puts "Sending to UDP -- #{metric.to_s(true)} \n" #debug
+        end
+        self.class.logger.debug { "Statsd: #{metric.to_s(true)}" } if self.class.logger
+        socket.send(metric.to_s(true), 0, @host, @port)
         rescue => boom
-            #puts "socket send error"
             @dropped +=1
             self.class.logger.debug { "Statsd: #{boom.class} #{boom}" } if self.class.logger
+            if @debugging
+                puts "UDP: socket send error\n"
+            end
             nil
     end
 
     STATSD_SEVERITY = 3
     def mq_transport(metric)
         if @debugging
-            puts "MQ < #{metric}\n" #debug
-        end    
-        self.class.logger.debug { "Statsd: #{metric}" } if self.class.logger
-        if not @mq 
+            puts "Sending to MQ -- #{metric.to_s} \n" #debug
+        end
+        self.class.logger.debug { "Statsd: #{metric.to_s}" } if self.class.logger
+        if not @mq
             begin
                 @mq = POSIX_MQ.new("/afcollectorapi", Fcntl::O_WRONLY | Fcntl::O_NONBLOCK)
             rescue => boom
                 self.class.logger.debug { "Statsd: MQ open error #{boom.class} #{boom}" } if self.class.logger
+                if @debugging
+                    puts "Statsd: MQ open error. Fallback to UDP.\n"
+                end
                 # failed to open MQ.  Fall back to UPD transport.  Note:  Current message will be lost.
                 @dropped += 1
-                # puts "fallback to udp"
                 set_transport :udp_transport
                 return nil
-            end    
+            end
         end
         begin
             @mq.send(metric.to_s, STATSD_SEVERITY)
         rescue => boom
             # just drop it on the floor
             @dropped += 1
-            #puts "MQ send error: #{boom.class} #{boom}"
             self.class.logger.debug { "Statsd: MQ Send Error#{boom.class} #{boom}" } if self.class.logger
+            if @debugging
+                puts "Statsd: MQ send error: #{boom.class} #{boom}\n"
+            end
             nil
-        end    
+        end
     end
 
     def both_transport(metric)
         mq_transport(metric)
         udp_transport(metric)
     end
-    
+
     private
 
     def socket
         Thread.current[:statsd_socket] ||= UDPSocket.new
     end
-    
-end     # class Statsd
-
 
+end     # class Statsd

data/lib/afstatsd/statsd_aggregator.rb

@@ -1,19 +1,19 @@
 # Statsd Aggregator
 #
-# Used to aggregate metrics in a threaded environment.  Only one of these 
+# Used to aggregate metrics in a threaded environment.  Only one of these
 # should be created, in the main thread.
-# For each thread, we create 2 buffers.  The thread will be writing to 
+# For each thread, we create 2 buffers.  The thread will be writing to
 # one, while the aggregator reads from the other.  The aggregator will
 # control which set is which.
-  
-  
- class StatsdAggregator 
+
+
+ class StatsdAggregator
     attr_accessor :transport
 
     def initialize(interval=20)
         @interval = interval
         @timer = nil
-        @mutex = Mutex.new    
+        @mutex = Mutex.new
         @running = false
         @left_buffers = {}        # 2 buffer groups
         @right_buffers = {}       #   each buffer group is a hash
@@ -23,10 +23,10 @@
         # register for at_exit call back, so we can flush our buffers
         at_exit do
             if @running
-                flush_buffers 
+                flush_buffers
                 swap_buffers
                 flush_buffers
-            end 
+            end
         end
 
         # in Rails, under PhusionPassener, we may be spun up in a new process,
@@ -36,8 +36,8 @@
                 if forked
                     Statsd.logger.debug {"PHUSION Forked! pid:#{Process.pid}"} if Statsd.logger
                     self.start(nil, true) if @running
-                end 
-            end        
+                end
+            end
         end
 
         if RUBY_PLATFORM =~ /linux/i
@@ -58,7 +58,7 @@
                 flush_buffers
             end
         end
-    end    
+    end
 
     def start(transport, force_restart=false)
         Statsd.logger.debug {"START    pid:#{Process.pid}"} if Statsd.logger
@@ -78,29 +78,29 @@
         @running = true
         #puts "aggregation started.  Interval=#{@interval}"
     end
-    
+
     def stop
         return if not @running    # already stopped
-        flush_buffers                    
+        flush_buffers
         @timer.kill if @timer
         @timer = nil
         @running = false
         #puts "aggregation stopped"
     end
-  
+
     def set_interval(interval)
         @interval = interval
     end
-    
+
     # the following methods are thread safe
-    
+
     def running
         @running
     end
 
     # this is the only method that should be used by child threads.
     def add(metric)
-        # We should have a write buffer assigned to our thread.  
+        # We should have a write buffer assigned to our thread.
         # Create one if not.
         #Statsd.logger.debug {"ADD      pid:#{Process.pid}"} if Statsd.logger
         unless write_buffer = @wbufs[Thread.current]
@@ -121,13 +121,13 @@
         end
         #puts "Thread #{Thread.current}: Added metric: #{metric}"
     end
-    
+
     private
-    
+
     # Next two methods are called at different times during the interval,
     # so any writes in progress after the swap will have time to complete.
 
-    def swap_buffers 
+    def swap_buffers
         #Statsd.logger.debug {"SWAP     pid:#{Process.pid}"} if Statsd.logger
         if @rbufs == @left_buffers
             @rbufs = @right_buffers
@@ -137,33 +137,33 @@
             @wbufs = @right_buffers
         end
     end
-    
+
     def flush_buffers
         # Statsd.logger.debug {"FLUSH    pid:#{Process.pid}"} if Statsd.logger
         # Each thread has it's own read buffer.  If it's empty, the
         # thread might be dead.  We'll delete it's read buffer.
         @rbufs.delete_if { |k, rb| rb.empty? }
-        
-        # If not empty, aggregate all the data across all the threads, 
+
+        # If not empty, aggregate all the data across all the threads,
         # then send.
         send_buffer = {}
         @rbufs.each_value do |rb|
             rb.each_value do |metric|
                 if m = send_buffer[metric.name]
                     m.aggregate metric.value
-                else    
+                else
                     send_buffer[metric.name] = metric
-                end    
+                end
             end
-            # once we've aggregated all the metrics from this 
-            # thread, clear out the buffer, but don't remove it.        
+            # once we've aggregated all the metrics from this
+            # thread, clear out the buffer, but don't remove it.
             rb.clear
-        end    
-        #puts "nothing to send" if send_buffer.empty? 
+        end
+        #puts "nothing to send" if send_buffer.empty?
         send_buffer.each_value do |metric|
         #Statsd.logger.debug {"    transporting metric #{metric.to_s}"} if Statsd.logger
             @transport.call(metric)
-        end    
+        end
     end
-    
+
 end    # class StatsdAggregator

data/lib/afstatsd/statsd_metrics.rb

@@ -7,97 +7,105 @@ class Metric
     # all metrics share these
     attr_accessor :name
     attr_accessor :value
-    attr_accessor :message
+
+    def to_s(udp=false)
+        # Handle differences in upload method if sending via UDP or to AppFirst
+        if udp
+            _to_udp_s
+        else
+            _to_af_s
+        end
+    end
+
+    def _to_udp_s
+        # Should be overridden by child class
+        raise NotImplementedError
+    end
+
+    def _to_af_s
+        # Return the same value by default
+        _to_udp_s
+    end
+
 end
 
 class CMetric < Metric
     # Counter
-    def initialize(name, value, rate=1, msg="")
+    def initialize(name, value, rate=1)
         @name = name
         @value = value
-        @message = msg
         @sample_rate = rate
     end
-    
+
     def aggregate(delta)
         @value += delta        #accumulate
     end
-    
-    def to_s
-        if @sample_rate == 1 then r = "" else r = "|@#{@sample_rate}" end    
-        if @message == "" 
-            m = "" 
-        else 
-            if r == "" 
-                m = "||#{@message}" 
-            else    
-                m = "|#{@message}" 
-            end
-        end
-        "#{name}:#{@value}|c#{r}#{m}"
+
+    def _to_udp_s
+        if @sample_rate == 1 then r = "" else r = "|@#{@sample_rate}" end
+        "#{name}:#{@value}|c#{r}"
     end
 end
 
 class GMetric < Metric
-    # Guage
-    def initialize(name, value, msg="")
+    # Gauge
+    def initialize(name, value)
         @name = name
         @value = value
-        @message = msg
     end
-    
+
     def aggregate(value)
         @value = value        #overwrite
     end
-    
-    def to_s
-        if @message == "" then m = "" else m = "|#{@message}" end
-        "#{name}:#{@value}|g#{m}"
+
+    def _to_udp_s
+        "#{name}:#{@value}|g"
     end
 
 end
 
 class TMetric < Metric
     # Timing
-    def initialize(name, value, rate=1, msg="")
+    def initialize(name, value, rate=1)
         @name = name
-        @value = value
-        @sample_rate = rate
-        @message = msg
+        @value = [value]
         @count = 1
     end
-    
+
     def aggregate(value)
-        @value += value        #average
+        # Value is another TMetric @value attribute (Array)
+        @value += value
         @count += 1
     end
-    
-    def to_s
-        avg = @value / @count
-        if @message == "" then m = "" else m = "|#{@message}" end
-        "#{name}:#{avg}|ms#{m}"
+
+    def _to_udp_s
+        sumvals = @value.inject(0) {|sum, i|  sum + i }
+        avg = sumvals / @count
+        "#{name}:#{avg}|ms"
+    end
+
+    def _to_af_s
+        vals = @value.join(",")
+        "#{name}:#{vals}|ms"
     end
 
 end
 
 class SMetric < Metric
     # Set (per the etsy standard)
-    def initialize(name, value, msg="")
+    def initialize(name, value)
         @name = name
         @value = value
-        @message = msg
     end
-    
+
     def aggregate(value)
         @value = value        #overwrite
     end
-    
-    def to_s
-        if @message == "" then m = "" else m = "|#{@message}" end
-        "#{name}:#{@value}|s#{m}"
+
+    def _to_udp_s
+        "#{name}:#{@value}|s"
     end
 
 end
 
 end     #module StatsdMetrics
-

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: afstatsd
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
+- Mike Okner
 - Clark Bremer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies: []
 description: A StatsD library with AppFirst Extensions
-email: clark@appfirst.com
+email: michael@appfirst.com
 executables: []
 extensions:
 - ext/mkrf_conf.rb
@@ -23,29 +23,28 @@ files:
 - lib/afstatsd/statsd_metrics.rb
 - example/example.rb
 - ext/mkrf_conf.rb
-homepage: http://appfirst.com
+homepage: http://www.appfirst.com/
 licenses:
 - APACHE
+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.25
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: AppFirst StatsD Library
 test_files: []