Refresh code from PR #2518, to fix review comments.

Author: marcalff

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

@@ -27,16 +27,28 @@ class ConfiguredSdk
       std::shared_ptr<Registry> registry,
       const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model);
 
-  ConfiguredSdk() : resource(opentelemetry::sdk::resource::Resource::GetEmpty()) {}
-
-  void Install();
-  void UnInstall();
-
-  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;
+  ConfiguredSdk(
+      opentelemetry::sdk::resource::Resource &&resource,
+      const std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> &tracer_provider,
+      const std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> &propagator,
+      const std::shared_ptr<opentelemetry::sdk::metrics::MeterProvider> &meter_provider,
+      const std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> &logger_provider)
+      : resource_(std::move(resource)),
+        tracer_provider_(tracer_provider),
+        propagator_(propagator),
+        meter_provider_(meter_provider),
+        logger_provider_(logger_provider)
+  {}
+
+  void Init();
+  void Cleanup();
+
+private:
+  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/src/configuration/configured_sdk.cc

@@ -56,53 +56,53 @@ std::unique_ptr<ConfiguredSdk> ConfiguredSdk::Create(
   return sdk;
 }
 
-void ConfiguredSdk::Install()
+void ConfiguredSdk::Init()
 {
-  if (propagator)
+  if (propagator_)
   {
-    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(propagator);
+    opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(propagator_);
   }
 
-  if (tracer_provider)
+  if (tracer_provider_)
   {
-    std::shared_ptr<opentelemetry::trace::TracerProvider> api_tracer_provider = tracer_provider;
+    std::shared_ptr<opentelemetry::trace::TracerProvider> api_tracer_provider = tracer_provider_;
     opentelemetry::trace::Provider::SetTracerProvider(api_tracer_provider);
   }
 
-  if (meter_provider)
+  if (meter_provider_)
   {
-    std::shared_ptr<opentelemetry::metrics::MeterProvider> api_meter_provider = meter_provider;
+    std::shared_ptr<opentelemetry::metrics::MeterProvider> api_meter_provider = meter_provider_;
     opentelemetry::metrics::Provider::SetMeterProvider(api_meter_provider);
   }
 
-  if (logger_provider)
+  if (logger_provider_)
   {
-    std::shared_ptr<opentelemetry::logs::LoggerProvider> api_logger_provider = logger_provider;
+    std::shared_ptr<opentelemetry::logs::LoggerProvider> api_logger_provider = logger_provider_;
     opentelemetry::logs::Provider::SetLoggerProvider(api_logger_provider);
   }
 }
 
-void ConfiguredSdk::UnInstall()
+void ConfiguredSdk::Cleanup()
 {
-  if (propagator)
+  if (propagator_)
   {
     std::shared_ptr<opentelemetry::context::propagation::TextMapPropagator> none;
     opentelemetry::context::propagation::GlobalTextMapPropagator::SetGlobalPropagator(none);
   }
 
-  if (tracer_provider)
+  if (tracer_provider_)
   {
     std::shared_ptr<opentelemetry::trace::TracerProvider> none;
     opentelemetry::trace::Provider::SetTracerProvider(none);
   }
 
-  if (meter_provider)
+  if (meter_provider_)
   {
     std::shared_ptr<opentelemetry::metrics::MeterProvider> none;
     opentelemetry::metrics::Provider::SetMeterProvider(none);
   }
 
-  if (logger_provider)
+  if (logger_provider_)
   {
     std::shared_ptr<opentelemetry::logs::LoggerProvider> none;
     opentelemetry::logs::Provider::SetLoggerProvider(none);