Code cleanup

Author: marcalff

sdk/include/opentelemetry/sdk/configuration/configured_sdk.h

@@ -27,16 +27,16 @@ class ConfiguredSdk
       std::shared_ptr<Registry> registry,
       const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model);
 
-  ConfiguredSdk() : m_resource(opentelemetry::sdk::resource::Resource::GetEmpty()) {}
+  ConfiguredSdk() : resource(opentelemetry::sdk::resource::Resource::GetEmpty()) {}
 
   void Install();
   void UnInstall();
 
-  opentelemetry::sdk::resource::Resource m_resource;
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> m_tracer_provider;
-  std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> m_propagator;
-  std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> m_meter_provider;
-  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> m_logger_provider;
+  opentelemetry::sdk::resource::Resource resource;
+  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> tracer_provider;
+  std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> propagator;
+  std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> meter_provider;
+  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> logger_provider;
 };
 
 }  // namespace configuration

sdk/include/opentelemetry/sdk/configuration/sdk_builder.h

@@ -66,7 +66,7 @@ namespace configuration
 class SdkBuilder
 {
 public:
-  SdkBuilder(std::shared_ptr<Registry> registry) : m_registry(std::move(registry)) {}
+  SdkBuilder(std::shared_ptr<Registry> registry) : registry_(std::move(registry)) {}
   SdkBuilder(SdkBuilder &&)                      = default;
   SdkBuilder(const SdkBuilder &)                 = default;
   SdkBuilder &operator=(SdkBuilder &&)           = default;
@@ -205,7 +205,7 @@ class SdkBuilder
       const;
 
   void AddView(
-      opentelemetry::sdk::metrics::ViewRegistry *registry,
+      opentelemetry::sdk::metrics::ViewRegistry *view_registry,
       const std::unique_ptr<opentelemetry::sdk::configuration::ViewConfiguration> &model) const;
 
   std::unique_ptr<opentelemetry::sdk::metrics::MeterProvider> CreateMeterProvider(
@@ -250,32 +250,6 @@ class SdkBuilder
       const std::unique_ptr<opentelemetry::sdk::configuration::LoggerProviderConfiguration> &model,
       const opentelemetry::sdk::resource::Resource &resource) const;
 
-  opentelemetry::common::AttributeValue CreateStringAttribute(
-      const opentelemetry::sdk::configuration::StringAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateIntegerAttribute(
-      const opentelemetry::sdk::configuration::IntegerAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateDoubleAttribute(
-      const opentelemetry::sdk::configuration::DoubleAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateBooleanAttribute(
-      const opentelemetry::sdk::configuration::BooleanAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateStringArrayAttribute(
-      const opentelemetry::sdk::configuration::StringArrayAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateIntegerArrayAttribute(
-      const opentelemetry::sdk::configuration::IntegerArrayAttributeValueConfiguration *model)
-      const;
-
-  opentelemetry::common::AttributeValue CreateDoubleArrayAttribute(
-      const opentelemetry::sdk::configuration::DoubleArrayAttributeValueConfiguration *model) const;
-
-  opentelemetry::common::AttributeValue CreateBooleanArrayAttribute(
-      const opentelemetry::sdk::configuration::BooleanArrayAttributeValueConfiguration *model)
-      const;
-
   void SetResourceAttribute(
       opentelemetry::sdk::resource::ResourceAttributes &resource_attributes,
       const std::string &name,
@@ -289,7 +263,7 @@ class SdkBuilder
       const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model) const;
 
 private:
-  std::shared_ptr<Registry> m_registry;
+  std::shared_ptr<Registry> registry_;
 };
 
 }  // namespace configuration

sdk/src/configuration/configured_sdk.cc

@@ -6,6 +6,7 @@
 #include <ostream>
 #include <utility>
 
+#include "opentelemetry/context/propagation/global_propagator.h"
 #include "opentelemetry/logs/logger_provider.h"
 #include "opentelemetry/logs/provider.h"
 #include "opentelemetry/metrics/meter_provider.h"
@@ -56,40 +57,51 @@ std::unique_ptr<ConfiguredSdk> ConfiguredSdk::Create(
 
 void ConfiguredSdk::Install()
 {
-  if (m_tracer_provider)
+  if (propagator)
   {
-    std::shared_ptr<opentelemetry::trace::TracerProvider> api_tracer_provider = m_tracer_provider;
+    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(propagator);
+  }
+
+  if (tracer_provider)
+  {
+    std::shared_ptr<opentelemetry::trace::TracerProvider> api_tracer_provider = tracer_provider;
     opentelemetry::trace::Provider::SetTracerProvider(api_tracer_provider);
   }
 
-  if (m_meter_provider)
+  if (meter_provider)
   {
-    std::shared_ptr<opentelemetry::metrics::MeterProvider> api_meter_provider = m_meter_provider;
+    std::shared_ptr<opentelemetry::metrics::MeterProvider> api_meter_provider = meter_provider;
     opentelemetry::metrics::Provider::SetMeterProvider(api_meter_provider);
   }
 
-  if (m_logger_provider)
+  if (logger_provider)
   {
-    std::shared_ptr<opentelemetry::logs::LoggerProvider> api_logger_provider = m_logger_provider;
+    std::shared_ptr<opentelemetry::logs::LoggerProvider> api_logger_provider = logger_provider;
     opentelemetry::logs::Provider::SetLoggerProvider(api_logger_provider);
   }
 }
 
 void ConfiguredSdk::UnInstall()
 {
-  if (m_tracer_provider)
+  if (propagator)
+  {
+    std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> none;
+    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(none);
+  }
+
+  if (tracer_provider)
   {
     std::shared_ptr<opentelemetry::trace::TracerProvider> none;
     opentelemetry::trace::Provider::SetTracerProvider(none);
   }
 
-  if (m_meter_provider)
+  if (meter_provider)
   {
     std::shared_ptr<opentelemetry::metrics::MeterProvider> none;
     opentelemetry::metrics::Provider::SetMeterProvider(none);
   }
 
-  if (m_logger_provider)
+  if (logger_provider)
   {
     std::shared_ptr<opentelemetry::logs::LoggerProvider> none;
     opentelemetry::logs::Provider::SetLoggerProvider(none);