Update usage of ABI 2 to match breaking changes in opentelemetry-cpp v1.16.0 release.

See https://github.com/open-telemetry/opentelemetry-cpp/blob/v1.16.0/CHANGELOG.md#1160-2024-06-21
for details on the v1.16.0 changes.

Fixes open-telemetry#465.

Author: justin-mccann

exporters/fluentd/test/trace/fluentd_recordable_test.cc

@@ -27,6 +27,7 @@
 #include "opentelemetry/sdk/trace/simple_processor.h"
 #include "opentelemetry/sdk/trace/span_data.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
+#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
 
 #include "opentelemetry/sdk/trace/exporter.h"
@@ -380,11 +381,17 @@ TEST(FluentdExporter, SendTraceEvents) {
   auto processor = std::unique_ptr<SpanProcessor>(
       new sdktrace::SimpleSpanProcessor(std::move(exporter)));
 
-  auto provider = nostd::shared_ptr<trace::TracerProvider>(
-      new TracerProvider(std::move(processor)));
+#ifdef OPENTELEMETRY_DEPRECATED_SDK_FACTORY
+  nostd::shared_ptr<trace::TracerProvider> provider =
+      sdktrace::TracerProviderFactory::Create(std::move(processor));
+#else
+  nostd::shared_ptr<sdktrace::TracerProvider> provider =
+      sdktrace::TracerProviderFactory::Create(std::move(processor));
+#endif /* OPENTELEMETRY_DEPRECATED_SDK_FACTORY */
 
+  nostd::shared_ptr<trace::TracerProvider> api_provider = provider;
   // Set the global trace provider
-  opentelemetry::trace::Provider::SetTracerProvider(provider);
+  opentelemetry::trace::Provider::SetTracerProvider(api_provider);
 
   std::string providerName = "MyInstrumentationName";
   auto tracer = provider->GetTracer(providerName);
@@ -426,8 +433,16 @@ TEST(FluentdExporter, SendTraceEvents) {
   }
   span1->End(); // end MySpanL1
 
+#if OPENTELEMETRY_ABI_VERSION_NO == 1
   tracer->ForceFlushWithMicroseconds(1000);
   tracer->CloseWithMicroseconds(0);
+#else
+  /* In ABI 2 >= otel-cpp v1.16.0, only the sdk Tracer objects
+   * have the ForceFlush...() and Close...() methods. The Close()
+   * method simply calls ForceFlush(). Use the SDK provider ForceFlush() instead.
+   */
+  provider->ForceFlush();
+#endif /* OPENTELEMETRY_ABI_VERSION_NO == 1 */
 
   testServer.WaitForEvents(6, 200); // 6 batches must arrive in 200ms
   testServer.Stop();

instrumentation/otel-webserver-module/test/unit/mocks/mock_OpenTelemetry.h

@@ -52,8 +52,10 @@ class MockTracer : public opentelemetry::trace::Tracer
 	MOCK_METHOD(nostd::shared_ptr<trace::Span>, StartSpanInternal,
 		(nostd::string_view name, trace::SpanKind kind));
 
+#if OPENTELEMETRY_ABI_VERSION_NO == 1
 	MOCK_METHOD(void, ForceFlushWithMicroseconds, (uint64_t timeout), (noexcept));
 	MOCK_METHOD(void, CloseWithMicroseconds, (uint64_t timeout), (noexcept));
+#endif /* OPENTELEMETRY_ABI_VERSION_NO == 1 */
 };
 
 class MockSpan : public opentelemetry::trace::Span