Merge pull request #68 from open-telemetry/main

[EXAMPLE] Clean the tracer initialization in OStream example (open-telemetry#3051)

Author: malkia

examples/logs_simple/main.cc

@@ -40,18 +40,18 @@ void InitTracer()
   auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
   auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
+  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
+      trace_sdk::TracerProviderFactory::Create(std::move(processor));
 
   // Set the global trace provider
-  const std::shared_ptr<trace_api::TracerProvider> &api_provider = provider;
+  const std::shared_ptr<trace_api::TracerProvider> &api_provider = sdk_provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
 void CleanupTracer()
 {
-  std::shared_ptr<trace_api::TracerProvider> none;
-  trace_api::Provider::SetTracerProvider(none);
+  std::shared_ptr<trace_api::TracerProvider> noop;
+  trace_api::Provider::SetTracerProvider(noop);
 }
 
 void InitLogger()
@@ -61,18 +61,18 @@ void InitLogger()
       std::unique_ptr<logs_sdk::LogRecordExporter>(new logs_exporter::OStreamLogRecordExporter);
   auto processor = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
-      opentelemetry::sdk::logs::LoggerProviderFactory::Create(std::move(processor)));
+  std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> sdk_provider(
+      logs_sdk::LoggerProviderFactory::Create(std::move(processor)));
 
   // Set the global logger provider
-  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = provider;
+  const std::shared_ptr<logs_api::LoggerProvider> &api_provider = sdk_provider;
   logs_api::Provider::SetLoggerProvider(api_provider);
 }
 
 void CleanupLogger()
 {
-  std::shared_ptr<logs_api::LoggerProvider> none;
-  logs_api::Provider::SetLoggerProvider(none);
+  std::shared_ptr<logs_api::LoggerProvider> noop;
+  logs_api::Provider::SetLoggerProvider(noop);
 }
 
 }  // namespace

examples/simple/main.cc

@@ -28,18 +28,18 @@ void InitTracer()
   auto exporter  = trace_exporter::OStreamSpanExporterFactory::Create();
   auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
 
-  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
-      opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
+  std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
+      trace_sdk::TracerProviderFactory::Create(std::move(processor));
 
   // Set the global trace provider
-  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = provider;
+  const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = sdk_provider;
   trace_api::Provider::SetTracerProvider(api_provider);
 }
 
 void CleanupTracer()
 {
-  std::shared_ptr<opentelemetry::trace::TracerProvider> none;
-  trace_api::Provider::SetTracerProvider(none);
+  std::shared_ptr<opentelemetry::trace::TracerProvider> noop;
+  trace_api::Provider::SetTracerProvider(noop);
 }
 }  // namespace