Revert API changes

Author: marcalff

CHANGELOG.md

@@ -38,27 +38,8 @@ Important changes:
   * Applications are encouraged to migrate from the API to the SDK
     `Provider` classes, to benefit from this feature.
 
-  * Note that the API methods will no longer be public starting
-    with OPENTELEMETRY_ABI_VERSION >= 2, only the SDK methods will
-    be available then.
-
   * All the example code has been updated to reflect the new usage.
 
-Breaking changes:
-
-* [SDK] Support OTEL_SDK_DISABLED environment variable
-  [#3245](https://github.com/open-telemetry/opentelemetry-cpp/pull/3245)
-
-  * The following existing API methods are no longer public
-    starting with OPENTELEMETRY_ABI_VERSION >= 2.
-
-    * opentelemetry::trace::Provider::SetTracerProvider()
-    * opentelemetry::metrics::Provider::SetMeterProvider()
-    * opentelemetry::logs::Provider::SetLoggerProvider()
-
-  * Applications should use the corresponding SDK methods,
-    already available in every ABI version.
-
 ## [1.19 2025-01-22]
 
 * [PROMETHEUS_EXPORTER] Fix default for emitting otel_scope attributes

api/include/opentelemetry/logs/provider.h

@@ -12,17 +12,6 @@
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace logs
-{
-// The forward declaration is sufficient,
-// we do not want a API -> SDK dependency.
-// IWYU pragma: no_include "opentelemetry/sdk/logs/provider.h"
-class Provider;
-}  // namespace logs
-}  // namespace sdk
-
 namespace logs
 {
 
@@ -47,6 +36,15 @@ class OPENTELEMETRY_EXPORT Provider
     return nostd::shared_ptr<LoggerProvider>(GetProvider());
   }
 
+  /**
+   * Changes the singleton LoggerProvider.
+   */
+  static void SetLoggerProvider(const nostd::shared_ptr<LoggerProvider> &tp) noexcept
+  {
+    std::lock_guard<common::SpinLockMutex> guard(GetLock());
+    GetProvider() = tp;
+  }
+
   /**
    * Returns the singleton EventLoggerProvider.
    *
@@ -68,23 +66,7 @@ class OPENTELEMETRY_EXPORT Provider
     GetEventProvider() = tp;
   }
 
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
 private:
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
-  /**
-   * Changes the singleton LoggerProvider.
-   */
-  static void SetLoggerProvider(const nostd::shared_ptr<LoggerProvider> &tp) noexcept
-  {
-    std::lock_guard<common::SpinLockMutex> guard(GetLock());
-    GetProvider() = tp;
-  }
-
-private:
-  /* The SDK is allowed to change the singleton in the API. */
-  friend class opentelemetry::sdk::logs::Provider;
-
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<LoggerProvider> &GetProvider() noexcept
   {
     static nostd::shared_ptr<LoggerProvider> provider(new NoopLoggerProvider);

api/include/opentelemetry/metrics/provider.h

@@ -5,26 +5,17 @@
 
 #include <mutex>
 
+#include "opentelemetry/common/macros.h"
 #include "opentelemetry/common/spin_lock_mutex.h"
-#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/noop.h"
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
 namespace metrics
 {
-// The forward declaration is sufficient,
-// we do not want a API -> SDK dependency.
-// IWYU pragma: no_include "opentelemetry/sdk/metrics/provider.h"
-class Provider;  // IWYU pragma: keep
-}  // namespace metrics
-}  // namespace sdk
 
-namespace metrics
-{
+class MeterProvider;
 
 /**
  * Stores the singleton global MeterProvider.
@@ -44,10 +35,6 @@ class Provider
     return nostd::shared_ptr<MeterProvider>(GetProvider());
   }
 
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-private:
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
   /**
    * Changes the singleton MeterProvider.
    */
@@ -58,9 +45,6 @@ class Provider
   }
 
 private:
-  /* The SDK is allowed to change the singleton in the API. */
-  friend class opentelemetry::sdk::metrics::Provider;
-
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<MeterProvider> &GetProvider() noexcept
   {
     static nostd::shared_ptr<MeterProvider> provider(new NoopMeterProvider);

api/include/opentelemetry/trace/provider.h

@@ -12,17 +12,6 @@
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
-namespace sdk
-{
-namespace trace
-{
-// The forward declaration is sufficient,
-// we do not want a API -> SDK dependency.
-// IWYU pragma: no_include "opentelemetry/sdk/trace/provider.h"
-class Provider;  // IWYU pragma: keep
-}  // namespace trace
-}  // namespace sdk
-
 namespace trace
 {
 
@@ -44,10 +33,6 @@ class OPENTELEMETRY_EXPORT Provider
     return nostd::shared_ptr<TracerProvider>(GetProvider());
   }
 
-#if OPENTELEMETRY_ABI_VERSION_NO >= 2
-private:
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
-
   /**
    * Changes the singleton TracerProvider.
    */
@@ -58,9 +43,6 @@ class OPENTELEMETRY_EXPORT Provider
   }
 
 private:
-  /* The SDK is allowed to change the singleton in the API. */
-  friend class opentelemetry::sdk::trace::Provider;
-
   OPENTELEMETRY_API_SINGLETON static nostd::shared_ptr<TracerProvider> &GetProvider() noexcept
   {
     static nostd::shared_ptr<TracerProvider> provider(new NoopTracerProvider);

api/test/logs/logger_test.cc

@@ -220,7 +220,6 @@ class TestProvider : public LoggerProvider
   }
 };
 
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
 TEST(Logger, PushLoggerImplementation)
 {
   // Push the new loggerprovider class into the global singleton
@@ -234,4 +233,3 @@ TEST(Logger, PushLoggerImplementation)
   auto logger = lp->GetLogger("TestLogger", "opentelelemtry_library", "", schema_url);
   ASSERT_EQ("test logger", logger->GetName());
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */

api/test/logs/provider_test.cc

@@ -40,7 +40,6 @@ TEST(Provider, GetLoggerProviderDefault)
   EXPECT_NE(nullptr, tf);
 }
 
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
 TEST(Provider, SetLoggerProvider)
 {
   auto tf = shared_ptr<LoggerProvider>(new TestProvider());
@@ -57,7 +56,6 @@ TEST(Provider, MultipleLoggerProviders)
 
   ASSERT_NE(Provider::GetLoggerProvider(), tf);
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */
 
 TEST(Provider, GetLogger)
 {

api/test/metrics/meter_provider_test.cc

@@ -3,7 +3,6 @@
 
 #include <gtest/gtest.h>
 
-#include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/metrics/noop.h"
 #include "opentelemetry/metrics/provider.h"
 #include "opentelemetry/nostd/shared_ptr.h"
@@ -18,7 +17,6 @@ TEST(Provider, GetMeterProviderDefault)
   EXPECT_NE(nullptr, tf);
 }
 
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
 TEST(Provider, SetMeterProvider)
 {
   auto tf = opentelemetry::nostd::shared_ptr<MeterProvider>(new NoopMeterProvider());
@@ -35,4 +33,3 @@ TEST(Provider, MultipleMeterProviders)
 
   ASSERT_NE(Provider::GetMeterProvider(), tf);
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */

api/test/trace/provider_test.cc

@@ -42,11 +42,9 @@ TEST(Provider, GetTracerProviderDefault)
   EXPECT_NE(nullptr, tf);
 }
 
-#if OPENTELEMETRY_ABI_VERSION_NO == 1
 TEST(Provider, SetTracerProvider)
 {
   auto tf = nostd::shared_ptr<TracerProvider>(new TestProvider());
   Provider::SetTracerProvider(tf);
   ASSERT_EQ(tf, Provider::GetTracerProvider());
 }
-#endif /* OPENTELEMETRY_ABI_VERSION_NO */