From 23df1986c2a759dd2462e5b291fa28b1cab8254f Mon Sep 17 00:00:00 2001 From: hudsonhumphries Date: Thu, 30 Jul 2020 13:27:26 -0500 Subject: [PATCH 1/2] pass in library_name and library_version into meter --- sdk/include/opentelemetry/sdk/metrics/meter.h | 9 +++++++++ sdk/include/opentelemetry/sdk/metrics/meter_provider.h | 3 ++- sdk/src/metrics/meter_provider.cc | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/meter.h b/sdk/include/opentelemetry/sdk/metrics/meter.h index 6b7dc1d370..b17a651476 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter.h @@ -3,6 +3,7 @@ #include "opentelemetry/metrics/meter.h" #include "opentelemetry/version.h" +#include #include OPENTELEMETRY_BEGIN_NAMESPACE @@ -13,6 +14,14 @@ namespace metrics class Meter final : public opentelemetry::metrics::Meter, public std::enable_shared_from_this { public: + explicit Meter(std::string library_name, std::string library_version) + { + library_name_ = library_name; + library_version_ = library_version; + } +private: + std::string library_name_; + std::string library_version_; }; } // namespace metrics } // namespace sdk diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h index 4b5821c1b5..643c333a05 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h @@ -4,6 +4,7 @@ #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/sdk/metrics/meter.h" +#include #include OPENTELEMETRY_BEGIN_NAMESPACE @@ -17,7 +18,7 @@ class MeterProvider final : public opentelemetry::metrics::MeterProvider /** * Initialize a new meter provider */ - explicit MeterProvider() noexcept; + explicit MeterProvider(std::string library_name = "", std::string library_version = "") noexcept; opentelemetry::nostd::shared_ptr GetMeter( nostd::string_view library_name, diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc index d003532a9b..a427bc0ee0 100644 --- a/sdk/src/metrics/meter_provider.cc +++ b/sdk/src/metrics/meter_provider.cc @@ -5,7 +5,8 @@ namespace sdk { namespace metrics { -MeterProvider::MeterProvider() noexcept : meter_(new Meter) {} +MeterProvider::MeterProvider(std::string library_name, std::string library_version) noexcept + : meter_(new Meter(library_name, library_version)) {} opentelemetry::nostd::shared_ptr MeterProvider::GetMeter( nostd::string_view library_name, From b306351aec1c9e1f018f648efbb300525a2089a4 Mon Sep 17 00:00:00 2001 From: hudsonhumphries Date: Thu, 30 Jul 2020 14:03:12 -0500 Subject: [PATCH 2/2] formatting --- sdk/include/opentelemetry/sdk/metrics/meter.h | 3 ++- sdk/include/opentelemetry/sdk/metrics/meter_provider.h | 2 +- sdk/src/metrics/meter_provider.cc | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/sdk/include/opentelemetry/sdk/metrics/meter.h b/sdk/include/opentelemetry/sdk/metrics/meter.h index b17a651476..9a66adb6d9 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter.h @@ -3,8 +3,8 @@ #include "opentelemetry/metrics/meter.h" #include "opentelemetry/version.h" -#include #include +#include OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk @@ -19,6 +19,7 @@ class Meter final : public opentelemetry::metrics::Meter, public std::enable_sha library_name_ = library_name; library_version_ = library_version; } + private: std::string library_name_; std::string library_version_; diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h index 643c333a05..4112d14b8f 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h @@ -4,8 +4,8 @@ #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/sdk/metrics/meter.h" -#include #include +#include OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc index a427bc0ee0..7c009a7bab 100644 --- a/sdk/src/metrics/meter_provider.cc +++ b/sdk/src/metrics/meter_provider.cc @@ -5,8 +5,9 @@ namespace sdk { namespace metrics { -MeterProvider::MeterProvider(std::string library_name, std::string library_version) noexcept - : meter_(new Meter(library_name, library_version)) {} +MeterProvider::MeterProvider(std::string library_name, std::string library_version) noexcept + : meter_(new Meter(library_name, library_version)) +{} opentelemetry::nostd::shared_ptr MeterProvider::GetMeter( nostd::string_view library_name,