MINIFICPP-2516 Change C2 runStatus value format to be consistent with…

… NiFi Closes apache#1921 Signed-off-by: Marton Szasz <szaszm@apache.org>
martinzink · Feb 5, 2025 · b846c13 · b846c13
1 parent 1f72e02
commit b846c13
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/C2.md b/C2.md
@@ -208,7 +208,7 @@ configuration produces the following JSON:
                     "processingNanos": 0,
                     "activeThreadCount": -1,
                     "terminatedThreadCount": -1,
-                    "runStatus": "Running"
+                    "runStatus": "RUNNING"
                 },
                 {
                     "id": "4fe2d51d-076a-49b0-88de-5cf5adf52b8f",
@@ -223,11 +223,11 @@ configuration produces the following JSON:
                     "processingNanos": 2119148,
                     "activeThreadCount": -1,
                     "terminatedThreadCount": -1,
-                    "runStatus": "Running"
+                    "runStatus": "RUNNING"
                 }
             ],
             "flowId": "96273342-b9fe-11ef-a0ad-10f60a596f64",
-            "runStatus": "Running"
+            "runStatus": "RUNNING"
           }
       },
       "LoadMetrics": {
@@ -550,7 +550,7 @@ Contains information about the flow the agent is running, including the versione
             "processingNanos": 0,
             "activeThreadCount": -1,
             "terminatedThreadCount": -1,
-            "running": true
+            "runStatus": "RUNNING"
         },
         {
             "id": "4fe2d51d-076a-49b0-88de-5cf5adf52b8f",
@@ -565,11 +565,11 @@ Contains information about the flow the agent is running, including the versione
             "processingNanos": 2119148,
             "activeThreadCount": -1,
             "terminatedThreadCount": -1,
-            "running": true
+            "runStatus": "RUNNING"
         }
     ],
     "flowId": "96273342-b9fe-11ef-a0ad-10f60a596f64",
-    "running": true
+    "runStatus": "RUNNING"
 }
 ```
 

diff --git a/libminifi/src/core/state/nodes/FlowInformation.cpp b/libminifi/src/core/state/nodes/FlowInformation.cpp
@@ -37,7 +37,7 @@ std::vector<SerializedResponseNode> FlowInformation::serialize() {
 
   if (nullptr != monitor_) {
     monitor_->executeOnComponent("FlowController", [&serialized](StateController& component) {
-      serialized.push_back({.name = "runStatus", .value = (component.isRunning() ? "Running" : "Stopped")});
+      serialized.push_back({.name = "runStatus", .value = (component.isRunning() ? "RUNNING" : "STOPPED")});
     });
   }
 
@@ -92,7 +92,7 @@ std::vector<SerializedResponseNode> FlowInformation::serialize() {
           {.name = "processingNanos", .value = metrics->processingNanos().load()},
           {.name = "activeThreadCount", .value = -1},
           {.name = "terminatedThreadCount", .value = -1},
-          {.name = "runStatus", .value = (processor->isRunning() ? "Running" : "Stopped")}
+          {.name = "runStatus", .value = (processor->isRunning() ? "RUNNING" : "STOPPED")}
         }
       });
     }

diff --git a/libminifi/test/integration/C2MetricsTest.cpp b/libminifi/test/integration/C2MetricsTest.cpp
@@ -141,7 +141,7 @@ class MetricsHandler: public HeartbeatHandler {
       processor["processingNanos"].GetInt() >= 0 &&
       processor["activeThreadCount"].GetInt() == -1 &&
       processor["terminatedThreadCount"].GetInt() == -1 &&
-      processor["runStatus"].GetString() == std::string("Running");
+      processor["runStatus"].GetString() == std::string("RUNNING");
   }
 
   static bool verifyCommonRuntimeMetricNodes(const rapidjson::Value& runtime_metrics, const std::string& queue_id) {
@@ -151,7 +151,7 @@ class MetricsHandler: public HeartbeatHandler {
       runtime_metrics.HasMember("flowInfo") &&
       runtime_metrics["flowInfo"].HasMember("flowId") &&
       runtime_metrics["flowInfo"].HasMember("runStatus") &&
-      runtime_metrics["flowInfo"]["runStatus"].GetString() == std::string("Running") &&
+      runtime_metrics["flowInfo"]["runStatus"].GetString() == std::string("RUNNING") &&
       runtime_metrics["flowInfo"].HasMember("versionedFlowSnapshotURI") &&
       runtime_metrics["flowInfo"].HasMember("queues") &&
       runtime_metrics["flowInfo"]["queues"].HasMember(queue_id) &&