Fix metrics for graphs started with --model_path (#3560)

Bugfix: CVS-171670
Issue #3556

Author: dkalinowski

src/modelmanager.cpp

@@ -233,6 +233,10 @@ Status ModelManager::startFromConfig() {
         if (!status.ok())
             return status;
 
+        status = loadMetricsFromCLI(config);
+        if (!status.ok())
+            return status;
+
         SPDLOG_LOGGER_DEBUG(modelmanager_logger, "Adding mediapipe graph config for {}, {}", mpConfig.getGraphName(), mpConfig.getGraphPath());
         mediapipesInConfigFile.push_back(mpConfig);
         std::vector<ModelConfig> gatedModelConfigs;
@@ -268,16 +272,9 @@ Status ModelManager::startFromConfig() {
         return StatusCode::UNKNOWN_ERROR;
     }
 
-    // Reading metric config only once per server start
-    if (!this->metricConfigLoadedOnce) {
-        status = this->metricConfig.loadFromCLIString(config.metricsEnabled(), config.metricsList());
-        SPDLOG_LOGGER_DEBUG(modelmanager_logger, "Loading metric cli settings only once per server start.");
-
-        this->metricConfigLoadedOnce = true;
-    } else {
-        SPDLOG_LOGGER_ERROR(modelmanager_logger, "Metric cli settings already loaded error.");
-        return StatusCode::INTERNAL_ERROR;
-    }
+    status = loadMetricsFromCLI(config);
+    if (!status.ok())
+        return status;
 
     if (!status.ok()) {
         SPDLOG_LOGGER_ERROR(modelmanager_logger, "Couldn't load metrics settings");
@@ -803,6 +800,20 @@ Status ModelManager::loadCustomLoadersConfig(rapidjson::Document& configJson) {
     return firstErrorStatus;
 }
 
+Status ModelManager::loadMetricsFromCLI(const Config& config) {
+    // Reading metric config only once per server start
+    if (!this->metricConfigLoadedOnce) {
+        this->metricConfigLoadedOnce = true;
+        SPDLOG_LOGGER_DEBUG(modelmanager_logger, "Loading metric cli settings only once per server start.");
+        auto status = this->metricConfig.loadFromCLIString(config.metricsEnabled(), config.metricsList());
+        return status;
+    } else {
+        SPDLOG_LOGGER_ERROR(modelmanager_logger, "Metric cli settings already loaded error.");
+        return StatusCode::INTERNAL_ERROR;
+    }
+    return StatusCode::OK;
+}
+
 Status ModelManager::loadMetricsConfig(rapidjson::Document& configJson) {
     const auto itr2 = configJson.FindMember("monitoring");
     auto& config = ovms::Config::instance();

src/modelmanager.hpp

@@ -399,6 +399,7 @@ class ModelManager {
         return this->metricConfig;
     }
 
+    Status loadMetricsFromCLI(const Config& config);
     Status loadMetricsConfig(rapidjson::Document& configJson);
 
     /**

src/test/metric_config_test.cpp

@@ -236,6 +236,29 @@ TEST_F(MetricsConfigTest, InitOnce) {
     ASSERT_EQ(metricConfig2.isFamilyEnabled(METRIC_NAME_REQUESTS_FAIL), false);
 }
 
+TEST_F(MetricsConfigTest, StartSingleGraphWithMetrics) {
+    ConstructorEnabledModelManager manager;
+
+    // Serve mediapipe graph with metrics enabled
+    char* n_argv[] = {
+        (char*)"ovms",
+        (char*)"--model_path",
+        (char*)getGenericFullPathForSrcTest("/ovms/src/test/mediapipe/cli").c_str(),
+        (char*)"--model_name",
+        (char*)"some_name",
+        (char*)"--rest_port",
+        (char*)"8080",
+        (char*)"--metrics_enable"};
+    int arg_count = 8;
+    ovms::Config::instance().parse(arg_count, n_argv);
+
+    auto status = manager.startFromConfig();
+    ASSERT_TRUE(status.ok());
+
+    const auto& metricConfig = manager.getMetricConfig();
+    ASSERT_EQ(metricConfig.metricsEnabled, true);
+}
+
 static const char* modelMetricsAllEnabledConfig = R"(
 {
     "model_config_list": [