Move implementation from SDK header files to SDK cc

CHANGELOG.md

@@ -15,6 +15,10 @@ Increment the:
 
 ## [Unreleased]
 
+* [SDK] Move inline implementation from SDK headers to .cc files.
+  Note: `GetEmptyAttributes()` now requires linking `opentelemetry_common`.
+  [#3887](https://github.com/open-telemetry/opentelemetry-cpp/pull/3887)
+
 * [CODE HEALTH] Fix clang tidy warnings in API `common` and `context`
   [#3948](https://github.com/open-telemetry/opentelemetry-cpp/pull/3948)
 

sdk/include/opentelemetry/sdk/common/empty_attributes.h

@@ -3,12 +3,12 @@
 
 #pragma once
 
+#include <stdint.h>
 #include <array>
 #include <string>
 #include <utility>
 
 #include "opentelemetry/common/key_value_iterable_view.h"
-#include "opentelemetry/common/macros.h"
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -20,17 +20,8 @@ namespace sdk
  * This helps to avoid constructing a new empty container every time a call is made
  * with default attributes.
  */
-static const opentelemetry::common::KeyValueIterableView<
-    std::array<std::pair<std::string, int32_t>, 0>> &
-GetEmptyAttributes() noexcept
-{
-  static const std::array<std::pair<std::string, int32_t>, 0> array{};
-  static const opentelemetry::common::KeyValueIterableView<
-      std::array<std::pair<std::string, int32_t>, 0>>
-      kEmptyAttributes(array);
-
-  return kEmptyAttributes;
-}
+const opentelemetry::common::KeyValueIterableView<std::array<std::pair<std::string, int32_t>, 0>> &
+GetEmptyAttributes() noexcept;
 
 }  // namespace sdk
 OPENTELEMETRY_END_NAMESPACE

sdk/include/opentelemetry/sdk/logs/multi_recordable.h

@@ -25,6 +25,9 @@ namespace logs
 {
 class MultiRecordable final : public Recordable
 {
+  static std::size_t MakeKey(
+      const opentelemetry::sdk::logs::LogRecordProcessor &processor) noexcept;
+
 public:
   void AddRecordable(const LogRecordProcessor &processor,
                      std::unique_ptr<Recordable> recordable) noexcept;

sdk/include/opentelemetry/sdk/metrics/aggregation/drop_aggregation.h

@@ -24,27 +24,17 @@ class DropAggregation : public Aggregation
 public:
   DropAggregation() = default;
 
-  DropAggregation(const DropPointData &) {}
+  DropAggregation(const DropPointData &);
 
   void Aggregate(int64_t /* value */, const PointAttributes & /* attributes */) noexcept override {}
 
   void Aggregate(double /* value */, const PointAttributes & /* attributes */) noexcept override {}
 
-  std::unique_ptr<Aggregation> Merge(const Aggregation &) const noexcept override
-  {
-    return std::unique_ptr<Aggregation>(new DropAggregation());
-  }
-
-  std::unique_ptr<Aggregation> Diff(const Aggregation &) const noexcept override
-  {
-    return std::unique_ptr<Aggregation>(new DropAggregation());
-  }
-
-  PointType ToPoint() const noexcept override
-  {
-    static DropPointData point_data;
-    return point_data;
-  }
+  std::unique_ptr<Aggregation> Merge(const Aggregation &) const noexcept override;
+
+  std::unique_ptr<Aggregation> Diff(const Aggregation &) const noexcept override;
+
+  PointType ToPoint() const noexcept override;
 };
 }  // namespace metrics
 }  // namespace sdk

sdk/include/opentelemetry/sdk/metrics/view/view_registry.h

@@ -3,21 +3,14 @@
 
 #pragma once
 
-#include <algorithm>
-#include <cassert>
 #include <memory>
-#include <string>
-#include <utility>
 #include <vector>
 
 #include "opentelemetry/nostd/function_ref.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
-#include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/metrics/view/instrument_selector.h"
 #include "opentelemetry/sdk/metrics/view/meter_selector.h"
-#include "opentelemetry/sdk/metrics/view/predicate.h"
 #include "opentelemetry/sdk/metrics/view/view.h"
 #include "opentelemetry/version.h"
 
@@ -31,11 +24,8 @@ struct RegisteredView
   RegisteredView(
       std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
       std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
-      std::unique_ptr<opentelemetry::sdk::metrics::View> view)
-      : instrument_selector_{std::move(instrument_selector)},
-        meter_selector_{std::move(meter_selector)},
-        view_{std::move(view)}
-  {}
+      std::unique_ptr<opentelemetry::sdk::metrics::View> view);
+
   std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector_;
   std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector_;
   std::unique_ptr<opentelemetry::sdk::metrics::View> view_;
@@ -44,101 +34,6 @@ struct RegisteredView
 class ViewRegistry
 {
 public:
-  void AddView(std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
-               std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
-               std::unique_ptr<opentelemetry::sdk::metrics::View> view)
-  {
-    // TBD - thread-safe ?
-
-    // Validate parameters
-    if (!instrument_selector || !meter_selector || !view)
-    {
-      OTEL_INTERNAL_LOG_ERROR(
-          "[ViewRegistry::AddView] Invalid parameters: instrument_selector, meter_selector, and "
-          "view cannot be null. Ignoring AddView call.");
-      return;
-    }
-
-    auto aggregation_config = view->GetAggregationConfig();
-    if (aggregation_config)
-    {
-      bool valid                   = false;
-      auto aggregation_config_type = aggregation_config->GetType();
-      auto aggregation_type        = view->GetAggregationType();
-
-      if (aggregation_type == AggregationType::kDefault)
-      {
-        bool is_monotonic{false};
-        aggregation_type = DefaultAggregation::GetDefaultAggregationType(
-            instrument_selector->GetInstrumentType(), is_monotonic);
-      }
-
-      switch (aggregation_type)
-      {
-        case AggregationType::kHistogram:
-          valid = (aggregation_config_type == AggregationType::kHistogram);
-          break;
-
-        case AggregationType::kBase2ExponentialHistogram:
-          valid = (aggregation_config_type == AggregationType::kBase2ExponentialHistogram);
-          break;
-
-        case AggregationType::kDrop:
-        case AggregationType::kLastValue:
-        case AggregationType::kSum:
-          valid = (aggregation_config_type == AggregationType::kDefault);
-          break;
-
-        default:
-          // Unreachable: all AggregationType enum values are handled above
-          assert(false && "Unreachable: unhandled AggregationType");
-          valid = false;
-      }
-
-      if (!valid)
-      {
-        OTEL_INTERNAL_LOG_ERROR(
-            "[ViewRegistry::AddView] AggregationType and AggregationConfig type mismatch. "
-            "Ignoring AddView call.");
-        return;
-      }
-    }
-
-    auto registered_view = std::unique_ptr<RegisteredView>(new RegisteredView{
-        std::move(instrument_selector), std::move(meter_selector), std::move(view)});
-    registered_views_.push_back(std::move(registered_view));
-  }
-
-  bool FindViews(
-      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope,
-      nostd::function_ref<bool(const View &)> callback) const
-  {
-    bool found = false;
-    for (auto const &registered_view : registered_views_)
-    {
-      if (MatchMeter(registered_view->meter_selector_.get(), instrumentation_scope) &&
-          MatchInstrument(registered_view->instrument_selector_.get(), instrument_descriptor))
-      {
-        found = true;
-        if (!callback(*(registered_view->view_.get())))
-        {
-          return false;
-        }
-      }
-    }
-    // return default view if none found;
-    if (!found)
-    {
-      static const View view("");
-      if (!callback(view))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
   ViewRegistry() = default;
 
   ViewRegistry(const ViewRegistry &)            = delete;
@@ -148,27 +43,25 @@ class ViewRegistry
 
   ~ViewRegistry() = default;
 
+  void AddView(std::unique_ptr<opentelemetry::sdk::metrics::InstrumentSelector> instrument_selector,
+               std::unique_ptr<opentelemetry::sdk::metrics::MeterSelector> meter_selector,
+               std::unique_ptr<opentelemetry::sdk::metrics::View> view);
+
+  bool FindViews(
+      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor,
+      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope,
+      nostd::function_ref<bool(const View &)> callback) const;
+
 private:
   std::vector<std::unique_ptr<RegisteredView>> registered_views_;
+
   static bool MatchMeter(
       opentelemetry::sdk::metrics::MeterSelector *selector,
-      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope)
-  {
-    return selector->GetNameFilter()->Match(instrumentation_scope.GetName()) &&
-           (instrumentation_scope.GetVersion().size() == 0 ||
-            selector->GetVersionFilter()->Match(instrumentation_scope.GetVersion())) &&
-           (instrumentation_scope.GetSchemaURL().size() == 0 ||
-            selector->GetSchemaFilter()->Match(instrumentation_scope.GetSchemaURL()));
-  }
+      const opentelemetry::sdk::instrumentationscope::InstrumentationScope &instrumentation_scope);
 
   static bool MatchInstrument(
       opentelemetry::sdk::metrics::InstrumentSelector *selector,
-      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor)
-  {
-    return selector->GetNameFilter()->Match(instrument_descriptor.name_) &&
-           selector->GetUnitFilter()->Match(instrument_descriptor.unit_) &&
-           (selector->GetInstrumentType() == instrument_descriptor.type_);
-  }
+      const opentelemetry::sdk::metrics::InstrumentDescriptor &instrument_descriptor);
 };
 }  // namespace metrics
 }  // namespace sdk