Merge branch 'main' into fix_provider_cleanup_2506

CHANGELOG.md

@@ -18,6 +18,9 @@ Increment the:
 * [SDK] Update ExemplarFilter and ExemplarReservoir for spec
   [#2372](https://github.com/open-telemetry/opentelemetry-cpp/pull/2372)
 
+* [CI] Upgrade to clang-format 18
+  [#2684](https://github.com/open-telemetry/opentelemetry-cpp/pull/2684)
+
 * [API/SDK] Provider cleanup
   [#2664](https://github.com/open-telemetry/opentelemetry-cpp/pull/2664)
 

sdk/include/opentelemetry/sdk/metrics/meter_provider_factory.h

@@ -8,6 +8,7 @@
 #include "opentelemetry/metrics/meter_provider.h"
 #include "opentelemetry/sdk/metrics/meter_context.h"
 #include "opentelemetry/sdk/metrics/meter_provider.h"
+#include "opentelemetry/sdk/metrics/view/view_registry.h"
 #include "opentelemetry/sdk/resource/resource.h"
 #include "opentelemetry/version.h"
 

sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h

@@ -6,7 +6,13 @@
 #include <memory>
 #include <vector>
 
+#include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/sdk/trace/id_generator.h"
+#include "opentelemetry/sdk/trace/processor.h"
+#include "opentelemetry/sdk/trace/sampler.h"
+#include "opentelemetry/sdk/trace/tracer_context.h"
 #include "opentelemetry/sdk/trace/tracer_provider.h"
+#include "opentelemetry/trace/tracer_provider.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE

sdk/src/metrics/meter_provider_factory.cc

@@ -9,8 +9,6 @@
 #include "opentelemetry/sdk/metrics/view/view_registry_factory.h"
 #include "opentelemetry/version.h"
 
-#include <vector>
-
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk
 {