tremolo 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd301464b545211094d14f81fb7f5fabae6ee2b
-  data.tar.gz: 3f00b4c4eef1277501e6ba5107c4a87a0a7ae07c
+  metadata.gz: ac99676944c67bc64c93a2297aa481518119d8cf
+  data.tar.gz: a4f670b8c599a4f4ea57208f4647a82cbc77cd6e
 SHA512:
-  metadata.gz: bfb314678ffd0ac4ce31be0cb679c6153f02ef1bed74665a7870bfaa0a02bc585e2b0138d8d6d807f1905db0277e014dab2a71913a6b03c00da6ea043e18ba69
-  data.tar.gz: 0eb35699d48509e6d2d363b87683d50d7c6591ee1193cf76cb3c6a6dc1070aa770fbe510e7446d3bcf7c50d53072cd2e30e80a16daf45d18569186b38eb1954c
+  metadata.gz: 13ea2e22c5062d2c91626b90776126ee8fd15272197ea03621128b04ede7903acedfd0503fc9d85715ad12a264638d18bd9fbb153d0c23fb5dda768302bba993
+  data.tar.gz: 606d586a2bc999e0c7cc5e276609421bf449265f0e89fbabeb4d7115508c58b86bab5885d5feb95b7877f4321358efbd0e70c64d6ce860d68a14db6ca855b2de

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Tremolo 0.2.0 ##
+
+*   Adds tags to `Tracker` and `Series`
+
+    *Tony Pitale*
+
 ## Tremolo 0.1.0 ##
 
 *   Wireline compatibility with Influxdb 0.9 series

data/README.md

@@ -70,6 +70,14 @@ series = tracker.series('timing.series-name')
 value = series.time { Net::HTTP.get(URI('http://google.com')) }
 ```
 
+## Tags ##
+
+A Hash of `tags` data can be passed to `increment`, `decrement`, `timing`, and `time`, and `write_point`, as the last argument.
+
+```ruby
+series.write_point({:value => 18}, {:otherdata => 1986})
+```
+
 ## Databases, Namespace and Series names
 
 Since version 0.7.1 of InfluxDB, multiple databases can be configured for different UDP ports. All

data/lib/tremolo/data_point.rb

@@ -1,27 +1,51 @@
 module Tremolo
   class DataPoint
-    attr_accessor :series_name, :data, :time
+    attr_accessor :series_name, :tags, :values, :time
 
     def initialize(series_name, data, time=nil)
       self.series_name = series_name
-      self.data = data
       self.time = time.nil? ? nil : time.to_i
+
+      self.tags = data.fetch(:tags, {})
+      self.values = data.fetch(:values, [])
+    end
+
+    # key/value pairs of tag data
+    def tag_values
+      tags.map(&value_mapper).join(',')
     end
 
-    def values
-      @data.map {|h| h.map {|k,v| "#{k}=#{cast(v)}" }.join(',')}
+    # join the series name and tag values
+    def measurement_and_tags
+      [series_name, tag_values].delete_if {|v| v.to_s.length == 0}.join(',')
+    end
+
+    # join lines for each value
+    def lines
+      values.map(&line_format).join("\n")
+    end
+
+    private
+    def fields
+      values.map {|point| point.map(&value_mapper)}.join(',')
     end
 
     def cast(value)
       value
     end
 
-    def line
-      @line ||= lambda {|values| [series_name, values, time].compact.join(' ')}
+    def line_format
+      @line ||= lambda do |values|
+        [
+          measurement_and_tags,
+          fields,
+          time
+        ].compact.join(' ')
+      end
     end
 
-    def lines
-      values.map {|v| line.call(v)}.join("\n")
+    def value_mapper
+      lambda { |k,v| "#{k}=#{cast(v)}" }
     end
   end
 end

data/lib/tremolo/noop_tracker.rb

@@ -7,13 +7,13 @@ module Tremolo
       Series.new(self, series_name)
     end
 
-    def increment(series_name);end
-    def decrement(series_name);end
-    def timing(series_name, value);end
-    def time(series_name, &block)
+    def increment(series_name, tags = {});end
+    def decrement(series_name, tags = {});end
+    def timing(series_name, value, tags = {});end
+    def time(series_name, tags = {}, &block)
       block.call
     end
-    def write_point(series_name, data);end
-    def write_points(series_name, data);end
+    def write_point(series_name, data, tags = {});end
+    def write_points(series_name, data, tags = {});end
   end
 end

data/lib/tremolo/sender.rb

@@ -7,17 +7,17 @@ module Tremolo
       @socket.connect(host, port) # client
     end
 
-    def write_points(series_name, data)
+    def write_points(series_name, values, tags = {})
       begin
-        @socket.send(prepare(series_name, data), 0)
+        @socket.send(prepare(series_name, values, tags), 0)
       rescue Errno::ECONNREFUSED
         nil
       end
     end
 
     private
-    def prepare(series_name, data)
-      DataPoint.new(series_name, data).lines
+    def prepare(series_name, values, tags = {})
+      DataPoint.new(series_name, {:values => values, :tags => tags}).lines
     end
   end
 end

data/lib/tremolo/series.rb

@@ -8,28 +8,28 @@ module Tremolo
       @tracker, @series_name = tracker, series_name
     end
 
-    def increment
-      write_point({value: 1})
+    def increment(tags = {})
+      write_point({value: 1}, tags)
     end
 
-    def decrement
-      write_point({value: -1})
+    def decrement(tags = {})
+      write_point({value: -1}, tags)
     end
 
-    def timing(value)
-      write_point({value: value})
+    def timing(value, tags = {})
+      write_point({value: value}, tags)
     end
 
-    def time(&block)
-      tracker.time(series_name, &block)
+    def time(tags = {}, &block)
+      tracker.time(series_name, tags, &block)
     end
 
-    def write_point(data)
-      write_points([data])
+    def write_point(data, tags = {})
+      write_points([data], tags)
     end
 
-    def write_points(data)
-      tracker.write_points(series_name, data)
+    def write_points(data, tags = {})
+      tracker.write_points(series_name, data, tags)
     end
   end
 end

data/lib/tremolo/tracker.rb

@@ -16,32 +16,32 @@ module Tremolo
       Series.new(self, series_name)
     end
 
-    def increment(series_name)
-      write_point(series_name, {value: 1})
+    def increment(series_name, tags = {})
+      write_point(series_name, {value: 1}, tags)
     end
 
-    def decrement(series_name)
-      write_point(series_name, {value: -1})
+    def decrement(series_name, tags = {})
+      write_point(series_name, {value: -1}, tags)
     end
 
-    def timing(series_name, value)
-      write_point(series_name, {value: value})
+    def timing(series_name, value, tags = {})
+      write_point(series_name, {value: value}, tags)
     end
 
-    def time(series_name, &block)
+    def time(series_name, tags = {}, &block)
       start = Time.now
       block.call.tap do |_|
         value = ((Time.now-start)*1000).round
-        timing(series_name, value)
+        timing(series_name, value, tags)
       end
     end
 
-    def write_point(series_name, data)
-      write_points(series_name, [data])
+    def write_point(series_name, data, tags = {})
+      write_points(series_name, [data], tags)
     end
 
-    def write_points(series_name, data)
-      sender.async.write_points([namespace, series_name].compact.join('.'), data)
+    def write_points(series_name, data, tags = {})
+      sender.async.write_points([namespace, series_name].compact.join('.'), data, tags)
     end
 
     private

data/lib/tremolo/version.rb

@@ -1,3 +1,3 @@
 module Tremolo
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/spec/lib/tremolo/noop_tracker_spec.rb

@@ -20,6 +20,12 @@ describe Tremolo::NoopTracker do
     expect(socket).to have_received(:send).never
   end
 
+  it 'does not send single point with value 1 and tags' do
+    tracker.increment('accounts.created', {associated_id: 81102})
+
+    expect(socket).to have_received(:send).never
+  end
+
   it 'does not send single point with value -1' do
     tracker.decrement('accounts.created')
 

data/spec/lib/tremolo/series_spec.rb

@@ -16,7 +16,7 @@ describe Tremolo::Series do
 
     line = 'accounts.created value=111,associated_id=81102'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -25,7 +25,7 @@ describe Tremolo::Series do
 
     line = 'accounts.created value=1'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -34,7 +34,7 @@ describe Tremolo::Series do
 
     line = 'accounts.created value=-1'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -43,7 +43,7 @@ describe Tremolo::Series do
 
     line = 'accounts.created value=89'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -62,7 +62,7 @@ describe Tremolo::Series do
 
     line = 'accounts.created value=1050'
 
-    sleep 0.1
+    sleep 0.01
     expect(returned).to eq('returning another thing')
     expect(socket).to have_received(:send).with(line, 0)
   end

data/spec/lib/tremolo/tracker_spec.rb

@@ -15,7 +15,16 @@ describe Tremolo::Tracker do
 
     line = 'accounts.created value=111,associated_id=81102'
 
-    sleep 0.1
+    sleep 0.01
+    expect(socket).to have_received(:send).with(line, 0)
+  end
+
+  it 'sends tags formatted for InfluxDB', :celluloid => true do
+    tracker.write_point('accounts.created', {value: 111}, {associated_id: 81102})
+
+    line = 'accounts.created,associated_id=81102 value=111'
+
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -24,7 +33,7 @@ describe Tremolo::Tracker do
 
     line = 'accounts.created value=1'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -33,7 +42,7 @@ describe Tremolo::Tracker do
 
     line = 'accounts.created value=-1'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -42,7 +51,7 @@ describe Tremolo::Tracker do
 
     line = 'timing.accounts.created value=89'
 
-    sleep 0.1
+    sleep 0.01
     expect(socket).to have_received(:send).with(line, 0)
   end
 
@@ -61,7 +70,7 @@ describe Tremolo::Tracker do
 
     line = 'timing.accounts.created value=1014'
 
-    sleep 0.1
+    sleep 0.01
     expect(returned).to eq('returning a thing')
     expect(socket).to have_received(:send).with(line, 0)
   end
@@ -74,7 +83,7 @@ describe Tremolo::Tracker do
 
       line = 'alf.timing.accounts.created value=14'
 
-      sleep 0.1
+      sleep 0.01
       expect(socket).to have_received(:send).with(line, 0)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tremolo
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid-io