Skip to content

Commit d623bc5

Browse files
authored
[EXAMPLE] Clean the tracer initialization in OStream example (#3051)
1 parent 261a151 commit d623bc5

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

examples/logs_simple/main.cc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,18 @@ void InitTracer()
4444
auto exporter = trace_exporter::OStreamSpanExporterFactory::Create();
4545
auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
4646

47-
std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
48-
opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
47+
std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
48+
trace_sdk::TracerProviderFactory::Create(std::move(processor));
4949

5050
// Set the global trace provider
51-
const std::shared_ptr<trace_api::TracerProvider> &api_provider = provider;
51+
const std::shared_ptr<trace_api::TracerProvider> &api_provider = sdk_provider;
5252
trace_api::Provider::SetTracerProvider(api_provider);
5353
}
5454

5555
void CleanupTracer()
5656
{
57-
std::shared_ptr<trace_api::TracerProvider> none;
58-
trace_api::Provider::SetTracerProvider(none);
57+
std::shared_ptr<trace_api::TracerProvider> noop;
58+
trace_api::Provider::SetTracerProvider(noop);
5959
}
6060

6161
void InitLogger()
@@ -65,18 +65,18 @@ void InitLogger()
6565
std::unique_ptr<logs_sdk::LogRecordExporter>(new logs_exporter::OStreamLogRecordExporter);
6666
auto processor = logs_sdk::SimpleLogRecordProcessorFactory::Create(std::move(exporter));
6767

68-
std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> provider(
69-
opentelemetry::sdk::logs::LoggerProviderFactory::Create(std::move(processor)));
68+
std::shared_ptr<opentelemetry::sdk::logs::LoggerProvider> sdk_provider(
69+
logs_sdk::LoggerProviderFactory::Create(std::move(processor)));
7070

7171
// Set the global logger provider
72-
const std::shared_ptr<logs_api::LoggerProvider> &api_provider = provider;
72+
const std::shared_ptr<logs_api::LoggerProvider> &api_provider = sdk_provider;
7373
logs_api::Provider::SetLoggerProvider(api_provider);
7474
}
7575

7676
void CleanupLogger()
7777
{
78-
std::shared_ptr<logs_api::LoggerProvider> none;
79-
logs_api::Provider::SetLoggerProvider(none);
78+
std::shared_ptr<logs_api::LoggerProvider> noop;
79+
logs_api::Provider::SetLoggerProvider(noop);
8080
}
8181

8282
} // namespace

examples/simple/main.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,18 @@ void InitTracer()
3131
auto exporter = trace_exporter::OStreamSpanExporterFactory::Create();
3232
auto processor = trace_sdk::SimpleSpanProcessorFactory::Create(std::move(exporter));
3333

34-
std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> provider =
35-
opentelemetry::sdk::trace::TracerProviderFactory::Create(std::move(processor));
34+
std::shared_ptr<opentelemetry::sdk::trace::TracerProvider> sdk_provider =
35+
trace_sdk::TracerProviderFactory::Create(std::move(processor));
3636

3737
// Set the global trace provider
38-
const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = provider;
38+
const std::shared_ptr<opentelemetry::trace::TracerProvider> &api_provider = sdk_provider;
3939
trace_api::Provider::SetTracerProvider(api_provider);
4040
}
4141

4242
void CleanupTracer()
4343
{
44-
std::shared_ptr<opentelemetry::trace::TracerProvider> none;
45-
trace_api::Provider::SetTracerProvider(none);
44+
std::shared_ptr<opentelemetry::trace::TracerProvider> noop;
45+
trace_api::Provider::SetTracerProvider(noop);
4646
}
4747
} // namespace
4848

0 commit comments

Comments
 (0)