From 10e00a44f5b04e9f4913da7f70054b396e93bdb3 Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Tue, 12 Jul 2016 14:50:10 -0500
Subject: [PATCH] [QENG-4075] Rename usages of statsd -> metrics

Really, let's just support a generic metrics interface.
---
 lib/vmpooler/api.rb                      |  4 ++--
 lib/vmpooler/api/v1.rb                   | 12 ++++++------
 spec/vmpooler/api/v1/vm_spec.rb          |  4 ++--
 spec/vmpooler/api/v1/vm_template_spec.rb |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lib/vmpooler/api.rb b/lib/vmpooler/api.rb
index 45a9bfa..68649e9 100644
--- a/lib/vmpooler/api.rb
+++ b/lib/vmpooler/api.rb
@@ -42,10 +42,10 @@ module Vmpooler
     use Vmpooler::API::Reroute
     use Vmpooler::API::V1
 
-    def configure(config, redis, statsd, environment = :production)
+    def configure(config, redis, metrics, environment = :production)
       self.settings.set :config, config
       self.settings.set :redis, redis
-      self.settings.set :statsd, statsd
+      self.settings.set :metrics, metrics
       self.settings.set :environment, environment
     end
 
diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
index 4db1ff1..bc599fe 100644
--- a/lib/vmpooler/api/v1.rb
+++ b/lib/vmpooler/api/v1.rb
@@ -12,8 +12,8 @@ module Vmpooler
       Vmpooler::API.settings.redis
     end
 
-    def statsd
-      Vmpooler::API.settings.statsd
+    def metrics
+      Vmpooler::API.settings.metrics
     end
 
     def config
@@ -92,11 +92,11 @@ module Vmpooler
           vm, name = fetch_single_vm(requested)
           if !vm
             failed = true
-            statsd.increment('checkout.empty.' + requested)
+            metrics.increment('checkout.empty.' + requested)
             break
           else
             vms << [ name, vm ]
-            statsd.increment('checkout.success.' + name)
+            metrics.increment('checkout.success.' + name)
           end
         end
       end
@@ -382,7 +382,7 @@ module Vmpooler
           result = atomically_allocate_vms(payload)
         else
           invalid.each do |bad_template|
-            statsd.increment('checkout.invalid.' + bad_template)
+            metrics.increment('checkout.invalid.' + bad_template)
           end
           status 404
         end
@@ -424,7 +424,7 @@ module Vmpooler
           result = atomically_allocate_vms(payload)
         else
           invalid.each do |bad_template|
-            statsd.increment('checkout.invalid.' + bad_template)
+            metrics.increment('checkout.invalid.' + bad_template)
           end
           status 404
         end
diff --git a/spec/vmpooler/api/v1/vm_spec.rb b/spec/vmpooler/api/v1/vm_spec.rb
index af2c817..0c14561 100644
--- a/spec/vmpooler/api/v1/vm_spec.rb
+++ b/spec/vmpooler/api/v1/vm_spec.rb
@@ -20,7 +20,7 @@ describe Vmpooler::API::V1 do
 
   describe '/vm' do
     let(:prefix) { '/api/v1' }
-    let(:statsd) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::DummyStatsd.new }
     let(:config) {
       {
         config: {
@@ -44,7 +44,7 @@ describe Vmpooler::API::V1 do
 
       app.settings.set :config, config
       app.settings.set :redis, redis
-      app.settings.set :statsd, statsd
+      app.settings.set :metrics, metrics
       app.settings.set :config, auth: false
       create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
     end
diff --git a/spec/vmpooler/api/v1/vm_template_spec.rb b/spec/vmpooler/api/v1/vm_template_spec.rb
index 7a63626..aaabf4a 100644
--- a/spec/vmpooler/api/v1/vm_template_spec.rb
+++ b/spec/vmpooler/api/v1/vm_template_spec.rb
@@ -20,7 +20,7 @@ describe Vmpooler::API::V1 do
 
   describe '/vm/:template' do
     let(:prefix) { '/api/v1' }
-    let(:statsd) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::DummyStatsd.new }
     let(:config) {
       {
         config: {
@@ -44,7 +44,7 @@ describe Vmpooler::API::V1 do
 
       app.settings.set :config, config
       app.settings.set :redis, redis
-      app.settings.set :statsd, statsd
+      app.settings.set :metrics, metrics
       app.settings.set :config, auth: false
       create_token('abcdefghijklmnopqrstuvwxyz012345', 'jdoe', current_time)
     end