From c6d5402b5eea8605379758561a838a022e40e17e Mon Sep 17 00:00:00 2001
From: Everett Badeaux <everettc1810@gmail.com>
Date: Sun, 13 Jul 2025 18:11:08 -0500
Subject: [PATCH] Update Config Tagging Policy

---
 libs/config/config.cpp      | 16 ++++++++--------
 libs/config/test_config.cpp |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libs/config/config.cpp b/libs/config/config.cpp
index b513157..2334801 100644
--- a/libs/config/config.cpp
+++ b/libs/config/config.cpp
@@ -20,6 +20,14 @@ std::unordered_map<std::string, std::string> CalculateTags(
 {
     std::unordered_map<std::string, std::string> valid_tags;
 
+    for (const auto& [fst, snd] : tags)
+    {
+        if (IsEmptyOrWhitespace(fst) == false && IsEmptyOrWhitespace(snd) == false)
+        {
+            valid_tags[fst] = snd;
+        }
+    }
+
     const char* container_name = std::getenv(ConfigConstants::EnvVarContainer);
     const char* process_name = std::getenv(ConfigConstants::EnvVarProcess);
 
@@ -41,14 +49,6 @@ std::unordered_map<std::string, std::string> CalculateTags(
         }
     }
 
-    for (const auto& [fst, snd] : tags)
-    {
-        if (IsEmptyOrWhitespace(fst) == false && IsEmptyOrWhitespace(snd) == false)
-        {
-            valid_tags[fst] = snd;
-        }
-    }
-
     return valid_tags;
 }
 
diff --git a/libs/config/test_config.cpp b/libs/config/test_config.cpp
index 3937d7c..5dc5517 100644
--- a/libs/config/test_config.cpp
+++ b/libs/config/test_config.cpp
@@ -190,12 +190,12 @@ TEST_F(ConfigTest, MergingTags)
         EXPECT_EQ(config.GetExtraTags().at("env"), "test");
     }
 
-    // Override environment variables with explicit tags
+    // Override common tags with explicit env tags
     {
-        containerGuard.setValue("test-container");
+        containerGuard.setValue("override-container");
         processGuard.unsetValue();
 
-        std::unordered_map<std::string, std::string> tags = {{"nf.container", "override-container"}};
+        std::unordered_map<std::string, std::string> tags = {{"nf.container", "test-container"}};
 
         Config config(writerConfig, tags);