Fixed instrumentation scope

open-telemetry · Jul 7, 2023 · 63fde43 · 63fde43
1 parent fdbef73
commit 63fde43
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 14 deletions.
diff --git a/sdk/include/opentelemetry/sdk/metrics/meter.h b/sdk/include/opentelemetry/sdk/metrics/meter.h
@@ -42,8 +42,7 @@ class Meter final : public opentelemetry::metrics::Meter
   explicit Meter(
       std::weak_ptr<sdk::metrics::MeterContext> meter_context,
       std::unique_ptr<opentelemetry::sdk::instrumentationscope::InstrumentationScope> scope =
-          opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(""),
-      const opentelemetry::common::KeyValueIterable *attributes = nullptr) noexcept;
+          opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("")) noexcept;
 
   nostd::unique_ptr<opentelemetry::metrics::Counter<uint64_t>> CreateUInt64Counter(
       nostd::string_view name,

diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc
@@ -26,15 +26,13 @@ namespace metrics
 namespace metrics = opentelemetry::metrics;
 namespace nostd   = opentelemetry::nostd;
 
-Meter::Meter(std::weak_ptr<MeterContext> meter_context,
-             std::unique_ptr<sdk::instrumentationscope::InstrumentationScope> instrumentation_scope,
-             const opentelemetry::common::KeyValueIterable *attributes) noexcept
+Meter::Meter(
+    std::weak_ptr<MeterContext> meter_context,
+    std::unique_ptr<sdk::instrumentationscope::InstrumentationScope> instrumentation_scope) noexcept
     : scope_{std::move(instrumentation_scope)},
       meter_context_{meter_context},
       observable_registry_(new ObservableRegistry())
-{
-  // FIXME: use attributes
-}
+{}
 
 nostd::unique_ptr<metrics::Counter<uint64_t>> Meter::CreateUInt64Counter(
     nostd::string_view name,

diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc
@@ -42,10 +42,6 @@ nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
 #endif
     ) noexcept
 {
-#if OPENTELEMETRY_ABI_VERSION_NO < 2
-  const opentelemetry::common::KeyValueIterable *attributes = nullptr;
-#endif
-
   if (name.data() == nullptr || name == "")
   {
     OTEL_INTERNAL_LOG_WARN("[MeterProvider::GetMeter] Library name is empty.");
@@ -62,8 +58,23 @@ nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
       return nostd::shared_ptr<metrics_api::Meter>{meter};
     }
   }
-  auto lib   = instrumentationscope::InstrumentationScope::Create(name, version, schema_url);
-  auto meter = std::shared_ptr<Meter>(new Meter(context_, std::move(lib), attributes));
+
+  std::unique_ptr<instrumentationscope::InstrumentationScope> scope;
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  if (attributes != nullptr)
+  {
+    instrumentationscope::InstrumentationScopeAttributes attrs_map(*attributes);
+    scope =
+        instrumentationscope::InstrumentationScope::Create(name, version, schema_url, attrs_map);
+  }
+  else
+#endif
+  {
+    scope = instrumentationscope::InstrumentationScope::Create(name, version, schema_url);
+  }
+
+  auto meter = std::shared_ptr<Meter>(new Meter(context_, std::move(scope)));
   context_->AddMeter(meter);
   return nostd::shared_ptr<metrics_api::Meter>{meter};
 }