Revert "Always return true for feature flag for new metrics proxy."

- keep it for now, just in case

This reverts commit 233a9677d49cc01d4a5938a8fa2d849c5b9d4d46.

4 files changed, 16 insertions, 1 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
index 0a54dd6790d..4b35af53154 100644
--- a/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
+++ b/config-model/src/main/java/com/yahoo/config/model/deploy/TestProperties.java
@@ -37,6 +37,7 @@ public class TestProperties implements ModelContext.Properties {
     private boolean useFdispatchByDefault = true;
     private boolean dispatchWithProtobuf = true;
     private boolean useAdaptiveDispatch = false;
+    private boolean enableMetricsProxyContainer = false;
 
 
     @Override public boolean multitenant() { return multitenant; }
@@ -54,6 +55,7 @@ public class TestProperties implements ModelContext.Properties {
     @Override public boolean useDedicatedNodeForLogserver() { return useDedicatedNodeForLogserver; }
     @Override public boolean useFdispatchByDefault() { return useFdispatchByDefault; }
     @Override public boolean dispatchWithProtobuf() { return dispatchWithProtobuf; }
+    @Override public boolean enableMetricsProxyContainer() { return enableMetricsProxyContainer; }
 
     public TestProperties setApplicationId(ApplicationId applicationId) {
         this.applicationId = applicationId;
@@ -85,6 +87,10 @@ public class TestProperties implements ModelContext.Properties {
         return this;
     }
 
+    public TestProperties setEnableMetricsProxyContainer(boolean enableMetricsProxyContainer) {
+        this.enableMetricsProxyContainer = enableMetricsProxyContainer;
+        return this;
+    }
 
     public static class Spec implements ConfigServerSpec {
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
index c1a648c9696..a1b77332bd2 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyContainerTest.java
@@ -31,6 +31,7 @@ public class MetricsProxyContainerTest {
     public void one_metrics_proxy_container_is_added_to_every_node() {
         var numberOfHosts = 4;
         var tester = new VespaModelTester();
+        tester.enableMetricsProxyContainer(true);
         tester.addHosts(numberOfHosts);
 
         VespaModel model = tester.createModel(servicesWithManyNodes(), true);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
index edba053a1c0..4fad2c09184 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/admin/metricsproxy/MetricsProxyModelTester.java
@@ -36,6 +36,7 @@ class MetricsProxyModelTester {
     static VespaModel getModel(String servicesXml) {
         var numberOfHosts = 1;
         var tester = new VespaModelTester();
+        tester.enableMetricsProxyContainer(true);
         tester.addHosts(numberOfHosts);
         tester.setHosted(false);
         return tester.createModel(servicesXml, true);
@@ -44,6 +45,7 @@ class MetricsProxyModelTester {
     static VespaModel getHostedModel(String servicesXml) {
         var numberOfHosts = 2;
         var tester = new VespaModelTester();
+        tester.enableMetricsProxyContainer(true);
         tester.addHosts(flavorFromString(MY_FLAVOR), numberOfHosts);
         tester.setHosted(true);
         tester.setApplicationId(MY_TENANT, MY_APPLICATION, MY_INSTANCE);
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
index 2e5acb9025d..866c4027711 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/test/VespaModelTester.java
@@ -48,6 +48,7 @@ public class VespaModelTester {
     private Map<NodeResources, Collection<Host>> hostsByResources = new HashMap<>();
     private ApplicationId applicationId = ApplicationId.defaultId();
     private boolean useDedicatedNodeForLogserver = false;
+    private boolean enableMetricsProxyContainer = false;
 
     public VespaModelTester() {
         this(new NullConfigModelRegistry());
@@ -104,6 +105,10 @@ public class VespaModelTester {
         this.useDedicatedNodeForLogserver = useDedicatedNodeForLogserver;
     }
 
+    public void enableMetricsProxyContainer(boolean enableMetricsProxyContainer) {
+        this.enableMetricsProxyContainer = enableMetricsProxyContainer;
+    }
+
     /** Creates a model which uses 0 as start index and fails on out of capacity */
     public VespaModel createModel(String services, String ... retiredHostNames) {
         return createModel(Zone.defaultZone(), services, true, retiredHostNames);
@@ -144,7 +149,8 @@ public class VespaModelTester {
                 .setMultitenant(true)
                 .setHostedVespa(hosted)
                 .setApplicationId(applicationId)
-                .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver);
+                .setUseDedicatedNodeForLogserver(useDedicatedNodeForLogserver)
+                .setEnableMetricsProxyContainer(enableMetricsProxyContainer);
 
         DeployState deployState = new DeployState.Builder()
                 .applicationPackage(appPkg)