Cleanup

Author: marcalff

examples/yaml/custom_sampler_builder.cc

@@ -15,7 +15,7 @@ std::unique_ptr<opentelemetry::sdk::trace::Sampler> CustomSamplerBuilder::Build(
   // Read yaml attributes
   std::string comment = model->node->GetRequiredString("comment");
 
-  std::unique_ptr<opentelemetry::sdk::trace::Sampler> sdk(new CustomSampler(comment));
+  auto sdk = std::make_unique<CustomSampler>(comment);
 
   return sdk;
 }

examples/yaml/custom_span_exporter.cc

@@ -9,8 +9,8 @@
 
 std::unique_ptr<opentelemetry::sdk::trace::Recordable> CustomSpanExporter::MakeRecordable() noexcept
 {
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(
-      new opentelemetry::sdk::trace::SpanData);
+  auto recordable = std::make_unique<opentelemetry::sdk::trace::SpanData>();
+  return recordable;
 }
 
 opentelemetry::sdk::common::ExportResult CustomSpanExporter::Export(

examples/yaml/custom_span_exporter_builder.cc

@@ -17,7 +17,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> CustomSpanExporterBuild
   // Read yaml attributes
   std::string comment = model->node->GetRequiredString("comment");
 
-  std::unique_ptr<opentelemetry::sdk::trace::SpanExporter> sdk(new CustomSpanExporter(comment));
+  auto sdk = std::make_unique<CustomSpanExporter>(comment);
 
   return sdk;
 }

examples/yaml/custom_span_processor.cc

@@ -13,8 +13,8 @@
 std::unique_ptr<opentelemetry::sdk::trace::Recordable>
 CustomSpanProcessor::MakeRecordable() noexcept
 {
-  return std::unique_ptr<opentelemetry::sdk::trace::Recordable>(
-      new opentelemetry::sdk::trace::SpanData);
+  auto recordable = std::make_unique<opentelemetry::sdk::trace::SpanData>();
+  return recordable;
 }
 
 void CustomSpanProcessor::OnStart(

examples/yaml/custom_span_processor_builder.cc

@@ -17,7 +17,7 @@ std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor> CustomSpanProcessorBui
   // Read yaml attributes
   std::string comment = model->node->GetRequiredString("comment");
 
-  std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor> sdk(new CustomSpanProcessor(comment));
+  auto sdk = std::make_unique<CustomSpanProcessor>(comment);
 
   return sdk;
 }

sdk/src/configuration/document_node.cc

@@ -3,11 +3,9 @@
 
 #include <cctype>
 #include <cstdlib>
-#include <ostream>
 #include <string>
 
 #include "opentelemetry/sdk/common/env_variables.h"
-#include "opentelemetry/sdk/common/global_log_handler.h"
 #include "opentelemetry/sdk/configuration/document_node.h"
 #include "opentelemetry/sdk/configuration/invalid_schema_exception.h"
 #include "opentelemetry/version.h"

sdk/src/init/sdk_builder.cc

@@ -1590,7 +1590,7 @@ void SdkBuilder::SetResource(
 std::unique_ptr<ConfiguredSdk> SdkBuilder::CreateConfiguredSdk(
     const std::unique_ptr<opentelemetry::sdk::configuration::Configuration> &model) const
 {
-  std::unique_ptr<ConfiguredSdk> sdk(new ConfiguredSdk);
+  auto sdk = std::make_unique<ConfiguredSdk>();
 
   if (!model->disabled)
   {