refactor: Final changes to add correlationID to the few remaining routes

still displaying unknown

Author: megatnt1122

core/server/DatabaseAPI.cpp

@@ -13,6 +13,9 @@
 // Third party includes
 #include <boost/algorithm/string.hpp>
 #include <boost/tokenizer.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
 #include <google/protobuf/util/json_util.h>
 #include <nlohmann/json.hpp>
 #include <zmq.h>
@@ -392,6 +395,13 @@ void DatabaseAPI::userSetAccessToken(const std::string &a_acc_tok,
                                      const SDMS::AccessTokenType &token_type,
                                      const std::string &other_token_data,
                                      LogContext log_context) {
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
   string result;
   std::vector<pair<string, string>> params = {
       {"access", a_acc_tok},
@@ -465,6 +475,14 @@ void DatabaseAPI::purgeTransferRecords(size_t age, LogContext log_context) {
 void DatabaseAPI::userCreate(const SDMS::UserCreateRequest &a_request,
                              SDMS::UserDataReply &a_reply,
                              LogContext log_context) {
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
+
   DL_DEBUG(log_context,
            "DataFed user create - uid: " << a_request.uid()
                                          << ", name: " << a_request.name());
@@ -2147,6 +2165,14 @@ void DatabaseAPI::setGroupData(GroupDataReply &a_reply,
 void DatabaseAPI::repoList(const SDMS::RepoListRequest &a_request,
                            SDMS::RepoDataReply &a_reply,
                            LogContext log_context) {
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
+
   Value result;
 
   DL_DEBUG(log_context, "Calling repoList.");
@@ -2174,6 +2200,14 @@ void DatabaseAPI::repoList(std::vector<RepoData> &a_repos,
 
 void DatabaseAPI::repoView(std::vector<RepoData> &a_repos,
                            LogContext log_context) {
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
+
   const std::vector<RepoData> copy = a_repos;
   a_repos.clear();
   for (const RepoData &r : copy) {
@@ -3132,6 +3166,13 @@ void DatabaseAPI::taskRun(const std::string &a_task_id,
                           libjson::Value &a_task_reply, LogContext log_context,
                           int *a_step, std::string *a_err_msg) {
   vector<pair<string, string>> params;
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
   params.push_back({"task_id", a_task_id});
   DL_DEBUG(log_context,
            "Calling taskRun from DatabaseAPI task id: " << a_task_id);
@@ -3157,7 +3198,7 @@ void DatabaseAPI::taskAbort(const std::string &a_task_id,
 }
 
 void DatabaseAPI::taskInitDataGet(const SDMS::DataGetRequest &a_request,
-                                  SDMS::DataGetReply &a_reply,
+    SDMS::DataGetReply &a_reply,
                                   libjson::Value &a_result,
                                   LogContext log_context) {
   nlohmann::json payload;
@@ -3803,6 +3844,14 @@ void DatabaseAPI::metricsUpdateMsgCounts(
     const std::map<std::string, std::map<uint16_t, uint32_t>> &a_metrics,
     LogContext log_context) {
 
+  // Ensure correlation ID exists
+  if (log_context.correlation_id.empty() ||
+      log_context.correlation_id == "unknown") {
+
+    boost::uuids::random_generator generator;
+    log_context.correlation_id = boost::uuids::to_string(generator());
+  }
+
   std::string body = newJsonMetricParse(a_timestamp, a_total, a_metrics);
 
   libjson::Value result;