[API] Add InstrumentationScope attributes in MeterProvider::GetMeter()

api/include/opentelemetry/metrics/meter_provider.h

@@ -8,6 +8,11 @@
 #include "opentelemetry/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
+namespace common
+{
+class KeyValueIterable;
+}
+
 namespace metrics
 {
 
@@ -26,9 +31,19 @@ class MeterProvider
    * Optionally a version can be passed to create a named and versioned Meter
    * instance.
    */
+
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  virtual nostd::shared_ptr<Meter> GetMeter(
+      nostd::string_view library_name,
+      nostd::string_view library_version         = "",
+      nostd::string_view schema_url              = "",
+      const common::KeyValueIterable *attributes = nullptr) noexcept = 0;
+#else
   virtual nostd::shared_ptr<Meter> GetMeter(nostd::string_view library_name,
                                             nostd::string_view library_version = "",
                                             nostd::string_view schema_url      = "") noexcept = 0;
+#endif
+
 #ifdef ENABLE_REMOVE_METER_PREVIEW
   virtual void RemoveMeter(nostd::string_view library_name,
                            nostd::string_view library_version = "",

api/include/opentelemetry/metrics/noop.h

@@ -196,12 +196,23 @@ class NoopMeterProvider final : public MeterProvider
 public:
   NoopMeterProvider() : meter_{nostd::shared_ptr<Meter>(new NoopMeter)} {}
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  nostd::shared_ptr<Meter> GetMeter(
+      nostd::string_view /* library_name */,
+      nostd::string_view /* library_version */,
+      nostd::string_view /* schema_url */,
+      const common::KeyValueIterable * /* attributes */) noexcept override
+  {
+    return meter_;
+  }
+#else
   nostd::shared_ptr<Meter> GetMeter(nostd::string_view /* library_name */,
                                     nostd::string_view /* library_version */,
                                     nostd::string_view /* schema_url */) noexcept override
   {
     return meter_;
   }
+#endif
 
 #ifdef ENABLE_REMOVE_METER_PREVIEW
   void RemoveMeter(nostd::string_view /* name */,

api/include/opentelemetry/version.h

@@ -6,7 +6,8 @@
 #include "opentelemetry/common/macros.h"
 #include "opentelemetry/detail/preprocessor.h"
 
-#define OPENTELEMETRY_ABI_VERSION_NO 1
+// For proof of concept only, testing version 2 build.
+#define OPENTELEMETRY_ABI_VERSION_NO 2
 #define OPENTELEMETRY_VERSION "1.10.0"
 #define OPENTELEMETRY_VERSION_MAJOR 1
 #define OPENTELEMETRY_VERSION_MINOR 10

sdk/include/opentelemetry/sdk/common/attribute_utils.h

@@ -105,10 +105,10 @@ struct AttributeConverter
 class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
 {
 public:
-  // Contruct empty attribute map
+  // Construct empty attribute map
   AttributeMap() : std::unordered_map<std::string, OwnedAttributeValue>() {}
 
-  // Contruct attribute map and populate with attributes
+  // Construct attribute map and populate with attributes
   AttributeMap(const opentelemetry::common::KeyValueIterable &attributes) : AttributeMap()
   {
     attributes.ForEachKeyValue(
@@ -118,6 +118,19 @@ class AttributeMap : public std::unordered_map<std::string, OwnedAttributeValue>
         });
   }
 
+  // Construct attribute map and populate with optional attributes
+  AttributeMap(const opentelemetry::common::KeyValueIterable *attributes) : AttributeMap()
+  {
+    if (attributes != nullptr)
+    {
+      attributes->ForEachKeyValue(
+          [&](nostd::string_view key, opentelemetry::common::AttributeValue value) noexcept {
+            SetAttribute(key, value);
+            return true;
+          });
+    }
+  }
+
   // Construct map from initializer list by applying `SetAttribute` transform for every attribute
   AttributeMap(
       std::initializer_list<std::pair<nostd::string_view, opentelemetry::common::AttributeValue>>

sdk/include/opentelemetry/sdk/metrics/meter_provider.h

@@ -48,10 +48,18 @@ class MeterProvider final : public opentelemetry::metrics::MeterProvider
    */
   explicit MeterProvider(std::unique_ptr<MeterContext> context) noexcept;
 
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+  nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
+      nostd::string_view name,
+      nostd::string_view version                                = "",
+      nostd::string_view schema_url                             = "",
+      const opentelemetry::common::KeyValueIterable *attributes = nullptr) noexcept override;
+#else
   nostd::shared_ptr<opentelemetry::metrics::Meter> GetMeter(
       nostd::string_view name,
       nostd::string_view version    = "",
       nostd::string_view schema_url = "") noexcept override;
+#endif
 
 #ifdef ENABLE_REMOVE_METER_PREVIEW
   void RemoveMeter(nostd::string_view name,

sdk/src/metrics/meter_provider.cc

@@ -35,8 +35,17 @@ MeterProvider::MeterProvider(std::unique_ptr<ViewRegistry> views,
 nostd::shared_ptr<metrics_api::Meter> MeterProvider::GetMeter(
     nostd::string_view name,
     nostd::string_view version,
-    nostd::string_view schema_url) noexcept
+    nostd::string_view schema_url
+#if OPENTELEMETRY_ABI_VERSION_NO >= 2
+    ,
+    const opentelemetry::common::KeyValueIterable *attributes
+#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.");
@@ -53,8 +62,12 @@ 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)));
+
+  instrumentationscope::InstrumentationScopeAttributes attrs_map(attributes);
+  auto scope =
+      instrumentationscope::InstrumentationScope::Create(name, version, schema_url, attrs_map);
+
+  auto meter = std::shared_ptr<Meter>(new Meter(context_, std::move(scope)));
   context_->AddMeter(meter);
   return nostd::shared_ptr<metrics_api::Meter>{meter};
 }