diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7788e32f2..30d16135ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,9 @@ Increment the:
 * [CODE HEALTH] Fix clang-tidy misc-use-internal-linkage warnings
   [#3600](https://github.com/open-telemetry/opentelemetry-cpp/pull/3600)
 
+* [CODE HEALTH] Fix clang-tidy macro to enum warnings
+  [#3922](https://github.com/open-telemetry/opentelemetry-cpp/pull/3922)
+
 Important changes:
 
 * [BUILD] Revisit EventLogger deprecation
diff --git a/api/include/opentelemetry/common/macros.h b/api/include/opentelemetry/common/macros.h
index 71d12a57bf..9d1f322ae5 100644
--- a/api/include/opentelemetry/common/macros.h
+++ b/api/include/opentelemetry/common/macros.h
@@ -246,8 +246,10 @@
 
 // Regex support
 #if (__GNUC__ == 4 && (__GNUC_MINOR__ == 8 || __GNUC_MINOR__ == 9))
+// NOLINTNEXTLINE(cppcoreguidelines-macro-to-enum)
 #  define OPENTELEMETRY_HAVE_WORKING_REGEX 0
 #else
+// NOLINTNEXTLINE(cppcoreguidelines-macro-to-enum)
 #  define OPENTELEMETRY_HAVE_WORKING_REGEX 1
 #endif
 
diff --git a/api/include/opentelemetry/version.h b/api/include/opentelemetry/version.h
index b6e2ab0f74..33decc4d01 100644
--- a/api/include/opentelemetry/version.h
+++ b/api/include/opentelemetry/version.h
@@ -7,13 +7,16 @@
 #include "opentelemetry/detail/preprocessor.h"
 
 #ifndef OPENTELEMETRY_ABI_VERSION_NO
+// NOLINTNEXTLINE(cppcoreguidelines-macro-to-enum)
 #  define OPENTELEMETRY_ABI_VERSION_NO 1
 #endif
 
+// NOLINTBEGIN(cppcoreguidelines-macro-to-enum)
 #define OPENTELEMETRY_VERSION "1.26.0-dev"
 #define OPENTELEMETRY_VERSION_MAJOR 1
 #define OPENTELEMETRY_VERSION_MINOR 26
 #define OPENTELEMETRY_VERSION_PATCH 0
+// NOLINTEND(cppcoreguidelines-macro-to-enum)
 
 #define OPENTELEMETRY_ABI_VERSION OPENTELEMETRY_STRINGIFY(OPENTELEMETRY_ABI_VERSION_NO)
 
diff --git a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
index 5364366cc3..3229084849 100644
--- a/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
+++ b/sdk/include/opentelemetry/sdk/logs/event_logger_provider.h
@@ -13,10 +13,6 @@
 
 #include "opentelemetry/version.h"
 
-// Define the maximum number of loggers that are allowed to be registered to the loggerprovider.
-// TODO: Add link to logging spec once this is added to it
-#define MAX_LOGGER_COUNT 100
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
diff --git a/sdk/include/opentelemetry/sdk/logs/logger_provider.h b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
index 6cd402b0ce..fdeb37825e 100644
--- a/sdk/include/opentelemetry/sdk/logs/logger_provider.h
+++ b/sdk/include/opentelemetry/sdk/logs/logger_provider.h
@@ -19,10 +19,6 @@
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/version.h"
 
-// Define the maximum number of loggers that are allowed to be registered to the loggerprovider.
-// TODO: Add link to logging spec once this is added to it
-#define MAX_LOGGER_COUNT 100
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {
diff --git a/sdk/src/logs/logger_provider.cc b/sdk/src/logs/logger_provider.cc
index 2750f6e076..bc3334998b 100644
--- a/sdk/src/logs/logger_provider.cc
+++ b/sdk/src/logs/logger_provider.cc
@@ -96,19 +96,6 @@ opentelemetry::nostd::shared_ptr<opentelemetry::logs::Logger> LoggerProvider::Ge
     }
   }
 
-  // Check if creating a new logger would exceed the max number of loggers
-  // TODO: Remove the noexcept from the API's and SDK's GetLogger(~)
-  /*
-  if (loggers_.size() > MAX_LOGGER_COUNT)
-  {
-#if __EXCEPTIONS
-    throw std::length_error("Number of loggers exceeds max count");
-#else
-    std::terminate();
-#endif
-  }
-  */
-
   std::unique_ptr<instrumentationscope::InstrumentationScope> lib =
       instrumentationscope::InstrumentationScope::Create(library_name, library_version, schema_url,
                                                          attributes);