travis-metrics 2.0.0.rc1 → 2.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 202ba9076da5cb2ecedfd3bfc0af052b96eaeac5
-  data.tar.gz: ffaa169c567cce2e4445b168da8fbd5bd345b9ab
+  metadata.gz: 4bdef9f8c02b1e952172f58ce58e9f877764f658
+  data.tar.gz: 3adb2e6bd4a34cf05b3a75a7b7ab6abbebc219fc
 SHA512:
-  metadata.gz: ab7dd5d25bc4775a3e9d1f81ec7e91113fc0bb6b7ceba2cf89093d42403e1b4d044319ee863c1593f5bfee0bda0723f514c8ba187ac9447a5d5a2d46fed2fd27
-  data.tar.gz: 598eacf6c8a7a497a0e08eb5fdc2e3f01543fae208902f2e292d1206319c3dc588db30a94dabd2f2d26df239c5aeeb1ef9dc4f4f5048ee718d6d925af4a7573b
+  metadata.gz: b40e9efd5d6387779db058692255c4691a5a412f71fc735da3039c00cd6a8948dbc8e7055e66bb0fd3a6b36c6e79c6f4e23169176582c2877e4ff732e6515405
+  data.tar.gz: c43b0afd47de667cf50b0d13b0c6661b7cef273d4811e96aa4bb17914dae303b206b1c769fda05afdf7f1da6cd80cf72001197b19a2b7b72263d5cdad6801c74

data/Gemfile

@@ -4,4 +4,5 @@ gemspec
 
 group :test do
   gem 'rspec'
+  gem 'riemann-client', '~> 0.0.7'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    travis-metrics (0.0.1)
+    travis-metrics (2.0.0.rc1)
       metriks-librato_metrics (~> 1.0)
 
 GEM
@@ -10,14 +10,20 @@ GEM
     atomic (1.1.99)
     avl_tree (1.2.1)
       atomic (~> 1.1)
+    beefcake (1.2.0)
     diff-lcs (1.2.5)
-    hitimes (1.2.3)
+    hitimes (1.2.4)
     metriks (0.9.9.7)
       atomic (~> 1.0)
       avl_tree (~> 1.2.0)
       hitimes (~> 1.1)
-    metriks-librato_metrics (1.0.3)
+    metriks-librato_metrics (1.0.5)
       metriks (>= 0.9.9.6)
+    mtrc (0.0.4)
+    riemann-client (0.0.8)
+      beefcake (>= 0.3.5)
+      mtrc (>= 0.0.4)
+      trollop (>= 1.16.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -31,11 +37,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    trollop (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  riemann-client (~> 0.0.7)
   rspec
   travis-metrics!
 

data/lib/travis/metrics/reporter/riemann.rb

@@ -0,0 +1,47 @@
+begin
+  require 'metriks/reporter/riemann'
+rescue LoadError
+end
+
+module Travis
+  class Metrics
+    module Reporter
+      class Riemann < Struct.new(:config)
+        #MSGS = {
+          #setup: 'Using Librato metrics reporter (source: %s, account: %s)',
+          #error: 'Librato error: %s (%s)'
+        #}
+
+        def setup
+          #return unless host
+          #logger.info MSGS[:setup] % [source, email]
+          Metriks::Reporter::Riemann.new(client, interval: interval)
+        end
+
+        private
+
+          def client
+            ::Riemann::Client.new(host,port)
+          end
+
+          def host
+            "host"
+            #config[:host]
+          end
+
+          def port
+            "port"
+            #config[:port]
+          end
+
+          def interval
+            config[:interval]
+          end
+
+          #def on_error(e)
+            #logger.error MSGS[:error] % [e.message, e.response.body]
+          #end
+      end
+    end
+  end
+end

data/lib/travis/metrics/version.rb

@@ -1,5 +1,5 @@
 module Travis
   class Metrics
-    VERSION = "2.0.0.rc1"
+    VERSION = "2.0.0.rc2"
   end
 end

data/lib/travis/metrics.rb

@@ -1,17 +1,18 @@
 require 'metriks'
 require 'travis/metrics/reporter/librato'
 require 'travis/metrics/reporter/graphite'
+require 'travis/metrics/reporter/riemann'
 
 module Travis
   class Metrics
     class << self
-      attr_reader :reporter
-
       MSGS = {
         no_reporter: 'No metrics reporter configured.',
         error:       '"Exception while starting metrics reporter: %s"'
       }
 
+      attr_reader :reporter
+
       def setup(config, logger)
         config[:reporter] ? start(config, logger) : logger.info(MSGS[:no_reporter])
         new
@@ -22,12 +23,9 @@ module Travis
       def start(config, logger)
         adapter   = config[:reporter]
         config    = config[adapter.to_sym] || {}
-        @reporter = Reporter.send(adapter, config, logger)
-        reporter.start
-      end
-
-      def started?
-        !!reporter
+        const     = Reporter.const_get(adapter.capitalize) rescue nil
+        @reporter = const && const.new(config, logger)
+        reporter.setup if reporter
       end
     end
 

data/spec/travis/metrics/reporter/riemann_spec.rb

@@ -0,0 +1,38 @@
+describe Travis::Metrics::Reporter::Riemann do
+  let(:config)   { { client: client, host: host, port: 1234 } }
+  let(:host)     { 'https://example.com' }
+  let(:client)   { ::Riemann::Client.new(config) }
+  let(:reporter) { described_class.new(config) }
+  subject        { reporter.setup }
+
+  #def log
+    #reporter.setup
+    #super
+  #end
+
+  #describe 'setup' do
+    #describe 'returns nil if host is missing' do
+      #let(:host) { nil }
+      #it { expect(subject).to be_nil }
+    #end
+
+    describe 'returns a riemann reporter' do
+      xit { expect(subject).to be_kind_of(Metriks::Reporter::Riemann) }
+      #it { expect(log).to include "Using Graphite metrics reporter (host: #{host}, port: 1234)" }
+    end
+
+    #describe 'on_error' do
+      #let(:error) { StandardError.new('message') }
+      #before { allow(error).to receive(:response).and_return(double(body: 'body')) }
+      #before { allow_any_instance_of(Metriks::Reporter::Graphite).to receive(:write).and_raise(error) }
+
+      #before do
+        #subject.start
+        #sleep 0.1 # ugh.
+        #subject.stop
+      #end
+
+      #it { expect(stdout.string).to include 'Graphite error: message (body)' }
+    #end
+  #end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-metrics
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks-librato_metrics
@@ -37,6 +37,7 @@ files:
 - lib/travis/metrics.rb
 - lib/travis/metrics/reporter/graphite.rb
 - lib/travis/metrics/reporter/librato.rb
+- lib/travis/metrics/reporter/riemann.rb
 - lib/travis/metrics/sidekiq.rb
 - lib/travis/metrics/version.rb
 - spec/spec_helper.rb
@@ -44,6 +45,7 @@ files:
 - spec/travis/metrics/instrument_spec.rb
 - spec/travis/metrics/reporter/graphite_spec.rb
 - spec/travis/metrics/reporter/librato_spec.rb
+- spec/travis/metrics/reporter/riemann_spec.rb
 - travis-metrics.gemspec
 homepage: https://github.com/travis-ci/travis-instrumentation
 licenses: []