diff --git a/Gemfile b/Gemfile index 07682e94..2c775d7d 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,8 @@ gem 'gh' gem 'bunny', '~> 0.8.0' gem 'dalli' gem 'pry' -gem 'metriks', '0.9.9.5' +gem 'metriks', '0.9.9.6' +gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics', require: 'metriks-librato_metrics' gem 'skylight', github: 'henrikhodne/skylight-ruby', branch: 'sinatra-support' diff --git a/Gemfile.lock b/Gemfile.lock index 9dd4033e..ba64d9b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: git://github.com/eric/metriks-librato_metrics.git + revision: 0e46e7c5f4eff47c199023a184f3d8ef52da12d0 + specs: + metriks-librato_metrics (0.0) + metriks (>= 0.9.9.6) + GIT remote: git://github.com/getsentry/raven-ruby.git revision: f6c79103e1ff07abc8a1863b5d2ec43d9527e0ed @@ -31,7 +38,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: d2a19ee99f543eb2db376390847b682caa960b7f + revision: a3fad94eca3c75e225050378a855f435854eb6ef specs: travis-core (0.0.1) actionmailer (~> 3.2.12) @@ -178,7 +185,7 @@ GEM memcachier (0.0.2) metaclass (0.0.1) method_source (0.8.2) - metriks (0.9.9.5) + metriks (0.9.9.6) atomic (~> 1.0) avl_tree (~> 1.1.2) hitimes (~> 1.1) @@ -300,7 +307,8 @@ DEPENDENCIES factory_girl (~> 2.4.0) foreman gh - metriks (= 0.9.9.5) + metriks (= 0.9.9.6) + metriks-librato_metrics! micro_migrations! mocha (~> 0.12) pry diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb index a799066a..8d2c082a 100644 --- a/lib/travis/api/app.rb +++ b/lib/travis/api/app.rb @@ -163,7 +163,13 @@ module Travis::Api end if Travis.config.sentry Travis::LogSubscriber::ActiveRecordMetrics.attach - Travis::Notification.setup + Travis::Notification.setup(instrumentation: false) + + if Travis.config.librato + email, token, source, prefix = Travis.config.librato.email, Travis.config.librato.token, Travis.config.librato_source, Travis.config.librato_prefix + $metriks_reporter = Metriks::LibratoMetricsReporter.new(email, token, source: source, prefix: prefix) + $metriks_reporter.start + end end end