travis-metrics 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a0f3f1993d44075a5969237e79e7a5704b65799
-  data.tar.gz: 53141f48ef59d0d62dedf0305efe2ac8d7030324
+  metadata.gz: '033708dbf7f550f64e24fc2c8ddebaa73e86b5ed'
+  data.tar.gz: b15e6e86263659c06528bed7eef6c153ff4aba19
 SHA512:
-  metadata.gz: d91875f974c9dcca73d5dcdfc2e7d42464f68734eeba667f17a269a655d62b20faafe129c38f04e8b932809e9e684735099284df4d99bcacc7952a0bbe46311a
-  data.tar.gz: 6bd6567a9aceda7c4d46219997024472cc41fdba30a9f9ec97f6fb02597cb14c5c3e1d0fa85cc2c0f8f4d43355deff83681210ead80991830328be90eba3a870
+  metadata.gz: 83d078f33b1bf8a8d2e07e7a3025ef233341d8b07c52a28d52ed4bd84dbf5f7f5ce57c06f95a307d9a38a95d7c1ef5db9ecf9007272c620c73f74e8e04015fb6
+  data.tar.gz: c3979d82845e2f1298a9acdc5c0ec316dd441d29c7660eb0b33286c3e3426245a146924509cb6115e8acf94d3115d1a711a6a66c26f878154af5b3143f83d3e4

data/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'metriks', git: 'https://github.com/travis-ci/metriks'
+gem 'metriks-librato_metrics', git: 'https://github.com/travis-ci/metriks-librato_metrics'
+
 group :test do
   gem 'rspec'
   gem 'riemann-client', '~> 0.0.7'

data/Gemfile.lock

@@ -1,26 +1,41 @@
+GIT
+  remote: https://github.com/travis-ci/metriks
+  revision: 5c9eec24144492071dad6e20f24c03f8424d041d
+  specs:
+    metriks (0.9.9.8)
+      HDRHistogram (= 0.1.9)
+      atomic (~> 1.0)
+      avl_tree (~> 1.2.0)
+      hitimes (~> 1.1)
+
+GIT
+  remote: https://github.com/travis-ci/metriks-librato_metrics
+  revision: 7ec1c97f4f6f783d2a04c7922baac98a9fbbba25
+  specs:
+    metriks-librato_metrics (1.0.6)
+      metriks (>= 0.9.9.6)
+
 PATH
   remote: .
   specs:
-    travis-metrics (0.0.1)
+    travis-metrics (2.0.0)
       metriks-librato_metrics (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    atomic (1.1.99)
+    HDRHistogram (0.1.9)
+    atomic (1.1.101)
     avl_tree (1.2.1)
       atomic (~> 1.1)
+    beefcake (1.2.0)
     diff-lcs (1.2.5)
-    hitimes (1.2.4)
-    metaclass (0.0.4)
-    metriks (0.9.9.7)
-      atomic (~> 1.0)
-      avl_tree (~> 1.2.0)
-      hitimes (~> 1.1)
-    metriks-librato_metrics (1.0.6)
-      metriks (>= 0.9.9.6)
-    mocha (1.2.1)
-      metaclass (~> 0.0.1)
+    hitimes (1.3.0)
+    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)
@@ -34,14 +49,17 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    trollop (2.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  mocha
+  metriks!
+  metriks-librato_metrics!
+  riemann-client (~> 0.0.7)
   rspec
   travis-metrics!
 
 BUNDLED WITH
-   1.14.5
+   1.16.1

data/lib/travis/metrics.rb

@@ -12,6 +12,11 @@ module Travis
       }
 
       def setup(config, logger)
+        unless Metriks.respond_to?(:enable_hdrhistogram)
+          raise 'Please ensure that you are using the travis-ci fork of the metriks gem at https://github.com/travis-ci/metriks'
+        end
+        Metriks.enable_hdrhistogram
+
         reporter = start(config, logger)
         logger.debug(MSGS[:no_reporter]) unless reporter
         new(reporter)
@@ -34,20 +39,20 @@ module Travis
       @reporter = reporter
     end
 
-    def count(key)
-      Metriks.counter(key).increment if reporter
+    def count(key, value = 1)
+      Metriks.counter(key, value).increment
     end
 
-    def meter(key)
-      Metriks.meter(key).mark if reporter
+    def meter(key, value = 1)
+      Metriks.meter(key).mark(value)
     end
 
     def gauge(key, value)
-      Metriks.gauge(key).set(value) if reporter
+      Metriks.gauge(key).set(value)
     end
 
     def time(key, &block)
-      reporter ? Metriks.timer(key).time(&block) : yield
+      Metriks.timer(key).time(&block)
     end
   end
 end

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

@@ -14,7 +14,12 @@ module Travis
         def setup
           return unless email && token
           logger.info MSGS[:setup] % [source, email]
-          @reporter = Metriks::LibratoMetricsReporter.new(email, token, source: source, on_error: method(:on_error))
+          @reporter = Metriks::LibratoMetricsReporter.new(email, token,
+            source: source,
+            on_error: method(:on_error),
+            percentiles: [0.95, 0.99, 0.999, 1.0],
+            interval: config[:interval],
+          )
           reporter.start
         end
 
@@ -29,7 +34,7 @@ module Travis
           end
 
           def source
-            [config[:source], dyno].compact.join('.')
+            [config[:source] || ENV['HEROKU_APP_NAME'], dyno].compact.join('.')
           end
 
           def dyno

data/lib/travis/metrics/version.rb

@@ -1,5 +1,5 @@
 module Travis
   class Metrics
-    VERSION = '2.0.0'
+    VERSION = '2.0.1'
   end
 end

data/spec/travis/metrics/instrument_spec.rb

@@ -4,9 +4,8 @@ describe Travis::Metrics do
   let(:obj)     { double }
 
   describe 'count' do
-
     it 'increments a counter' do
-      expect(Metriks).to receive(:counter).with(key).and_return(obj)
+      expect(Metriks).to receive(:counter).with(key, 1).and_return(obj)
       expect(obj).to receive(:increment)
       metrics.count(key)
     end
@@ -15,7 +14,7 @@ describe Travis::Metrics do
   describe 'meter' do
     it 'meters an instrument' do
       expect(Metriks).to receive(:meter).with(key).and_return(obj)
-      expect(obj).to receive(:mark)
+      expect(obj).to receive(:mark).with(1)
       metrics.meter(key)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis-metrics
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Travis CI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metriks-librato_metrics
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Instrumentation for Travis CI