nosey 0.0.6 → 0.0.7

data/bin/nosey-test-client

@@ -9,4 +9,8 @@ Nosey::Munin.graph do
   category        'App'
   title           'My Cool Chart'
   vertical_label  'Response Time (seconds)'
+  filter do |name|
+    # Only show these 3 dudes
+    %w[min max avg].include? name
+  end
 end

data/bin/nosey-test-server

@@ -13,7 +13,7 @@ EM.run {
   puts "Starting nosey test server"
   EventMachine::Nosey::SocketServer.start(probes.report, '/tmp/nosey_test.socket')
 
-  EM::add_periodic_timer(1) do
+  EM::add_periodic_timer(2) do
     probes.increment 'ticks'
     probes.avg 'avg', rand
     probes.min 'min', rand

data/lib/nosey/eventmachine.rb

@@ -13,15 +13,23 @@ module EventMachine
         @report = report
       end
 
-      # Dump out the stats and close down the connection
-      def post_init
-        begin
+      def receive_data(data)
+        buffer << data
+        # Stop buffering if a newline is detected and process command
+        process_command buffer.strip if data =~ /\n/
+      end
+
+      def process_command(command)
+        case command
+        when 'READ' # This is for more normal uses cases where you want to watch stats
+          send_data report.to_s
+        when 'RESET' # This is used primarly by munin, or other tools that can't track state.
           send_data report.to_s
-        rescue => e
-          send_data "Exception! #{e}\n#{e.backtrace}"
-        ensure
-          close_connection
+          report.reset
+        else
+          send_data "No Comprende. send 'read' to see stats or 'reset' to read and reset."
         end
+        close_connection_after_writing
       end
 
       # A nice short-cut for peeps who aren't familar with EM to fire up
@@ -29,6 +37,11 @@ module EventMachine
       def self.start(report, host=SocketServer::Host, port=SocketServer::Port)
         EventMachine::start_server(host, port, self, report)
       end
+
+    private
+      def buffer
+        @buffer ||= ""
+      end
     end
   end
 end

data/lib/nosey/munin.rb

@@ -24,7 +24,7 @@ module Nosey
 
     # Parse a Nosey socket for Munin
     class Graph
-      attr_accessor :data, :title, :vertical_label, :category
+      attr_accessor :data, :title, :vertical_label, :category, :filter
       attr_writer :probe_set
 
       def initialize(data=nil)
@@ -67,13 +67,16 @@ module Nosey
       def munin_hash(root_key=nil,hash=self.probe_set)
         # TODO perform processing for more complicated probes, like samplers, etc
         hash.reduce({}) do |memo, (name, value)|
-          case value
-          when Hash # Its nested, go deep! Oooo yeah!
-            munin_hash(format_field(root_key, name), value).each do |name, value|
-              memo[format_field(root_key, name)] = value.to_a
+          # If there's NOt a filter OR we have a filter and it filters...
+          if !filter or (filter and filter.call(name))
+            case value
+            when Hash # Its nested, go deep! Oooo yeah!
+              munin_hash(format_field(root_key, name), value).each do |name, value|
+                memo[format_field(root_key, name)] = value.to_a
+              end
+            else # Its cool, return this mmmkay? Sheesh man
+              memo[format_field(root_key, name)] = [name, value]
             end
-          else # Its cool, return this mmmkay? Sheesh man
-            memo[format_field(root_key, name)] = [name, value]
           end
           memo
         end
@@ -88,10 +91,12 @@ module Nosey
         @title ||= probe_set
       end
 
-    private
-      def process_filter(hash)
-        hash.select{}
+      # Setup a filter from the graphing DSL so that we can grep out specific probes
+      def filter(&block)
+        block_given? ? @filter = block : @filter
       end
+
+    private
       # http://munin-monitoring.org/wiki/notes_on_datasource_names
       # Notes on field names
       # Each data source in a plugin must be identified by a field name. The following describes the name of the field:
@@ -114,6 +119,12 @@ module Nosey
 
     # A little DSL that lets us set the socket and report name we'll read
     class Graph::DSL
+      # We use this command to read Nosey data from the socket, but more
+      # importantly, reset it so that when we come back around the next time
+      # we can grab all the data that's occured since that time.
+      ResetCommand = "RESET\n"
+
+      # Default munin category. Zie app!
       Category = 'App'
 
       def initialize(&block)
@@ -147,6 +158,11 @@ module Nosey
         self
       end
 
+      def filter(&block)
+        @filter = block
+        self
+      end
+
       # Category this thing will be in
       def category(category=Category)
         @category = category
@@ -160,6 +176,7 @@ module Nosey
           c.category = @category
           c.title = @title
           c.vertical_label = @vertical_label
+          c.filter = @filter
         end
       end
 
@@ -171,7 +188,10 @@ module Nosey
 
       # Read the report YAML data from the socket
       def read_socket
-        UNIXSocket.new(@host).gets("\n\n")
+        p ResetCommand
+        socket = UNIXSocket.new(@host)
+        socket.puts(ResetCommand)
+        socket.gets("\n\n")
       end
     end
   end

data/lib/nosey/probe.rb

@@ -27,9 +27,12 @@ module Nosey
     end
 
     class Average < Base
+      def initialize(*args)
+        super(*args)
+        reset
+      end
+
       def sample(value)
-        @sum   ||= 0
-        @count ||= 0
         @sum   += value
         @count += 1
       end
@@ -37,6 +40,12 @@ module Nosey
       def value
         @sum.to_f / @count.to_f if @sum and @count > 0
       end
+
+      def reset
+        @sum   = 0
+        @count = 0
+        @count = 0
+      end
     end
 
     class Minimum < Base
@@ -147,6 +156,11 @@ module Nosey
       end
     end
 
+    # Reset the values in all the probes
+    def reset
+      probes.each{|_, probe| probe.reset }
+    end
+
   private
     # This factory creates probes based on the methods called from
     # the instrumentation. If a probe doesn't exist, we create an instance

data/lib/nosey/report.rb

@@ -29,6 +29,11 @@ module Nosey
       }
     end
 
+    # Reset all the counters in each probe.
+    def reset
+      probe_sets.each(&:reset)
+    end
+
     # String representation of all the probe_sets that's suitable for 
     # flushing out over a socket.
     def to_s

data/lib/nosey/version.rb

@@ -1,3 +1,3 @@
 module Nosey
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/nosey.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "eventmachine"
+  s.add_runtime_dependency "thor"
 
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'guard-rspec'
@@ -27,4 +28,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rb-fsevent'
   s.add_development_dependency 'em-ventually'
   s.add_development_dependency 'ruby-debug19'
-end
+end

data/spec/lib/eventmachine_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'yaml'
+
+describe EventMachine::Nosey::SocketServer do
+  include EM::Ventually
+
+  before(:each) do
+    @report = Nosey::Report.new do |r|
+      3.times do |n| 
+        r.probe_sets << Nosey::Probe::Set.new("Group #{n}") do |set|
+          set.increment 'hit'
+          set.increment 'hit'
+          set.touch 'generated-at'
+          set.avg 'zie-number-avg', 1
+        end
+      end
+    end
+  end
+
+  it "should read report data with READ command" do
+    EventMachine::Nosey::SocketServer.start @report
+    socket = Nosey::Test::ReadSocket.start('/tmp/nosey.socket')
+    socket.callback{|data|
+      @resp = data
+    }
+    socket.send_data("READ\n")
+
+    ly{2}.test{|count| YAML.load(@resp)['Group 0']['hit'] == count }
+  end
+
+  it "should reset report and read data with RESET command" do
+    @r1 = @r2 = nil
+
+    EventMachine::Nosey::SocketServer.start @report
+    
+    s1 = Nosey::Test::ReadSocket.start('/tmp/nosey.socket')
+    s2 = Nosey::Test::ReadSocket.start('/tmp/nosey.socket')
+
+    s1.send_data("RESET\n")
+    s1.callback{|data|
+      @r1 = data
+      s2.send_data("READ\n")
+      s2.callback{|data|
+        @r2 = data
+      }
+    }
+
+    ly{nil}.test{|count| YAML.load(@r2)['Group 0']['hit'] == count }
+  end
+end

data/spec/lib/nosey/munin_spec.rb

@@ -43,6 +43,13 @@ describe Nosey::Munin::Graph do
     end
   end
 
+  it "should filter" do
+    @graph.filter do |name|
+      name =~ /chopper-sum|chopper-avg/
+    end
+    @graph.munin_hash.should have(2).items
+  end
+
   context "sample" do
     before(:each) do
       @text = @graph.sample

data/spec/lib/nosey/probe_spec.rb

@@ -42,38 +42,88 @@ describe Nosey::Probe::Set do
     @probes.probe('barf').should be_instance_of(Nosey::Probe::Touch)
   end
 
+  it "should reset" do
+    @probes.touch('barf')
+    @probes.reset
+    @probes.probe('barf').value.should be_nil
+  end
+
   it "should return report" do
     @probes.report.probe_sets.first.should eql(@probes)
   end
 end
 
-describe Nosey::Probe do
-  it "should calculate sum" do
-    sum = Nosey::Probe::Sum.new
-    sum.sample(1)
-    sum.sample(2)
-    sum.value.should eql(3)
+describe Nosey::Probe::Sum do
+  before(:all) do
+    @sum = Nosey::Probe::Sum.new
+  end
+
+  it "should sum" do
+    @sum.sample(1)
+    @sum.sample(2)
+    @sum.value.should eql(3)
+  end
+
+  it "should reset" do
+    @sum.sample(1)
+    @sum.sample(2)
+    @sum.reset
+    @sum.value.should be_nil
+  end
+end
+
+describe Nosey::Probe::Maximum do
+  before(:all) do
+    @max = Nosey::Probe::Maximum.new
+  end
+
+  it "should know max" do
+    @max.sample(1)
+    @max.sample(3)
+    @max.value.should eql(3)
+  end
+
+  it "should reset" do
+    @max.sample(1)
+    @max.reset
+    @max.value.should be_nil
+  end
+end
+
+describe Nosey::Probe::Minimum do
+  before(:all) do
+    @min = Nosey::Probe::Minimum.new
   end
 
-  it "should calculate max" do
-    max = Nosey::Probe::Maximum.new
-    max.sample(1)
-    max.sample(3)
-    max.value.should eql(3)
+  it "should know max" do
+    @min.sample(1)
+    @min.sample(2)
+    @min.value.should eql(1)
   end
 
-  it "should calculate minimum" do
-    min = Nosey::Probe::Minimum.new
-    min.sample(1)
-    min.sample(2)
-    min.value.should eql(1)
+  it "should reset" do
+    @min.sample(2)
+    @min.reset
+    @min.value.should be_nil
   end
+end
 
-  it "should calculate average" do
-    avg = Nosey::Probe::Average.new
-    avg.sample(1)
-    avg.sample(2)
-    avg.value.should eql(1.5)
+describe Nosey::Probe::Average do
+  before(:all) do
+    @avg = Nosey::Probe::Average.new
+  end
+
+  it "should know avg" do
+    @avg.sample(1)
+    @avg.sample(2)
+    @avg.value.should eql(1.5)
+  end
+
+  it "should reset" do
+    @avg.sample(1)
+    @avg.sample(2)
+    @avg.reset
+    @avg.value.should be_nil
   end
 end
 
@@ -97,6 +147,12 @@ describe Nosey::Probe::Count do
   it "should set" do
     @counter.set(0).should eql(0)
   end
+
+  it "should reset" do
+    @counter.increment(1)
+    @counter.reset
+    @counter.value.should be_nil
+  end
 end
 
 describe Nosey::Probe::Touch do

data/spec/lib/nosey_spec.rb

@@ -1,25 +1 @@
-require 'spec_helper'
-
-describe EventMachine::Nosey::SocketServer do
-  include EM::Ventually
-
-  before(:each) do
-    @report = Nosey::Report.new do |r|
-      3.times do |n| 
-        r.probe_sets << Nosey::Probe::Set.new("Group #{n}") do |set|
-          set.increment 'hit'
-          set.touch 'generated-at'
-          set.avg 'zie-number-avg', 1
-        end
-      end
-    end
-  end
-
-  it "should write report to socket" do
-    EventMachine::Nosey::SocketServer.start @report
-    Nosey::Test::ReadSocket.start('/tmp/nosey.socket').callback{|data|
-      @response = data
-    }
-    ly{ @response }.test{|response| YAML.load(response).is_a?(Hash) }
-  end
-end
+require 'spec_helper'

data/spec/spec_helper.rb

@@ -29,7 +29,7 @@ module Nosey
       end
 
       def self.start(host,port=nil)
-        EventMachine::connect host, port, self
+        EventMachine::connect(host, port, self)
       end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nosey
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-16 00:00:00.000000000Z
+date: 2011-09-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70339837952660 !ruby/object:Gem::Requirement
+  requirement: &70234556114360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339837952660
+  version_requirements: *70234556114360
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &70234556113540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70234556113540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70339837952240 !ruby/object:Gem::Requirement
+  requirement: &70234556112860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837952240
+  version_requirements: *70234556112860
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70339837951820 !ruby/object:Gem::Requirement
+  requirement: &70234556110900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837951820
+  version_requirements: *70234556110900
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70339837951340 !ruby/object:Gem::Requirement
+  requirement: &70234556110300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837951340
+  version_requirements: *70234556110300
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70339837950920 !ruby/object:Gem::Requirement
+  requirement: &70234556109540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837950920
+  version_requirements: *70234556109540
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70339837950360 !ruby/object:Gem::Requirement
+  requirement: &70234556108520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837950360
+  version_requirements: *70234556108520
 - !ruby/object:Gem::Dependency
   name: em-ventually
-  requirement: &70339837949880 !ruby/object:Gem::Requirement
+  requirement: &70234556107600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837949880
+  version_requirements: *70234556107600
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70339837949240 !ruby/object:Gem::Requirement
+  requirement: &70234556106180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70339837949240
+  version_requirements: *70234556106180
 description: Nosey is a way to instrument your Evented Ruby applications to track
   counts, aggregates, etc. It was built a Poll Everywhere because we need a way to
   peer into our Evented apps and grab some basic statistics so that we could graph
@@ -127,6 +138,7 @@ files:
 - lib/nosey/report.rb
 - lib/nosey/version.rb
 - nosey.gemspec
+- spec/lib/eventmachine_spec.rb
 - spec/lib/nosey/instrumentation_spec.rb
 - spec/lib/nosey/munin_spec.rb
 - spec/lib/nosey/probe_spec.rb
@@ -158,6 +170,7 @@ signing_key:
 specification_version: 3
 summary: Instrument Ruby EventMachine applications
 test_files:
+- spec/lib/eventmachine_spec.rb
 - spec/lib/nosey/instrumentation_spec.rb
 - spec/lib/nosey/munin_spec.rb
 - spec/lib/nosey/probe_spec.rb