Introduce config option to disable statsd metrics

This config option allows to send metrics only via prometheus
cloudfoundry · Jan 5, 2024 · 793c109 · 793c109
1 parent c54d2bd
commit 793c109
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 2 deletions.
diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml
@@ -354,6 +354,7 @@ staging:
 
 statsd_host: "127.0.0.1"
 statsd_port: 8125
+disable_statsd_metrics: false
 
 perform_blob_cleanup: false
 

diff --git a/lib/cloud_controller/config_schemas/base/api_schema.rb b/lib/cloud_controller/config_schemas/base/api_schema.rb
@@ -322,6 +322,7 @@ class ApiSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
+            optional(:disable_statsd_metrics) => bool,
             system_hostnames: [String],
             default_app_ssh_access: bool,
 

diff --git a/lib/cloud_controller/config_schemas/base/clock_schema.rb b/lib/cloud_controller/config_schemas/base/clock_schema.rb
@@ -177,6 +177,7 @@ class ClockSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
+            optional(:disable_statsd_metrics) => bool,
 
             max_labels_per_resource: Integer,
             max_annotations_per_resource: Integer,

diff --git a/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb b/lib/cloud_controller/config_schemas/base/deployment_updater_schema.rb
@@ -130,6 +130,7 @@ class DeploymentUpdaterSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
+            optional(:disable_statsd_metrics) => bool,
 
             max_labels_per_resource: Integer,
             max_annotations_per_resource: Integer,

diff --git a/lib/cloud_controller/dependency_locator.rb b/lib/cloud_controller/dependency_locator.rb
@@ -441,4 +441,30 @@ def create_paginated_collection_renderer(opts={})
                                                                              })
     end
   end
+
+  class NullDependencyLocator
+    include Singleton
+
+    def config
+      Struct.new
+    end
+
+    def statsd_client
+      @statsd_client ||= NullStatsdClient.new
+    end
+
+    def statsd_updater
+      # Null implementation
+    end
+
+    class NullStatsdClient
+      def timing(_key, _value)
+        # Null implementation
+      end
+
+      def increment(_key)
+        # Null implementation
+      end
+    end
+  end
 end
diff --git a/lib/cloud_controller/deployment_updater/scheduler.rb b/lib/cloud_controller/deployment_updater/scheduler.rb
@@ -9,7 +9,11 @@ class << self
         def start
           with_error_logging('cc.deployment_updater') do
             config = CloudController::DependencyLocator.instance.config
-            statsd_client = CloudController::DependencyLocator.instance.statsd_client
+            if config.get(:disable_statsd_metrics) == false
+              statsd_client = CloudController::DependencyLocator.instance.statsd_client
+            else
+              statsd_client = CloudController::NullDependencyLocator.instance.statsd_client
+            end
 
             update_step = proc {
               update(

diff --git a/lib/cloud_controller/diego/messenger.rb b/lib/cloud_controller/diego/messenger.rb
@@ -58,7 +58,12 @@ def bbs_stager_client
       end
 
       def statsd_updater
-        CloudController::DependencyLocator.instance.statsd_updater
+        config = CloudController::DependencyLocator.instance.config
+        if config.get(:disable_statsd_metrics) == false
+          CloudController::DependencyLocator.instance.statsd_updater
+        else
+          CloudController::NullDependencyLocator.instance.statsd_updater
+        end
       end
 
       def prometheus_updater

diff --git a/spec/fixtures/config/port_8181_config.yml b/spec/fixtures/config/port_8181_config.yml
@@ -206,6 +206,7 @@ droplets:
 
 statsd_host: "127.0.0.1"
 statsd_port: 8125
+disable_statsd_metrics: false
 
 perform_blob_cleanup: false