From 78d53ed154c71f1fabbaff0366d44ed3b32754e6 Mon Sep 17 00:00:00 2001 From: Gabor Gyimesi Date: Tue, 28 Jan 2025 18:14:32 +0100 Subject: [PATCH] MINIFICPP-2516 Change C2 runStatus value format to be consistent with NiFi Closes #1921 Signed-off-by: Marton Szasz --- C2.md | 12 ++++++------ libminifi/src/core/state/nodes/FlowInformation.cpp | 4 ++-- libminifi/test/integration/C2MetricsTest.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/C2.md b/C2.md index 91a29e030d..c990829d4c 100644 --- 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 index f31b26c297..0c50d9bff0 100644 --- a/libminifi/src/core/state/nodes/FlowInformation.cpp +++ b/libminifi/src/core/state/nodes/FlowInformation.cpp @@ -36,7 +36,7 @@ std::vector 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")}); }); } @@ -91,7 +91,7 @@ std::vector FlowInformation::serialize() { {.name = "processingNanos", .value = metrics->processing_nanos.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 index 6f6ec14caa..1aad28e5e1 100644 --- 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) &&