Revert all changes on EventLogger.

open-telemetry · Jan 28, 2025 · 4855448 · 4855448
1 parent 8d6d94c
commit 4855448
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 84 deletions.
diff --git a/api/include/opentelemetry/logs/provider.h b/api/include/opentelemetry/logs/provider.h
@@ -59,6 +59,15 @@ class OPENTELEMETRY_EXPORT Provider
     return nostd::shared_ptr<EventLoggerProvider>(GetEventProvider());
   }
 
+  /**
+   * Changes the singleton EventLoggerProvider.
+   */
+  static void SetEventLoggerProvider(const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
+  {
+    std::lock_guard<common::SpinLockMutex> guard(GetLock());
+    GetEventProvider() = tp;
+  }
+
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
 private:
 #endif /* OPENTELEMETRY_ABI_VERSION_NO */
@@ -72,15 +81,6 @@ class OPENTELEMETRY_EXPORT Provider
     GetProvider() = tp;
   }
 
-  /**
-   * Changes the singleton EventLoggerProvider.
-   */
-  static void SetEventLoggerProvider(const nostd::shared_ptr<EventLoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetEventProvider() = tp;
-  }
-
 private:
   /* The SDK is allowed to change the singleton in the API. */
   friend class opentelemetry::sdk::logs::Provider;

diff --git a/api/test/logs/provider_test.cc b/api/test/logs/provider_test.cc
@@ -90,7 +90,6 @@ TEST(Provider, GetEventLoggerProviderDefault)
   EXPECT_NE(nullptr, tf);
 }
 
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
 TEST(Provider, SetEventLoggerProvider)
 {
   auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
@@ -107,7 +106,6 @@ TEST(Provider, MultipleEventLoggerProviders)
 
   ASSERT_NE(Provider::GetEventLoggerProvider(), tf);
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
 
 TEST(Provider, CreateEventLogger)
 {

diff --git a/sdk/include/opentelemetry/sdk/logs/provider.h b/sdk/include/opentelemetry/sdk/logs/provider.h
@@ -26,12 +26,6 @@ class Provider
    */
   static void SetLoggerProvider(
       const nostd::shared_ptr<opentelemetry::logs::LoggerProvider> &lp) noexcept;
-
-  /**
-   * Changes the singleton EventLoggerProvider.
-   */
-  static void SetEventLoggerProvider(
-      const nostd::shared_ptr<opentelemetry::logs::EventLoggerProvider> &lp) noexcept;
 };
 
 }  // namespace logs

diff --git a/sdk/src/logs/provider.cc b/sdk/src/logs/provider.cc
@@ -28,17 +28,6 @@ void Provider::SetLoggerProvider(
   }
 }
 
-void Provider::SetEventLoggerProvider(
-    const nostd::shared_ptr<opentelemetry::logs::EventLoggerProvider> &lp) noexcept
-{
-  bool disabled = opentelemetry::sdk::common::GetSdkDisabled();
-
-  if (!disabled)
-  {
-    opentelemetry::logs::Provider::SetEventLoggerProvider(lp);
-  }
-}
-
 }  // namespace logs
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE
diff --git a/sdk/test/logs/logger_provider_set_test.cc b/sdk/test/logs/logger_provider_set_test.cc
@@ -88,59 +88,3 @@ TEST(Provider, MultipleLoggerProviders)
 
   ASSERT_NE(logs_api::Provider::GetLoggerProvider(), tf);
 }
-
-class TestEventLoggerProvider : public EventLoggerProvider
-{
-public:
-  nostd::shared_ptr<EventLogger> CreateEventLogger(
-      nostd::shared_ptr<Logger> /*delegate_logger*/,
-      nostd::string_view /*event_domain*/) noexcept override
-  {
-    return nostd::shared_ptr<EventLogger>(nullptr);
-  }
-};
-
-TEST(Provider, SetEventLoggerProviderDefault)
-{
-#ifndef NO_GETENV
-  unsetenv("OTEL_SDK_DISABLED");
-#endif
-
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  logs_sdk::Provider::SetEventLoggerProvider(tf);
-  ASSERT_EQ(tf, logs_api::Provider::GetEventLoggerProvider());
-}
-
-#ifndef NO_GETENV
-TEST(Provider, SetEventLoggerProviderEnabled)
-{
-  setenv("OTEL_SDK_DISABLED", "false", 1);
-
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  logs_sdk::Provider::SetEventLoggerProvider(tf);
-  ASSERT_EQ(tf, logs_api::Provider::GetEventLoggerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-
-TEST(Provider, SetEventLoggerProviderDisabled)
-{
-  setenv("OTEL_SDK_DISABLED", "true", 1);
-
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  logs_sdk::Provider::SetEventLoggerProvider(tf);
-  ASSERT_NE(tf, logs_api::Provider::GetEventLoggerProvider());
-
-  unsetenv("OTEL_SDK_DISABLED");
-}
-#endif
-
-TEST(Provider, MultipleEventLoggerProviders)
-{
-  auto tf = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  logs_sdk::Provider::SetEventLoggerProvider(tf);
-  auto tf2 = nostd::shared_ptr<EventLoggerProvider>(new TestEventLoggerProvider());
-  logs_sdk::Provider::SetEventLoggerProvider(tf2);
-
-  ASSERT_NE(logs_api::Provider::GetEventLoggerProvider(), tf);
-}