hallmonitor 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a94b8069a987ca9eb3493b18f47b5a92b45b3881
-  data.tar.gz: 44949242eb518251bb8327350c01f4001d978fb1
+  metadata.gz: 1079939216599f5d80202ba8bc96224365fbef78
+  data.tar.gz: 4fea628bc6f7faff08a44e71353ed8a4b6cdef17
 SHA512:
-  metadata.gz: 30c54a353d079bfffc7285d229a9b4224ebcf9378fe91412c8e83a5ce4dab7d617d5bc12499890644842be9d5e9864e7f75debaf2ccc74a9b6475e52021163aa
-  data.tar.gz: d17fbde9caa08887b1a704fe9ffa076f362e494b402afc599dee8e798c6f90783b7eef013268218144d08d291fe228d10a0b79795309de3f8ddc11fc52fe20bb
+  metadata.gz: 85a0f7f5276194396bc7b6c89d095661f676c4a511b61145b88a9129fa19fbfac3ebcfcfe447691555c43828a0410fc1933968f5110c60bfb6390bfcc786f567
+  data.tar.gz: dc97db0cf695876cc8aa50bb578bac2f2be58218c5fa7d349dc9eea46fbfed8dad7f3a659f5c2b9a06e50d69939359df9d63d97a83236e1e1e022b94dbcedf49

data/hallmonitor.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("json", [">= 0"])
 
   s.add_development_dependency("statsd-ruby", [">= 0"])
+  s.add_development_dependency("influxdb", ["~> 0.2.2"])
   s.add_development_dependency("rspec", [">= 3.0"])
   s.add_development_dependency("rdoc", [">= 0"])
   s.add_development_dependency("bundler", ["~> 1.3"])

data/lib/hallmonitor/event.rb

@@ -5,22 +5,24 @@ module Hallmonitor
   class Event
     include Hallmonitor::Monitored
 
-    attr_accessor :name, :time, :count
+    attr_accessor :name, :time, :count, :tags
 
     # Builds a new event
     # @param name [String] the name of this event
     # @param count [Number] the count of this even, defaults to 1
-    def initialize(name, count=1)
+    def initialize(name, count=1, tags: {})
       @name = name
       @time = Time.now
       @count = count
+      @tags = tags
     end
 
     def to_json(*a)
       {
         name: @name,
         time: @time,
-        count: @count
+        count: @count,
+        tags: @tags
       }.to_json(*a)
     end
   end

data/lib/hallmonitor/monitored.rb

@@ -62,10 +62,10 @@ module Hallmonitor
     # @param event [Mixed] The thing to emit, see method description
     # @yield [to_emit] The thing that's going to be emitted
     # @return nil
-    def emit(event = nil)
+    def emit(event = nil, tags: {})
       to_emit = self
       unless event.nil?
-        to_emit = event.is_a?(Hallmonitor::Event) ? event : Hallmonitor::Event.new(event)
+        to_emit = event.is_a?(Hallmonitor::Event) ? event : Hallmonitor::Event.new(event, tags: tags)
       end
 
       # If we were given a block, then we want to execute that
@@ -80,8 +80,8 @@ module Hallmonitor
     # @param name [String] The name of the event to emit
     # @yield [event] the event object that will be emitted
     # @return Whatever the block's return value is
-    def watch(name)
-      event = Hallmonitor::TimedEvent.new(name)
+    def watch(name, tags: {})
+      event = Hallmonitor::TimedEvent.new(name, tags: tags)
       event.start = Time.now
       begin
         yield(event)

data/lib/hallmonitor/outputters/influxdb.rb

@@ -0,0 +1,54 @@
+begin
+  require 'influxdb'
+rescue LoadError
+end
+
+module Hallmonitor
+  module Outputters
+    # An outputter for StatsD
+    class InfluxdbOutputter < Outputter
+      # Builds a new InfluxdbOutputter
+      # @param influxdb_client [InfluxDB::Client] client instance to use
+      # @param tags [Hash] Set of default tags applied to all events output to
+      #   InfluxDB, will be overridden by tags set by events if they conflict
+      # @raise if Statsd is undefined (Gem not present)
+      def initialize(influxdb_client, tags)
+        raise "In order to use InfluxdbOutputter, influxdb gem must be installed" unless defined?(InfluxDB)
+        super("influxdb")
+        @tags = tags
+        @client = influxdb_client
+      end
+
+      # Sends events to statsd instance
+      def process(event)
+        tags = @tags.merge(event.tags)
+
+        data = {}
+
+        if(event.respond_to?(:duration))
+          tags = {type: 'timer'}.merge(tags)
+          data = {
+            values: {value: event.duration},
+            tags: tags
+          }
+          @client.write_point(event.name, data)
+        elsif(event.respond_to?(:value))
+          tags = {type: 'guage'}.merge(tags)
+          data = {
+            values: {value: event.value},
+            tags: tags
+          }
+        else
+          tags = {type: 'count'}.merge(tags)
+          data = {
+            values: {value: event.count},
+            tags: tags
+          }
+        end
+
+        @client.write_point(event.name, data)
+      end
+
+    end
+  end
+end

data/lib/hallmonitor/timed_event.rb

@@ -11,8 +11,8 @@ module Hallmonitor
     # Builds a new {TimedEvent}
     # @param name [String] name of this event
     # @param duration [Number] the timespan of this event
-    def initialize(name, duration=nil)
-      super(name)
+    def initialize(name, duration=nil, tags: {})
+      super(name, tags: tags)
       @duration = duration
     end
 

data/lib/hallmonitor/version.rb

@@ -1,7 +1,7 @@
 module Hallmonitor
   module Version
     MAJOR = 1
-    MINOR = 0
+    MINOR = 1
     PATCH = 0
     BUILD = nil
 

data/spec/hallmonitor/monitored_spec.rb

@@ -18,6 +18,10 @@ RSpec::Matchers.define :an_event_with_name do |expected_name|
   match { |actual| actual.is_a?(Hallmonitor::Event) && actual.name == expected_name }
 end
 
+RSpec::Matchers.define :an_event_with_tags do |expected_tags|
+  match { |actual| actual.is_a?(Hallmonitor::Event) && actual.tags == expected_tags}
+end
+
 RSpec::Matchers.define :a_timed_event_with_name do |expected_name|
   match { |actual| actual.is_a?(Hallmonitor::TimedEvent) && actual.name == expected_name }
 end
@@ -65,6 +69,19 @@ RSpec.describe Hallmonitor::Monitored do
       end
     end
 
+    describe 'with tags' do
+      let(:name) { 'foo'}
+      let(:tags) { {'foo': 'bar', 'baz': 6}}
+
+      it 'emits an event with tags' do
+        expect(Hallmonitor::Dispatcher).to(
+          receive(:output).with(an_event_with_tags(tags)))
+        subject.watch(name, tags: tags) do
+          'foo'
+        end
+      end
+    end
+
     describe 'when the block raises an error' do
       it 'emits a timer for the block' do
         expect(Hallmonitor::Dispatcher).to(
@@ -89,6 +106,17 @@ RSpec.describe Hallmonitor::Monitored do
       end
     end
 
+    describe 'with tags' do
+      let(:name) { 'foo'}
+      let(:tags) { {'foo': 'bar', 'baz': 6}}
+
+      it 'emits an event with tags' do
+        expect(Hallmonitor::Dispatcher).to(
+          receive(:output).with(an_event_with_tags(tags)))
+        subject.emit(name, tags: tags)
+      end
+    end
+
     describe 'with a block' do
       it 'yields to the block' do
         yielded = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hallmonitor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris TenHarmsel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: influxdb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -145,6 +159,7 @@ files:
 - lib/hallmonitor/middleware.rb
 - lib/hallmonitor/monitored.rb
 - lib/hallmonitor/outputter.rb
+- lib/hallmonitor/outputters/influxdb.rb
 - lib/hallmonitor/outputters/iooutputter.rb
 - lib/hallmonitor/outputters/new_relic.rb
 - lib/hallmonitor/outputters/statsd_outputter.rb