Remove metrics mode configuration from metric config file

pytorch · Apr 11, 2023 · 0576bd4 · 0576bd4
1 parent 49fdbd7
commit 0576bd4
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 33 deletions.
diff --git a/...end/server/src/main/java/org/pytorch/serve/metrics/configuration/MetricConfiguration.java b/...end/server/src/main/java/org/pytorch/serve/metrics/configuration/MetricConfiguration.java
@@ -4,13 +4,11 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.util.List;
-import org.pytorch.serve.util.ConfigManager;
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.composer.ComposerException;
 import org.yaml.snakeyaml.constructor.Constructor;
 
 public class MetricConfiguration {
-    private String mode;
     private List<String> dimensions;
 
     @SuppressWarnings("checkstyle:MemberName")
@@ -19,14 +17,6 @@ public class MetricConfiguration {
     @SuppressWarnings("checkstyle:MemberName")
     private MetricTypes model_metrics;
 
-    public void setMode(String mode) {
-        this.mode = mode;
-    }
-
-    public String getMode() {
-        return mode;
-    }
-
     public void setDimensions(List<String> dimensions) {
         this.dimensions = dimensions;
     }
@@ -71,7 +61,6 @@ public static MetricConfiguration loadConfiguration(String configFilePath)
         Yaml yaml = new Yaml(constructor);
         FileInputStream inputStream = new FileInputStream(new File(configFilePath));
         MetricConfiguration config = yaml.load(inputStream);
-        config.setMode(ConfigManager.getInstance().getMetricsMode());
         config.validate();
 
         return config;

diff --git a/frontend/server/src/test/java/org/pytorch/serve/metrics/MetricConfigurationTest.java b/frontend/server/src/test/java/org/pytorch/serve/metrics/MetricConfigurationTest.java
@@ -1,7 +1,6 @@
 package org.pytorch.serve.metrics.configuration;
 
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import org.pytorch.serve.util.ConfigManager;
@@ -17,8 +16,6 @@ public void testLoadValidConfiguration()
                 MetricConfiguration.loadConfiguration(
                         "src/test/resources/metrics/valid_configuration.yaml");
 
-        Assert.assertEquals(config.getMode(), "log");
-
         Assert.assertEquals(
                 config.getDimensions(),
                 new ArrayList<String>(
@@ -81,8 +78,6 @@ public void testLoadValidConfigurationEmptyMetricDimensions()
                 MetricConfiguration.loadConfiguration(
                         "src/test/resources/metrics/valid_configuration_empty_metric_dimensions.yaml");
 
-        Assert.assertEquals(config.getMode(), "log");
-
         Assert.assertEquals(config.getDimensions(), null);
 
         Assert.assertEquals(config.getTs_metrics().getCounter().size(), 1);
@@ -127,12 +122,13 @@ public void testLoadInvalidConfigurationMissingMetricUnit() {
     }
 
     @Test
-    public void testLoadValidConfigurationModeEnvironmentVariable()
-            throws IOException, FileNotFoundException {
-        ConfigManager.getInstance().setProperty("metrics_mode", "test_metrics_mode");
-        MetricConfiguration config =
-                MetricConfiguration.loadConfiguration(
-                        "src/test/resources/metrics/valid_configuration.yaml");
-        Assert.assertEquals(config.getMode(), "test_metrics_mode");
+    public void testMetricsModeConfiguration() {
+        ConfigManager configManager = ConfigManager.getInstance();
+        String existingMetricsModeConfiguration = configManager.getMetricsMode();
+        Assert.assertEquals(existingMetricsModeConfiguration, "log");
+        configManager.setProperty("metrics_mode", "test_metrics_mode");
+        Assert.assertEquals(configManager.getMetricsMode(), "test_metrics_mode");
+        // Restore original metrics mode configuration
+        configManager.setProperty("metrics_mode", existingMetricsModeConfiguration);
     }
 }
diff --git a/frontend/server/src/test/resources/metrics/invalid_configuration_missing_dimension.yaml b/frontend/server/src/test/resources/metrics/invalid_configuration_missing_dimension.yaml
@@ -1,5 +1,3 @@
-mode: log
-
 dimensions:
   - &model_name "ModelName"
   - &model_version "ModelVersion"

diff --git a/frontend/server/src/test/resources/metrics/invalid_configuration_missing_metric_name.yaml b/frontend/server/src/test/resources/metrics/invalid_configuration_missing_metric_name.yaml
@@ -1,5 +1,3 @@
-mode: log
-
 dimensions:
   - &model_name "ModelName"
   - &model_version "ModelVersion"

diff --git a/frontend/server/src/test/resources/metrics/invalid_configuration_missing_metric_unit.yaml b/frontend/server/src/test/resources/metrics/invalid_configuration_missing_metric_unit.yaml
@@ -1,5 +1,3 @@
-mode: log
-
 dimensions:
   - &model_name "ModelName"
   - &model_version "ModelVersion"

diff --git a/frontend/server/src/test/resources/metrics/valid_configuration.yaml b/frontend/server/src/test/resources/metrics/valid_configuration.yaml
@@ -1,5 +1,3 @@
-mode: log
-
 dimensions:
   - &model_name "ModelName"
   - &model_version "ModelVersion"

diff --git a/ts/configs/metrics.yaml b/ts/configs/metrics.yaml
@@ -1,5 +1,3 @@
-mode: log
-
 dimensions:
   - &model_name "ModelName"
   - &model_version "ModelVersion"