Update metrics_spec.rb test

* explicitly start and stop MetricsWebserver with Prometheus middleware

Author: jochenehret

lib/cloud_controller/metrics_webserver.rb

@@ -5,21 +5,26 @@ module VCAP
   module CloudController
     class MetricsWebserver
       attr_reader :app
+      @server
 
       def initialize
         @app = build_app
       end
 
       def start(config)
-        server = Puma::Server.new(@app)
+        @server = Puma::Server.new(@app)
 
         if config.get(:nginx, :metrics_socket).nil? || config.get(:nginx, :metrics_socket).empty?
-          server.add_tcp_listener('127.0.0.1', 9395)
+          @server.add_tcp_listener('127.0.0.1', 9395)
         else
-          server.add_unix_listener(config.get(:nginx, :metrics_socket))
+          @server.add_unix_listener(config.get(:nginx, :metrics_socket))
         end
 
-        server.run
+        @server.run
+      end
+
+      def stop
+        @server.stop(true)
       end
 
       private

spec/request/internal/metrics_spec.rb

@@ -3,19 +3,19 @@
 RSpec.describe 'Metrics' do
   let(:user) { VCAP::CloudController::User.make }
   let(:user_header) { headers_for(user) }
-
   let(:metrics_webserver) { VCAP::CloudController::MetricsWebserver.new }
+
   delegate :app, to: :metrics_webserver
 
-  # FIXME: PrometheusUpdater methods are not called -> returned values are almost all 0
   before do
-    prom_client = Prometheus::Client::Registry.new
-    Prometheus::Client.config.data_store = Prometheus::Client::DataStores::DirectFileStore.new(dir: Dir.mktmpdir)
-    VCAP::CloudController::Metrics::PrometheusUpdater.new(registry: prom_client)
-
+    allow_any_instance_of(VCAP::CloudController::Metrics::PeriodicUpdater).to receive(:update_webserver_stats)
     metrics_webserver.start(TestConfig.config_instance)
   end
 
+  after do
+    metrics_webserver.stop
+  end
+
   it 'can be called several times' do
     get '/internal/v4/metrics', nil
 
@@ -36,6 +36,7 @@
       10.times do
         VCAP::CloudController::User.make
       end
+      CloudController::DependencyLocator.instance.periodic_updater.update!
     end
 
     it 'reports the total number of users' do
@@ -49,6 +50,7 @@
 
   context 'cc_vitals' do
     it 'reports vitals' do
+      CloudController::DependencyLocator.instance.periodic_updater.update!
       get '/internal/v4/metrics', nil
 
       expect(last_response.body).to match(/cc_vitals_num_cores [1-9][0-9]*\.\d+/)
@@ -64,6 +66,8 @@
     before do
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_api_0', run_at: Time.now + 1.day })
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_generic', run_at: Time.now + 1.day })
+
+      CloudController::DependencyLocator.instance.periodic_updater.update!
     end
 
     after do
@@ -82,6 +86,8 @@
     before do
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_api_0', run_at: Time.now })
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_generic', run_at: Time.now })
+
+      CloudController::DependencyLocator.instance.periodic_updater.update!
     end
 
     after do
@@ -100,6 +106,8 @@
     before do
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_api_0', run_at: Time.now + 1.minute })
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_generic', run_at: Time.now + 1.minute })
+
+      CloudController::DependencyLocator.instance.periodic_updater.update!
     end
 
     after do
@@ -118,8 +126,9 @@
     before do
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_api_0', run_at: Time.now + 1.day })
       Delayed::Job.enqueue(VCAP::CloudController::Jobs::Runtime::EventsCleanup.new(1), { queue: 'cc_generic', run_at: Time.now + 1.day })
-
       Delayed::Job.dataset.update(failed_at: Time.now.utc)
+
+      CloudController::DependencyLocator.instance.periodic_updater.update!
     end
 
     after do