prevent double negatives

cloudfoundry · Jan 18, 2024 · 06d4479 · 06d4479
1 parent ffab5a4
commit 06d4479
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/config/cloud_controller.yml b/config/cloud_controller.yml
@@ -354,7 +354,7 @@ staging:
 
 statsd_host: "127.0.0.1"
 statsd_port: 8125
-disable_statsd_metrics: false
+enable_statsd_metrics: true
 
 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,7 +322,7 @@ class ApiSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
-            optional(:disable_statsd_metrics) => bool,
+            optional(:enable_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,7 +177,7 @@ class ClockSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
-            optional(:disable_statsd_metrics) => bool,
+            optional(:enable_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,7 +130,7 @@ class DeploymentUpdaterSchema < VCAP::Config
 
             statsd_host: String,
             statsd_port: Integer,
-            optional(:disable_statsd_metrics) => bool,
+            optional(:enable_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
@@ -351,7 +351,7 @@ def statsd_client
         @dependencies[:statsd_client]
       else
         config = CloudController::DependencyLocator.instance.config
-        if config.get(:disable_statsd_metrics) == false
+        if config.get(:enable_statsd_metrics) == true
           Statsd.logger = Steno.logger('statsd.client')
           register(:statsd_client, Statsd.new(config.get(:statsd_host), config.get(:statsd_port)))
         else

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

diff --git a/spec/unit/lib/cloud_controller/dependency_locator_spec.rb b/spec/unit/lib/cloud_controller/dependency_locator_spec.rb
@@ -492,7 +492,7 @@
       TestConfig.override(
         statsd_host: host,
         statsd_port: port,
-        disable_statsd_metrics: true
+        enable_statsd_metrics: false
       )
 
       expected_client = double(CloudController::NullStatsdClient)