metriks-addons 3.0.2 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b87ff8ce94b283989659aee055996133bd0b9d6e
-  data.tar.gz: b32c67b731da0fe2838466015dacf5afe80fdf8e
+  metadata.gz: bcbc0e57a8758b175915828c5c5007b1f067d69f
+  data.tar.gz: 523a7eb2da554eaa945db81589cdb6e5f98fae78
 SHA512:
-  metadata.gz: 58fa4a57073b07d8de67961c971580b9858cf54ed044f654bce361d6cf5c802286ae91321fc17f7025cd6a9a1bbdb96d14f25397aa550a8934714742bac9c897
-  data.tar.gz: 475d780d15e849204f9448409bd259017edef32d39853fe6a2f4bfc01399ba2dddc73ab7e951474f33b02d1ec5c4f8fdd92698b09c7654863558ffeb82b7da5d
+  metadata.gz: d33693fccd7cb36b04921bc8db7d42c61f16474f8146f94be831ee9d4c9a7aaf01377c7567ce20660cff6b67a1349559639f91edf347b947cb4a0a3426982e90
+  data.tar.gz: 1cd610978a3f47c8210b322c24b0531a099f354713cbd13b66fff70af6cfd9d42bd98d34a2210f35894c520f7fa3221bcdaad027e80d6066667b3926fd937b90

data/lib/metriks-addons.rb

@@ -1,7 +1,7 @@
-require 'metriks-addons/opentsdb_reporter'
-require 'metriks-addons/signalfx_reporter'
-require 'metriks-addons/cloudwatch_reporter'
+require_relative 'metriks-addons/opentsdb_reporter'
+require_relative 'metriks-addons/signalfx_reporter'
+require_relative 'metriks-addons/cloudwatch_reporter'
 
 module MetriksAddons
-  VERSION = '3.0.2'
+  VERSION = '3.1.0'
 end

data/lib/metriks-addons/cloudwatch_reporter.rb

@@ -2,7 +2,7 @@ require 'metriks/time_tracker'
 require 'logger'
 require 'aws'
 require 'time'
-require 'metriks-addons/base_reporter'
+require_relative 'base_reporter'
 
 module MetriksAddons
   class CloudWatchReporter < BaseReporter

data/lib/metriks-addons/opentsdb_reporter.rb

@@ -1,7 +1,7 @@
 require 'metriks/time_tracker'
 require 'rest-client'
 require 'logger'
-require 'metriks-addons/base_reporter'
+require_relative 'base_reporter'
 
 module MetriksAddons
   class OpenTSDBReporter < BaseReporter

data/lib/metriks-addons/signalfx_reporter.rb

@@ -1,17 +1,15 @@
 require 'metriks/time_tracker'
-require 'rest-client'
 require 'logger'
-require 'metriks-addons/base_reporter'
+require 'signalfx'
+require_relative 'base_reporter'
 
 module MetriksAddons
   class SignalFxReporter < BaseReporter
-    attr_accessor :prefix, :source, :data, :hostname, :tags, :logger
+    attr_accessor :client, :prefix, :source, :data, :tags, :logger
 
-    def initialize(h, token, id, tags, options = {})
+    def initialize(token, tags, options = {})
       super(options)
-      @hostname = h
       @x_sf_token = token
-      @orgid = id
       @tags = tags
 
       @prefix = options[:prefix]
@@ -19,24 +17,14 @@ module MetriksAddons
 
       @batch_size   = options[:batch_size] || 50
 
-      if not @logger.nil?
-        RestClient.log =
-          Object.new.tap do |proxy|
-            def proxy.<<(message)
-              Rails.logger.debug message
-            end
-          end
-      end
+      @client = SignalFx.new @x_sf_token, batch_size: @batch_size
     end
 
     def submit(datapoints)
       return if datapoints.empty?
 
-      jsonstr = datapoints.to_json
-      log "debug", "Json for SignalFx: #{jsonstr}"
-      response  = RestClient.post "#{@hostname}?orgid=#{@orgid}",
-						        jsonstr,
-						        :content_type => :json, :accept => :json, :'X-SF-TOKEN' => @x_sf_token
+      log "debug", "Datapoints for SignalFx: #{datapoints.inspect}"
+      response = @client.send(counters: datapoints[:counters], gauges: datapoints[:gauges])
       log "debug", "Sent #{datapoints.size} metrics to SignalFX"
       log "debug", "Response is: #{response}"
     end
@@ -58,7 +46,7 @@ module MetriksAddons
         case metric
         when Metriks::Meter
           counter |= create_datapoints name, metric, time, [
-            :count, :mean_rate
+            :count
           ]
         when Metriks::Counter
           counter |= create_datapoints name, metric, time, [
@@ -78,9 +66,8 @@ module MetriksAddons
         end
       end
 
-      datapoints[:counter] = counter if counter.any?
-      datapoints[:gauge] = gauge if gauge.any?
-
+      datapoints[:counters] = counter if counter.any?
+      datapoints[:gauges] = gauge if gauge.any?
       datapoints
     end
 

data/metriks-addons.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'metriks-addons'
-  s.version           = '3.0.2'
-  s.date              = '2015-11-17'
+  s.version           = '3.1.0'
+  s.date              = '2015-11-23'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

data/spec/cloudwatch_spec.rb

@@ -4,7 +4,7 @@ require 'metriks-addons/cloudwatch_reporter'
 
 describe "Smoke test" do
   before(:each) do
-    AWS::CloudWatch.any_instance.stub(:put_metric_data)
+    allow_any_instance_of(AWS::CloudWatch).to receive(:put_metric_data)
     @registry = Metriks::Registry.new
     @reporter = MetriksAddons::CloudWatchReporter.new(
       'DummyDummyDummyDummy',

data/spec/signalfx_spec.rb

@@ -10,10 +10,8 @@ describe "Smoke test" do
   before(:each) do
     @registry = Metriks::Registry.new
     @reporter = MetriksAddons::SignalFxReporter.new(
-      'http://localhost:4242',
       "123456789",
-      "ABCD",
-      {:env => "test"},
+      [{:env => "test"}],
       { :registry => @registry, :batch_size => 3})
   end
 
@@ -25,62 +23,57 @@ describe "Smoke test" do
   it "meter" do
     @registry.meter('meter.testing').mark
     datapoints = @reporter.get_datapoints
-    expect(datapoints[:counter].size).to eql(2)
-    expect(datapoints[:counter][0][:metric]).to eql("meter.testing.count")
-    expect(datapoints[:counter][0][:value]).to eql(1)
-    expect(datapoints[:counter][0][:dimensions]).to include(:env => "test")
-    expect(datapoints[:counter][0][:timestamp]).not_to be_nil
-
-    expect(datapoints[:counter][1][:metric]).to eql("meter.testing.mean_rate")
-    expect(datapoints[:counter][1][:value]).not_to be_nil
-    expect(datapoints[:counter][1][:dimensions]).to include(:env => "test")
-    expect(datapoints[:counter][1][:timestamp]).not_to be_nil
+    expect(datapoints[:counters].size).to eql(1)
+    expect(datapoints[:counters][0][:metric]).to eql("meter.testing.count")
+    expect(datapoints[:counters][0][:value]).to eql(1)
+    expect(datapoints[:counters][0][:dimensions]).to include(:env => "test")
+    expect(datapoints[:counters][0][:timestamp]).not_to be_nil
   end
 
-  it "counter" do
+  it "counters" do
     @registry.counter('counter.testing').increment
     datapoints = @reporter.get_datapoints
-    expect(datapoints[:counter].size).to eql(1)
-    expect(datapoints[:counter][0][:metric]).to eql("counter.testing.count")
-    expect(datapoints[:counter][0][:value]).to eql(1)
-    expect(datapoints[:counter][0][:dimensions]).to include(:env => "test")
-    expect(datapoints[:counter][0][:timestamp]).not_to be_nil
+    expect(datapoints[:counters].size).to eql(1)
+    expect(datapoints[:counters][0][:metric]).to eql("counter.testing.count")
+    expect(datapoints[:counters][0][:value]).to eql(1)
+    expect(datapoints[:counters][0][:dimensions]).to include(:env => "test")
+    expect(datapoints[:counters][0][:timestamp]).not_to be_nil
   end
 
   it "timer" do
     @registry.timer('timer.testing').update(1.5)
     datapoints = @reporter.get_datapoints
-    expect(datapoints[:counter].size).to eql(1)
-    expect(datapoints[:gauge].size).to eql(3)
-    expect(datapoints[:counter][0][:metric]).to eql("timer.testing.count")
-    expect(datapoints[:counter][0][:value]).to eql(1)
-    expect(datapoints[:counter][0][:dimensions]).to include(:env => "test")
-    expect(datapoints[:counter][0][:timestamp]).not_to be_nil
+    expect(datapoints[:counters].size).to eql(1)
+    expect(datapoints[:gauges].size).to eql(3)
+    expect(datapoints[:counters][0][:metric]).to eql("timer.testing.count")
+    expect(datapoints[:counters][0][:value]).to eql(1)
+    expect(datapoints[:counters][0][:dimensions]).to include(:env => "test")
+    expect(datapoints[:counters][0][:timestamp]).not_to be_nil
 
-    expect(datapoints[:gauge][0][:metric]).to eql("timer.testing.min")
-    expect(datapoints[:gauge][0][:value]).not_to be_nil
-    expect(datapoints[:gauge][0][:dimensions]).to include(:env => "test")
-    expect(datapoints[:gauge][0][:timestamp]).not_to be_nil
+    expect(datapoints[:gauges][0][:metric]).to eql("timer.testing.min")
+    expect(datapoints[:gauges][0][:value]).not_to be_nil
+    expect(datapoints[:gauges][0][:dimensions]).to include(:env => "test")
+    expect(datapoints[:gauges][0][:timestamp]).not_to be_nil
 
-    expect(datapoints[:gauge][1][:metric]).to eql("timer.testing.max")
-    expect(datapoints[:gauge][1][:value]).not_to be_nil
-    expect(datapoints[:gauge][1][:dimensions]).to include(:env => "test")
-    expect(datapoints[:gauge][1][:timestamp]).not_to be_nil
+    expect(datapoints[:gauges][1][:metric]).to eql("timer.testing.max")
+    expect(datapoints[:gauges][1][:value]).not_to be_nil
+    expect(datapoints[:gauges][1][:dimensions]).to include(:env => "test")
+    expect(datapoints[:gauges][1][:timestamp]).not_to be_nil
 
-    expect(datapoints[:gauge][2][:metric]).to eql("timer.testing.mean")
-    expect(datapoints[:gauge][2][:value]).not_to be_nil
-    expect(datapoints[:gauge][2][:dimensions]).to include(:env => "test")
-    expect(datapoints[:gauge][2][:timestamp]).not_to be_nil
+    expect(datapoints[:gauges][2][:metric]).to eql("timer.testing.mean")
+    expect(datapoints[:gauges][2][:value]).not_to be_nil
+    expect(datapoints[:gauges][2][:dimensions]).to include(:env => "test")
+    expect(datapoints[:gauges][2][:timestamp]).not_to be_nil
   end
 
-  it "gauge" do
+  it "gauges" do
     @registry.gauge('gauge.testing') { 123 }
     datapoints = @reporter.get_datapoints
-    expect(datapoints[:gauge].size).to eql(1)
-    expect(datapoints[:gauge][0][:metric]).to eql("gauge.testing.value")
-    expect(datapoints[:gauge][0][:value]).to eql(123)
-    expect(datapoints[:gauge][0][:dimensions]).to include(:env => "test")
-    expect(datapoints[:gauge][0][:timestamp]).not_to be_nil
+    expect(datapoints[:gauges].size).to eql(1)
+    expect(datapoints[:gauges][0][:metric]).to eql("gauge.testing.value")
+    expect(datapoints[:gauges][0][:value]).to eql(123)
+    expect(datapoints[:gauges][0][:dimensions]).to include(:env => "test")
+    expect(datapoints[:gauges][0][:timestamp]).not_to be_nil
   end
 end
 
@@ -88,22 +81,21 @@ describe "Rest Client" do
   before(:each) do
     @registry = Metriks::Registry.new
     @reporter = MetriksAddons::SignalFxReporter.new(
-      'http://localhost:4242/api/datapoint',
       "123456789",
-      "ABCD",
-      {:env => "test"},
+      [{:key => "env", :value => "test"}],
       { :registry => @registry, :batch_size => 3})
-    stub_request(:post, "http://localhost:4242/api/datapoint?orgid=ABCD").
-      with(:body => /^\{.*\}$/).
-      to_return(:status => 200, :body => "", :headers => {})
+      stub_request(:post, "https://ingest.signalfx.com/v2/datapoint").
+        with(:body => "\n0\x12\x14gauges.testing.value\x18\xE0\xA8\xBF\xA4\x93*\"\x02\x18{(\x002\v\n\x03env\x12\x04test\n4\x12\x18counters.testing.0.count\x18\xE0\xA8\xBF\xA4\x93*\"\x02\x18\x01(\x012\v\n\x03env\x12\x04test\n4\x12\x18counters.testing.1.count\x18\xE0\xA8\xBF\xA4\x93*\"\x02\x18\x01(\x012\v\n\x03env\x12\x04test\n4\x12\x18counters.testing.2.count\x18\xE0\xA8\xBF\xA4\x93*\"\x02\x18\x01(\x012\v\n\x03env\x12\x04test",
+             :headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'212', 'Content-Type'=>'application/x-protobuf', 'User-Agent'=>'signalfx-ruby-client/0.1.0', 'X-Sf-Token'=>'123456789'}).
+        to_return(:status => 200, :body => "", :headers => {})
   end
 
   it "Send metricwise" do
     for i in 0..2 do
-      @registry.counter("counter.testing.#{i}").increment
+      @registry.counter("counters.testing.#{i}").increment
     end
-    @registry.gauge("gauge.testing")
+    @registry.gauge("gauges.testing") { 123 }
     @reporter.submit @reporter.get_datapoints
-    expect(a_request(:post, "http://localhost:4242/api/datapoint?orgid=ABCD")).to have_been_made
+    expect(a_request(:post, "https://ingest.signalfx.com/v2/datapoint")).to have_been_made
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metriks-addons
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0
 platform: ruby
 authors:
 - Rajat Venkatesh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks