(POOLER-160) Revise Metrics Classwork

Review changes suggested to revise the Metrics related files into a more
logical class structure.

Also fixup grammar typos in docs strings and any trailing metrics that
have been recently added to vmpooler.

spec/integration/api/v1/config_spec.rb

@@ -34,7 +34,7 @@ describe Vmpooler::API::V1 do
 
   describe '/config/pooltemplate' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:current_time) { Time.now }
 

spec/integration/api/v1/ondemandvm_spec.rb

@@ -16,7 +16,7 @@ describe Vmpooler::API::V1 do
 
   describe '/ondemandvm' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {
         config: {

spec/integration/api/v1/poolreset.rb

@@ -31,7 +31,7 @@ describe Vmpooler::API::V1 do
 
   describe '/poolreset' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:current_time) { Time.now }
 

spec/integration/api/v1/vm_hostname_spec.rb

@@ -21,7 +21,7 @@ describe Vmpooler::API::V1 do
 
   describe '/vm/:hostname' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
 
     let(:config) {
       {

spec/integration/api/v1/vm_spec.rb

@@ -17,7 +17,7 @@ describe Vmpooler::API::V1 do
 
   describe '/vm' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {
         config: {

spec/integration/api/v1/vm_template_spec.rb

@@ -17,7 +17,7 @@ describe Vmpooler::API::V1 do
 
   describe '/vm/:template' do
     let(:prefix) { '/api/v1' }
-    let(:metrics) { Vmpooler::DummyStatsd.new }
+    let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
     let(:config) {
       {
         config: {

spec/unit/pool_manager_spec.rb

@@ -10,7 +10,7 @@ RSpec::Matchers.define :a_pool_with_name_of do |value|
 end
 describe 'Pool Manager' do
   let(:logger) { MockLogger.new }
-  let(:metrics) { Vmpooler::DummyStatsd.new }
+  let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
   let(:pool) { 'pool1' }
   let(:vm) { 'vm1' }
   let(:timeout) { 5 }

spec/unit/promstats_spec.rb

@@ -5,12 +5,12 @@ require 'spec_helper'
 describe 'prometheus' do
   logger = MockLogger.new
   params = { 'prefix': 'test', 'metrics_prefix': 'mtest', 'endpoint': 'eptest' }
-  subject = Vmpooler::Promstats.new(logger, params)
+  subject = Vmpooler::Metrics::Promstats.new(logger, params)
   let(:logger) { MockLogger.new }
 
   describe '#initialise' do
     it 'returns a Metrics object' do
-      expect(Vmpooler::Promstats.new(logger)).to be_a(Vmpooler::Metrics)
+      expect(Vmpooler::Metrics::Promstats.new(logger)).to be_a(Vmpooler::Metrics)
     end
   end
 
@@ -142,6 +142,13 @@ describe 'prometheus' do
           po.get(labels: metric[:labels])
         }.by(1)
       end
+      it 'Increments errors.staledns.#{pool_name}' do
+        pool_name = 'test-pool'
+        expect { subject.increment("errors.staledns.#{pool_name}") }.to change {
+          metric, po = subject.get("errors.staledns.#{pool_name}")
+          po.get(labels: metric[:labels])
+        }.by(1)
+      end
       it 'Increments user.#{user}.#{poolname}' do
         user = 'myuser'
         poolname = 'test-pool'
@@ -150,6 +157,14 @@ describe 'prometheus' do
           po.get(labels: metric[:labels])
         }.by(1)
       end
+      it 'Increments usage_litmus.#{user}.#{poolname}' do
+        user = 'myuser'
+        poolname = 'test-pool'
+        expect { subject.increment("usage_litmus.#{user}.#{poolname}") }.to change {
+          metric, po = subject.get("usage_litmus.#{user}.#{poolname}")
+          po.get(labels: metric[:labels])
+        }.by(1)
+      end
       it 'Increments label usage_jenkins_instance.#{jenkins_instance}.#{value_stream}.#{poolname}' do
         jenkins_instance = 'jenkins_test_instance'
         value_stream = 'notional_value'
@@ -177,7 +192,6 @@ describe 'prometheus' do
           po.get(labels: metric[:labels])
         }.by(1)
       end
-
       it 'Increments connect.open' do
         expect { subject.increment('connect.open') }.to change {
           metric, po = subject.get('connect.open')
@@ -204,6 +218,16 @@ describe 'prometheus' do
           po.get(labels: metric[:labels])
         }.by(1)
       end
+      it 'Increments label api_vm.#{method}.#{subpath}.#{operation}' do
+        method = 'get'
+        subpath = 'template'
+        operation = 'something'
+        expect { subject.increment("api_vm.#{method}.#{subpath}.#{operation}") }.to change {
+          metric, po = subject.get("api_vm.#{method}.#{subpath}.#{operation}")
+          po.get(labels: metric[:labels])
+        }.by(1)
+      end
+
     end
 
     describe '#gauge' do

spec/unit/providers/base_spec.rb

@@ -6,7 +6,7 @@ require 'vmpooler/providers/base'
 
 describe 'Vmpooler::PoolManager::Provider::Base' do
   let(:logger) { MockLogger.new }
-  let(:metrics) { Vmpooler::DummyStatsd.new }
+  let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
   let(:config) { {} }
   let(:provider_name) { 'base' }
   let(:provider_options) { { 'param' => 'value' } }

spec/unit/providers/dummy_spec.rb

@@ -3,7 +3,7 @@ require 'vmpooler/providers/dummy'
 
 describe 'Vmpooler::PoolManager::Provider::Dummy' do
   let(:logger) { MockLogger.new }
-  let(:metrics) { Vmpooler::DummyStatsd.new }
+  let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
   let(:pool_name) { 'pool1' }
   let(:other_pool_name) { 'pool2' }
   let(:vm_name) { 'vm1' }

spec/unit/providers/vsphere_spec.rb

@@ -41,7 +41,7 @@ end
 
 describe 'Vmpooler::PoolManager::Provider::VSphere' do
   let(:logger) { MockLogger.new }
-  let(:metrics) { Vmpooler::DummyStatsd.new }
+  let(:metrics) { Vmpooler::Metrics::DummyStatsd.new }
   let(:poolname) { 'pool1'}
   let(:provider_options) { { 'param' => 'value' } }
   let(:datacenter_name) { 'MockDC' }