From f2fb0ab4f1c2fcab38e5d467f19f71f357454bab Mon Sep 17 00:00:00 2001
From: ecbadeaux <everettc1810@gmail.com>
Date: Wed, 10 Dec 2025 21:18:07 +0000
Subject: [PATCH] Add Namespace

---
 libs/config/config.cpp                                    | 4 ++++
 libs/config/config.h                                      | 6 +++++-
 libs/config/test_config.cpp                               | 2 ++
 libs/logger/logger.h                                      | 4 ++++
 libs/meter/meter_id/meter_id.cpp                          | 6 +++++-
 libs/meter/meter_id/meter_id.h                            | 8 ++++++--
 libs/meter/meter_id/test_meter_id.cpp                     | 2 ++
 libs/meter/meter_types/include/age_gauge.h                | 4 ++++
 libs/meter/meter_types/include/counter.h                  | 4 ++++
 libs/meter/meter_types/include/dist_summary.h             | 6 +++++-
 libs/meter/meter_types/include/gauge.h                    | 6 +++++-
 libs/meter/meter_types/include/max_gauge.h                | 6 +++++-
 libs/meter/meter_types/include/meter.h                    | 4 ++++
 libs/meter/meter_types/include/monotonic_counter.h        | 4 ++++
 libs/meter/meter_types/include/monotonic_counter_uint.h   | 4 ++++
 libs/meter/meter_types/include/percentile_dist_summary.h  | 4 ++++
 libs/meter/meter_types/include/percentile_timer.h         | 4 ++++
 libs/meter/meter_types/include/timer.h                    | 6 +++++-
 libs/meter/meter_types/test/test_age_gauge.cpp            | 2 ++
 libs/meter/meter_types/test/test_counter.cpp              | 2 ++
 libs/meter/meter_types/test/test_dist_summary.cpp         | 2 ++
 libs/meter/meter_types/test/test_gauge.cpp                | 2 ++
 libs/meter/meter_types/test/test_max_gauge.cpp            | 2 ++
 libs/meter/meter_types/test/test_monotonic_counter.cpp    | 2 ++
 .../meter_types/test/test_monotonic_counter_uint.cpp      | 2 ++
 .../meter_types/test/test_percentile_dist_summary.cpp     | 2 ++
 libs/meter/meter_types/test/test_percentile_timer.cpp     | 2 ++
 libs/meter/meter_types/test/test_timer.cpp                | 2 ++
 libs/utils/include/singleton.h                            | 4 ++++
 libs/utils/include/util.h                                 | 6 +++++-
 libs/utils/src/util.cpp                                   | 6 +++++-
 libs/writer/writer_config/test_writer_config.cpp          | 2 ++
 libs/writer/writer_config/writer_config.cpp               | 6 +++++-
 libs/writer/writer_config/writer_config.h                 | 6 +++++-
 libs/writer/writer_types/include/base_writer.h            | 6 +++++-
 libs/writer/writer_types/include/memory_writer.h          | 4 ++++
 libs/writer/writer_types/include/udp_writer.h             | 4 ++++
 libs/writer/writer_types/include/uds_writer.h             | 4 ++++
 libs/writer/writer_types/include/writer_types.h           | 6 +++++-
 libs/writer/writer_types/src/memory_writer.cpp            | 4 ++++
 libs/writer/writer_types/src/udp_writer.cpp               | 6 +++++-
 libs/writer/writer_types/src/uds_writer.cpp               | 4 ++++
 libs/writer/writer_types/test/test_memory_writer.cpp      | 2 ++
 libs/writer/writer_types/test/test_udp_writer.cpp         | 2 ++
 libs/writer/writer_types/test/test_uds_writer.cpp         | 2 ++
 libs/writer/writer_wrapper/test_writer.cpp                | 2 ++
 libs/writer/writer_wrapper/writer.cpp                     | 6 +++++-
 libs/writer/writer_wrapper/writer.h                       | 6 +++++-
 libs/writer/writer_wrapper/writer_test_helper.h           | 4 ++++
 performance_tests/performance_test.cpp                    | 2 ++
 spectator/registry.cpp                                    | 6 +++++-
 spectator/registry.h                                      | 6 +++++-
 spectator/test_registry.cpp                               | 2 ++
 53 files changed, 193 insertions(+), 19 deletions(-)

diff --git a/libs/config/config.cpp b/libs/config/config.cpp
index 2334801..f86934b 100644
--- a/libs/config/config.cpp
+++ b/libs/config/config.cpp
@@ -7,6 +7,8 @@
 #include <algorithm>
 #include <cctype>
 
+namespace spectator {
+
 struct ConfigConstants
 {
     static constexpr auto Container = "nf.container";
@@ -69,3 +71,5 @@ Config::Config(const WriterConfig& writerConfig, const std::unordered_map<std::s
         Logger::info("  {}: {}", key, value);
     }
 }
+
+}  // namespace spectator
diff --git a/libs/config/config.h b/libs/config/config.h
index 7a20c6b..382cc27 100644
--- a/libs/config/config.h
+++ b/libs/config/config.h
@@ -5,6 +5,8 @@
 
 #include <writer_config.h>
 
+namespace spectator {
+
 class Config
 {
    public:
@@ -26,4 +28,6 @@ class Config
    private:
     std::unordered_map<std::string, std::string> m_extraTags;
     WriterConfig m_writerConfig;
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/config/test_config.cpp b/libs/config/test_config.cpp
index 5dc5517..2724e09 100644
--- a/libs/config/test_config.cpp
+++ b/libs/config/test_config.cpp
@@ -4,6 +4,8 @@
 #include <config.h>
 #include <optional>
 
+using namespace spectator;
+
 // Enhanced helper to temporarily modify an environment variable for testing
 class EnvironmentVariableGuard
 {
diff --git a/libs/logger/logger.h b/libs/logger/logger.h
index 503193d..a9c9e44 100644
--- a/libs/logger/logger.h
+++ b/libs/logger/logger.h
@@ -11,6 +11,8 @@
 #include <spdlog/async.h>
 #include <fmt/core.h>
 
+namespace spectator {
+
 constexpr const char* kMainLogger = "spectator";
 
 class Logger final : public Singleton<Logger>
@@ -86,3 +88,5 @@ class Logger final : public Singleton<Logger>
         GetLogger()->error(fmt, std::forward<Args>(args)...);
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_id/meter_id.cpp b/libs/meter/meter_id/meter_id.cpp
index e33a103..32c1a73 100644
--- a/libs/meter/meter_id/meter_id.cpp
+++ b/libs/meter/meter_id/meter_id.cpp
@@ -3,6 +3,8 @@
 #include <util.h>
 #include <sstream>
 
+namespace spectator {
+
 // Define the static member
 const std::regex INVALID_CHARS("[^-._A-Za-z0-9~^]");
 
@@ -84,8 +86,10 @@ std::string MeterId::to_string() const
     return ss.str();
 }
 
+}  // namespace spectator
+
 // Implementation of the hash function for MeterId
-size_t std::hash<MeterId>::operator()(const MeterId& id) const
+size_t std::hash<spectator::MeterId>::operator()(const spectator::MeterId& id) const
 {
     // Hash the name first
     const size_t name_hash = std::hash<std::string>{}(id.GetName());
diff --git a/libs/meter/meter_id/meter_id.h b/libs/meter/meter_id/meter_id.h
index 1427c9c..22f133d 100644
--- a/libs/meter/meter_id/meter_id.h
+++ b/libs/meter/meter_id/meter_id.h
@@ -6,6 +6,8 @@
 #include <functional>
 #include <unordered_map>
 
+namespace spectator {
+
 class MeterId
 {
    public:
@@ -31,8 +33,10 @@ class MeterId
     std::string m_spectatord_id;
 };
 
+}  // namespace spectator
+
 template <>
-struct std::hash<MeterId>
+struct std::hash<spectator::MeterId>
 {
-    size_t operator()(const MeterId& id) const;
+    size_t operator()(const spectator::MeterId& id) const;
 };
diff --git a/libs/meter/meter_id/test_meter_id.cpp b/libs/meter/meter_id/test_meter_id.cpp
index d2bd71d..d672af2 100644
--- a/libs/meter/meter_id/test_meter_id.cpp
+++ b/libs/meter/meter_id/test_meter_id.cpp
@@ -2,6 +2,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 TEST(MeterIdTest, EqualsSameName)
 {
     const MeterId id1("foo");
diff --git a/libs/meter/meter_types/include/age_gauge.h b/libs/meter/meter_types/include/age_gauge.h
index 08b286d..0e02cbf 100644
--- a/libs/meter/meter_types/include/age_gauge.h
+++ b/libs/meter/meter_types/include/age_gauge.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto AGE_GAUGE_TYPE_SYMBOL = "A";
 
 class AgeGauge final : public Meter
@@ -25,3 +27,5 @@ class AgeGauge final : public Meter
         Writer::GetInstance().Write(line);
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/counter.h b/libs/meter/meter_types/include/counter.h
index 5a0fc42..a01469d 100644
--- a/libs/meter/meter_types/include/counter.h
+++ b/libs/meter/meter_types/include/counter.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto COUNTER_TYPE_SYMBOL = "c";
 
 class Counter final : public Meter
@@ -22,3 +24,5 @@ class Counter final : public Meter
         }
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/dist_summary.h b/libs/meter/meter_types/include/dist_summary.h
index 2f4fd83..d9e3801 100644
--- a/libs/meter/meter_types/include/dist_summary.h
+++ b/libs/meter/meter_types/include/dist_summary.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto DisTRIBUTION_SUMMARY_TYPE_SYMBOL = "d";
 
 class DistributionSummary final : public Meter
@@ -21,4 +23,6 @@ class DistributionSummary final : public Meter
             Writer::GetInstance().Write(line);
         }
     }
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/meter/meter_types/include/gauge.h b/libs/meter/meter_types/include/gauge.h
index bcb6352..6251ad8 100644
--- a/libs/meter/meter_types/include/gauge.h
+++ b/libs/meter/meter_types/include/gauge.h
@@ -7,6 +7,8 @@
 #include <string>
 #include <optional>
 
+namespace spectator {
+
 static constexpr auto GAUGE_TYPE_SYMBOL = "g";
 
 class Gauge final : public Meter
@@ -24,4 +26,6 @@ class Gauge final : public Meter
         auto line = this->ConstructLine(value);
         Writer::GetInstance().Write(line);
     }
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/meter/meter_types/include/max_gauge.h b/libs/meter/meter_types/include/max_gauge.h
index 6bc190d..8b59394 100644
--- a/libs/meter/meter_types/include/max_gauge.h
+++ b/libs/meter/meter_types/include/max_gauge.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto MAX_GAUGE_TYPE_SYMBOL = "m";
 
 class MaxGauge final : public Meter
@@ -18,4 +20,6 @@ class MaxGauge final : public Meter
         auto line = this->ConstructLine(value);
         Writer::GetInstance().Write(line);
     }
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/meter/meter_types/include/meter.h b/libs/meter/meter_types/include/meter.h
index 84286c0..d15e579 100644
--- a/libs/meter/meter_types/include/meter.h
+++ b/libs/meter/meter_types/include/meter.h
@@ -3,6 +3,8 @@
 #include <meter_id.h>
 #include <string>
 
+namespace spectator {
+
 class Meter
 {
    public:
@@ -41,3 +43,5 @@ class Meter
     MeterId m_id;
     std::string m_meterTypeSymbol;
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/monotonic_counter.h b/libs/meter/meter_types/include/monotonic_counter.h
index 41f4889..4eef903 100644
--- a/libs/meter/meter_types/include/monotonic_counter.h
+++ b/libs/meter/meter_types/include/monotonic_counter.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto MONOTONIC_COUNTER_TYPE_SYMBOL = "C";
 
 class MonotonicCounter final : public Meter
@@ -19,3 +21,5 @@ class MonotonicCounter final : public Meter
         Writer::GetInstance().Write(line);
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/monotonic_counter_uint.h b/libs/meter/meter_types/include/monotonic_counter_uint.h
index 386dc8a..c22a886 100644
--- a/libs/meter/meter_types/include/monotonic_counter_uint.h
+++ b/libs/meter/meter_types/include/monotonic_counter_uint.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto MONOTONIC_COUNTER_UINT_TYPE_SYMBOL = "U";
 
 class MonotonicCounterUint final : public Meter
@@ -19,3 +21,5 @@ class MonotonicCounterUint final : public Meter
         Writer::GetInstance().Write(line);
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/percentile_dist_summary.h b/libs/meter/meter_types/include/percentile_dist_summary.h
index 6af6530..0c632bb 100644
--- a/libs/meter/meter_types/include/percentile_dist_summary.h
+++ b/libs/meter/meter_types/include/percentile_dist_summary.h
@@ -7,6 +7,8 @@
 #include <cstdint>
 #include <string>
 
+namespace spectator {
+
 static constexpr auto PERCENTILE_DISTRIBUTION_SUMMARY_TYPE_SYMBOL = "D";
 
 class PercentileDistributionSummary final : public Meter
@@ -26,3 +28,5 @@ class PercentileDistributionSummary final : public Meter
         }
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/percentile_timer.h b/libs/meter/meter_types/include/percentile_timer.h
index 4b41c22..88ab55a 100644
--- a/libs/meter/meter_types/include/percentile_timer.h
+++ b/libs/meter/meter_types/include/percentile_timer.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto PERCENTILE_TIMER_TYPE_SYMBOL = "T";
 
 class PercentileTimer final : public Meter
@@ -22,3 +24,5 @@ class PercentileTimer final : public Meter
         }
     }
 };
+
+}  // namespace spectator
diff --git a/libs/meter/meter_types/include/timer.h b/libs/meter/meter_types/include/timer.h
index 6b44b30..b6731ef 100644
--- a/libs/meter/meter_types/include/timer.h
+++ b/libs/meter/meter_types/include/timer.h
@@ -6,6 +6,8 @@
 
 #include <string>
 
+namespace spectator {
+
 static constexpr auto TIMER_TYPE_SYMBOL = "t";
 
 class Timer final : public Meter
@@ -21,4 +23,6 @@ class Timer final : public Meter
             Writer::GetInstance().Write(line);
         }
     }
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/meter/meter_types/test/test_age_gauge.cpp b/libs/meter/meter_types/test/test_age_gauge.cpp
index 0f75552..b09446a 100644
--- a/libs/meter/meter_types/test/test_age_gauge.cpp
+++ b/libs/meter/meter_types/test/test_age_gauge.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class AgeGaugeTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_counter.cpp b/libs/meter/meter_types/test/test_counter.cpp
index 70f0aa2..f491a97 100644
--- a/libs/meter/meter_types/test/test_counter.cpp
+++ b/libs/meter/meter_types/test/test_counter.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class CounterTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_dist_summary.cpp b/libs/meter/meter_types/test/test_dist_summary.cpp
index 69fa7b5..3b58aaf 100644
--- a/libs/meter/meter_types/test/test_dist_summary.cpp
+++ b/libs/meter/meter_types/test/test_dist_summary.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class DistSummaryTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_gauge.cpp b/libs/meter/meter_types/test/test_gauge.cpp
index 535af14..dd417a2 100644
--- a/libs/meter/meter_types/test/test_gauge.cpp
+++ b/libs/meter/meter_types/test/test_gauge.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class GaugeTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_max_gauge.cpp b/libs/meter/meter_types/test/test_max_gauge.cpp
index 0892629..d05d3fe 100644
--- a/libs/meter/meter_types/test/test_max_gauge.cpp
+++ b/libs/meter/meter_types/test/test_max_gauge.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class MaxGaugeTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_monotonic_counter.cpp b/libs/meter/meter_types/test/test_monotonic_counter.cpp
index 33d862b..574684f 100644
--- a/libs/meter/meter_types/test/test_monotonic_counter.cpp
+++ b/libs/meter/meter_types/test/test_monotonic_counter.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class MonotonicCounterTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_monotonic_counter_uint.cpp b/libs/meter/meter_types/test/test_monotonic_counter_uint.cpp
index cadd8f1..c74f171 100644
--- a/libs/meter/meter_types/test/test_monotonic_counter_uint.cpp
+++ b/libs/meter/meter_types/test/test_monotonic_counter_uint.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class MonoCounterTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_percentile_dist_summary.cpp b/libs/meter/meter_types/test/test_percentile_dist_summary.cpp
index 80c1d75..1babee6 100644
--- a/libs/meter/meter_types/test/test_percentile_dist_summary.cpp
+++ b/libs/meter/meter_types/test/test_percentile_dist_summary.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class PercentileDistSummaryTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_percentile_timer.cpp b/libs/meter/meter_types/test/test_percentile_timer.cpp
index 182ca00..0044da9 100644
--- a/libs/meter/meter_types/test/test_percentile_timer.cpp
+++ b/libs/meter/meter_types/test/test_percentile_timer.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class PercentileTimerTest : public testing::Test
 {
    protected:
diff --git a/libs/meter/meter_types/test/test_timer.cpp b/libs/meter/meter_types/test/test_timer.cpp
index 2275759..6b418f3 100644
--- a/libs/meter/meter_types/test/test_timer.cpp
+++ b/libs/meter/meter_types/test/test_timer.cpp
@@ -3,6 +3,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 class TimerTest : public testing::Test
 {
    protected:
diff --git a/libs/utils/include/singleton.h b/libs/utils/include/singleton.h
index 3f1a300..c83909d 100644
--- a/libs/utils/include/singleton.h
+++ b/libs/utils/include/singleton.h
@@ -1,6 +1,8 @@
 #pragma once
 // Templated Singleton for derived singleton classes
 
+namespace spectator {
+
 template <typename T>
 class Singleton
 {
@@ -21,3 +23,5 @@ class Singleton
         return instance;
     }
 };
+
+}  // namespace spectator
diff --git a/libs/utils/include/util.h b/libs/utils/include/util.h
index 694ac85..39485fa 100644
--- a/libs/utils/include/util.h
+++ b/libs/utils/include/util.h
@@ -8,6 +8,8 @@
 
 #include <meter_id.h>
 
+namespace spectator {
+
 struct ProtocolLine
 {
     char symbol;
@@ -52,4 +54,6 @@ struct ProtocolLine
 
 std::optional<ProtocolLine> ParseProtocolLine(const std::string& line);
 
-bool IsEmptyOrWhitespace(const std::string& str);
\ No newline at end of file
+bool IsEmptyOrWhitespace(const std::string& str);
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/utils/src/util.cpp b/libs/utils/src/util.cpp
index 77ee350..1761350 100644
--- a/libs/utils/src/util.cpp
+++ b/libs/utils/src/util.cpp
@@ -3,6 +3,8 @@
 #include <sstream>
 #include <vector>
 
+namespace spectator {
+
 // Utility: split a string by a delimiter
 std::vector<std::string> split(const std::string& str, const char delimiter)
 {
@@ -59,4 +61,6 @@ std::optional<ProtocolLine> ParseProtocolLine(const std::string& line)
 bool IsEmptyOrWhitespace(const std::string& str)
 {
     return str.empty() || std::all_of(str.begin(), str.end(), [](unsigned char c) { return std::isspace(c); });
-}
\ No newline at end of file
+}
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_config/test_writer_config.cpp b/libs/writer/writer_config/test_writer_config.cpp
index 3f3595d..efa1796 100644
--- a/libs/writer/writer_config/test_writer_config.cpp
+++ b/libs/writer/writer_config/test_writer_config.cpp
@@ -6,6 +6,8 @@
 #include <cstdlib>
 #include <optional>
 
+using namespace spectator;
+
 // Enhanced helper to temporarily modify an environment variable for testing
 class EnvironmentVariableGuard
 {
diff --git a/libs/writer/writer_config/writer_config.cpp b/libs/writer/writer_config/writer_config.cpp
index 8a108af..6f331ab 100644
--- a/libs/writer/writer_config/writer_config.cpp
+++ b/libs/writer/writer_config/writer_config.cpp
@@ -2,6 +2,8 @@
 
 #include <logger.h>
 
+namespace spectator {
+
 struct WriterConfigConstants
 {
     static constexpr auto RuntimeErrorMessage = "Invalid writer type: ";
@@ -52,4 +54,6 @@ WriterConfig::WriterConfig(const std::string& type, const unsigned int bufferSiz
 {
     m_bufferSize = bufferSize;
     Logger::info("WriterConfig buffering enabled with size: {}", m_bufferSize);
-}
\ No newline at end of file
+}
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_config/writer_config.h b/libs/writer/writer_config/writer_config.h
index d007a53..737cfb5 100644
--- a/libs/writer/writer_config/writer_config.h
+++ b/libs/writer/writer_config/writer_config.h
@@ -5,6 +5,8 @@
 #include <string>
 #include <stdexcept>
 
+namespace spectator {
+
 class WriterConfig
 {
    public:
@@ -19,4 +21,6 @@ class WriterConfig
     WriterType m_type;
     std::string m_location;
     unsigned int m_bufferSize = 0;
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_types/include/base_writer.h b/libs/writer/writer_types/include/base_writer.h
index f1e88bd..457397d 100644
--- a/libs/writer/writer_types/include/base_writer.h
+++ b/libs/writer/writer_types/include/base_writer.h
@@ -2,6 +2,8 @@
 
 #include <string>
 
+namespace spectator {
+
 class BaseWriter
 {
    public:
@@ -15,4 +17,6 @@ class BaseWriter
 
     virtual void Write(const std::string& message) = 0;
     virtual void Close() = 0;
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_types/include/memory_writer.h b/libs/writer/writer_types/include/memory_writer.h
index 892fadc..e878a88 100644
--- a/libs/writer/writer_types/include/memory_writer.h
+++ b/libs/writer/writer_types/include/memory_writer.h
@@ -4,6 +4,8 @@
 #include <string>
 #include <vector>
 
+namespace spectator {
+
 class MemoryWriter final : public BaseWriter
 {
    public:
@@ -23,3 +25,5 @@ class MemoryWriter final : public BaseWriter
    private:
     std::vector<std::string> m_messages;
 };
+
+}  // namespace spectator
diff --git a/libs/writer/writer_types/include/udp_writer.h b/libs/writer/writer_types/include/udp_writer.h
index ce64bbd..8470b06 100644
--- a/libs/writer/writer_types/include/udp_writer.h
+++ b/libs/writer/writer_types/include/udp_writer.h
@@ -6,6 +6,8 @@
 #include <string>
 #include <boost/asio.hpp>
 
+namespace spectator {
+
 class UDPWriter final : public BaseWriter
 {
    public:
@@ -25,3 +27,5 @@ class UDPWriter final : public BaseWriter
     bool CreateSocket();
     bool TryToSend(const std::string& message);
 };
+
+}  // namespace spectator
diff --git a/libs/writer/writer_types/include/uds_writer.h b/libs/writer/writer_types/include/uds_writer.h
index e2ea37b..f8322e1 100644
--- a/libs/writer/writer_types/include/uds_writer.h
+++ b/libs/writer/writer_types/include/uds_writer.h
@@ -6,6 +6,8 @@
 #include <boost/asio.hpp>
 #include <memory>
 
+namespace spectator {
+
 class UDSWriter final : public BaseWriter
 {
    public:
@@ -24,3 +26,5 @@ class UDSWriter final : public BaseWriter
     bool CreateSocket();
     bool TryToSend(const std::string& message);
 };
+
+}  // namespace spectator
diff --git a/libs/writer/writer_types/include/writer_types.h b/libs/writer/writer_types/include/writer_types.h
index 69dce83..97fd0b2 100644
--- a/libs/writer/writer_types/include/writer_types.h
+++ b/libs/writer/writer_types/include/writer_types.h
@@ -10,6 +10,8 @@
 #include <utility>
 #include <unordered_set>
 
+namespace spectator {
+
 // Enum to specify which writer type to create
 enum class WriterType
 {
@@ -55,4 +57,6 @@ inline std::string WriterTypeToString(WriterType type)
         default:
             return "Unknown";
     }
-}
\ No newline at end of file
+}
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_types/src/memory_writer.cpp b/libs/writer/writer_types/src/memory_writer.cpp
index b75ad02..6baebd5 100644
--- a/libs/writer/writer_types/src/memory_writer.cpp
+++ b/libs/writer/writer_types/src/memory_writer.cpp
@@ -2,6 +2,8 @@
 
 #include <logger.h>
 
+namespace spectator {
+
 void MemoryWriter::Write(const std::string& message)
 {
     this->m_messages.push_back(message);
@@ -28,3 +30,5 @@ const std::string& MemoryWriter::LastLine() const noexcept
 
     return this->m_messages.back();
 }
+
+}  // namespace spectator
diff --git a/libs/writer/writer_types/src/udp_writer.cpp b/libs/writer/writer_types/src/udp_writer.cpp
index b3ad9ee..3d395fd 100644
--- a/libs/writer/writer_types/src/udp_writer.cpp
+++ b/libs/writer/writer_types/src/udp_writer.cpp
@@ -2,6 +2,8 @@
 
 #include <logger.h>
 
+namespace spectator {
+
 UDPWriter::UDPWriter(const std::string& host, int port) : 
     m_host(host), 
     m_port(port),
@@ -96,4 +98,6 @@ void UDPWriter::Close() try
 catch (const boost::system::system_error& ex)
 {
     Logger::error("UDP Writer: Boost exception: {}", ex.what());
-}
\ No newline at end of file
+}
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_types/src/uds_writer.cpp b/libs/writer/writer_types/src/uds_writer.cpp
index 8126f06..706f5c4 100644
--- a/libs/writer/writer_types/src/uds_writer.cpp
+++ b/libs/writer/writer_types/src/uds_writer.cpp
@@ -2,6 +2,8 @@
 
 #include <logger.h>
 
+namespace spectator {
+
 UDSWriter::UDSWriter(const std::string& socketPath)
     : m_socketPath(socketPath),
       m_ioContext(std::make_unique<boost::asio::io_context>()),
@@ -96,3 +98,5 @@ catch (const boost::system::system_error& ex)
 {
     Logger::error("UDS Writer: Boost exception: {}", ex.what());
 }
+
+}  // namespace spectator
diff --git a/libs/writer/writer_types/test/test_memory_writer.cpp b/libs/writer/writer_types/test/test_memory_writer.cpp
index 011a782..023749c 100644
--- a/libs/writer/writer_types/test/test_memory_writer.cpp
+++ b/libs/writer/writer_types/test/test_memory_writer.cpp
@@ -1,6 +1,8 @@
 #include <memory_writer.h>
 #include <gtest/gtest.h>
 
+using namespace spectator;
+
 TEST(MemoryWriterTest, IsEmpty)
 {
     const auto writer = MemoryWriter();
diff --git a/libs/writer/writer_types/test/test_udp_writer.cpp b/libs/writer/writer_types/test/test_udp_writer.cpp
index f34102c..4dd23cd 100644
--- a/libs/writer/writer_types/test/test_udp_writer.cpp
+++ b/libs/writer/writer_types/test/test_udp_writer.cpp
@@ -7,6 +7,8 @@
 #include <chrono>
 #include <algorithm>  // For std::find
 
+using namespace spectator;
+
 // Test fixture for UDP Writer tests
 class UDPWriterTest : public testing::Test
 {
diff --git a/libs/writer/writer_types/test/test_uds_writer.cpp b/libs/writer/writer_types/test/test_uds_writer.cpp
index bd6276f..a0dddfa 100644
--- a/libs/writer/writer_types/test/test_uds_writer.cpp
+++ b/libs/writer/writer_types/test/test_uds_writer.cpp
@@ -6,6 +6,8 @@
 #include <chrono>
 #include <algorithm>
 
+using namespace spectator;
+
 // Test fixture for UDS Writer tests
 class UDSWriterTest : public testing::Test
 {
diff --git a/libs/writer/writer_wrapper/test_writer.cpp b/libs/writer/writer_wrapper/test_writer.cpp
index 1977545..e93d9e9 100644
--- a/libs/writer/writer_wrapper/test_writer.cpp
+++ b/libs/writer/writer_wrapper/test_writer.cpp
@@ -12,6 +12,8 @@
 
 #include "../writer_types/test_utils/uds_server/uds_server.h"
 
+using namespace spectator;
+
 // Test fixture for UDS Writer tests
 class WriterWrapperUDSWriterTest : public testing::Test
 {
diff --git a/libs/writer/writer_wrapper/writer.cpp b/libs/writer/writer_wrapper/writer.cpp
index 8cbeb86..ac7fe1f 100644
--- a/libs/writer/writer_wrapper/writer.cpp
+++ b/libs/writer/writer_wrapper/writer.cpp
@@ -4,6 +4,8 @@
 #include <logger.h>
 #include <stdexcept>
 
+namespace spectator {
+
 static constexpr auto NEW_LINE = '\n';
 
 Writer::~Writer()
@@ -159,4 +161,6 @@ void Writer::Close()
     {
         Logger::error("Failed to close writer: {}", e.what());
     }
-}
\ No newline at end of file
+}
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_wrapper/writer.h b/libs/writer/writer_wrapper/writer.h
index 6502d32..82407ca 100644
--- a/libs/writer/writer_wrapper/writer.h
+++ b/libs/writer/writer_wrapper/writer.h
@@ -6,6 +6,8 @@
 #include <memory>
 #include <string>
 
+namespace spectator {
+
 class Writer final : public Singleton<Writer>
 {
    public:
@@ -64,4 +66,6 @@ class Writer final : public Singleton<Writer>
     std::condition_variable cv_receiver;
     std::condition_variable cv_sender;
     std::atomic<bool> shutdown{false};
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/libs/writer/writer_wrapper/writer_test_helper.h b/libs/writer/writer_wrapper/writer_test_helper.h
index 881e40f..972a00b 100644
--- a/libs/writer/writer_wrapper/writer_test_helper.h
+++ b/libs/writer/writer_wrapper/writer_test_helper.h
@@ -2,6 +2,8 @@
 
 #include <writer.h>
 
+namespace spectator {
+
 /**
  * WriterTestHelper - A utility class to help with testing Writer functionality
  *
@@ -20,3 +22,5 @@ class WriterTestHelper
     // Get the Writer's implementation for testing purposes
     static BaseWriter* GetImpl() { return Writer::GetInstance().m_impl.get(); }
 };
+
+}  // namespace spectator
diff --git a/performance_tests/performance_test.cpp b/performance_tests/performance_test.cpp
index 55f191f..98be0f2 100644
--- a/performance_tests/performance_test.cpp
+++ b/performance_tests/performance_test.cpp
@@ -10,6 +10,8 @@
 #include <thread>
 #include <vector>
 
+using namespace spectator;
+
 struct RunTimeConfig
 {
     bool bufferingEnabled;
diff --git a/spectator/registry.cpp b/spectator/registry.cpp
index 29b7bf1..52dd226 100644
--- a/spectator/registry.cpp
+++ b/spectator/registry.cpp
@@ -1,5 +1,7 @@
 #include <registry.h>
 
+namespace spectator {
+
 
 std::pair<std::string, int> ParseUdpAddress(const std::string& address) 
 {
@@ -151,4 +153,6 @@ Timer Registry::CreateTimer(const std::string& name, const std::unordered_map<st
     return Timer(CreateNewId(name, tags));
 }
 
-Timer Registry::CreateTimer(const MeterId& meter_id) const { return Timer(meter_id); }
\ No newline at end of file
+Timer Registry::CreateTimer(const MeterId& meter_id) const { return Timer(meter_id); }
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/spectator/registry.h b/spectator/registry.h
index eb38169..d6a5a30 100644
--- a/spectator/registry.h
+++ b/spectator/registry.h
@@ -13,6 +13,8 @@
 #include <unordered_map>
 #include <type_traits>
 
+namespace spectator {
+
 class Registry
 {
    public:
@@ -79,4 +81,6 @@ class Registry
 
    private:
     Config m_config;
-};
\ No newline at end of file
+};
+
+}  // namespace spectator
\ No newline at end of file
diff --git a/spectator/test_registry.cpp b/spectator/test_registry.cpp
index b7b56f6..a21dcfe 100644
--- a/spectator/test_registry.cpp
+++ b/spectator/test_registry.cpp
@@ -6,6 +6,8 @@
 
 #include <util.h>
 
+using namespace spectator;
+
 TEST(RegistryTest, Close)
 {
     auto config = Config(WriterConfig(WriterTypes::Memory));