[Trace SDK] Implement builders (open-telemetry#1393)

Format cleanup.

examples/batch/main.cc

@@ -15,7 +15,6 @@
 // Using an exporter that simply dumps span data to stdout.
 #include "opentelemetry/exporters/ostream/span_exporter_factory.h"
 
-
 #include <chrono>
 #include <thread>
 

examples/grpc/tracer_common.h

@@ -5,17 +5,17 @@
 
 /* API */
 
-#include "opentelemetry/trace/provider.h"
-#include "opentelemetry/nostd/shared_ptr.h"
-#include "opentelemetry/trace/propagation/http_trace_context.h"
 #include "opentelemetry/context/propagation/global_propagator.h"
 #include "opentelemetry/context/propagation/text_map_propagator.h"
+#include "opentelemetry/nostd/shared_ptr.h"
+#include "opentelemetry/trace/propagation/http_trace_context.h"
+#include "opentelemetry/trace/provider.h"
 
 /* SDK */
 
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
-#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/sdk/trace/tracer_context.h"
+#include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 
 /* Exporter */
 
@@ -80,7 +80,8 @@ class GrpcServerCarrier : public opentelemetry::context::propagation::TextMapCar
 void initTracer()
 {
  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Build();
- auto processor = opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Build(std::move(exporter));
+ auto processor =
+ opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Build(std::move(exporter));
  std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> processors;
  processors.push_back(std::move(processor));
  // Default is an always-on sampler.

examples/http/tracer_common.h

@@ -60,7 +60,8 @@ class HttpTextMapCarrier : public opentelemetry::context::propagation::TextMapCa
 void initTracer()
 {
  auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Build();
- auto processor = opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Build(std::move(exporter));
+ auto processor =
+ opentelemetry::sdk::trace::SimpleSpanProcessorFactory::Build(std::move(exporter));
  std::vector<std::unique_ptr<opentelemetry::sdk::trace::SpanProcessor>> processors;
  processors.push_back(std::move(processor));
  // Default is an always-on sampler.

examples/jaeger/main.cc

@@ -25,7 +25,7 @@ void InitTracer()
  // Create Jaeger exporter instance
  auto exporter = std::unique_ptr<trace_sdk::SpanExporter>(new jaeger::JaegerExporter(opts));
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor));
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor));
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }

examples/multithreaded/main.cc

@@ -21,9 +21,9 @@ namespace
 {
 void initTracer()
 {
- auto exporter = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Build();
+ auto exporter  = opentelemetry::exporter::trace::OStreamSpanExporterFactory::Build();
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(
+ auto provider  = trace_sdk::TracerProviderFactory::Build(
  std::move(processor), opentelemetry::sdk::resource::Resource::Create({}));
  // Set the global trace provider
  trace_api::Provider::SetTracerProvider(provider);

examples/otlp/grpc_log_main.cc

@@ -38,7 +38,7 @@ void InitTracer()
  // Create OTLP exporter instance
  auto exporter = otlp::OtlpGrpcExporterFactory::Build(opts);
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor));
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor));
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }

examples/otlp/http_log_main.cc

@@ -35,7 +35,7 @@ void InitTracer()
  // Create OTLP exporter instance
  auto exporter = otlp::OtlpHttpExporterFactory::Build(opts);
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor));
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor));
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }

examples/otlp/http_main.cc

@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/exporters/otlp/otlp_http_exporter_factory.h"
+#include "opentelemetry/exporters/otlp/otlp_http_exporter_options.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
 #include "opentelemetry/sdk/trace/tracer_provider_factory.h"
 #include "opentelemetry/trace/provider.h"
@@ -28,7 +28,7 @@ void InitTracer()
  // Create OTLP exporter instance
  auto exporter = otlp::OtlpHttpExporterFactory::Build(opts);
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor));
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor));
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }

examples/simple/main.cc

@@ -23,17 +23,17 @@
 # include "foo_library/foo_library.h"
 #endif
 
-namespace trace_api = opentelemetry::trace;
-namespace trace_sdk = opentelemetry::sdk::trace;
+namespace trace_api  = opentelemetry::trace;
+namespace trace_sdk  = opentelemetry::sdk::trace;
 namespace trace_exporter = opentelemetry::exporter::trace;
 
 namespace
 {
 void initTracer()
 {
- auto exporter = trace_exporter::OStreamSpanExporterFactory::Build();
+ auto exporter  = trace_exporter::OStreamSpanExporterFactory::Build();
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor));
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor));
 
  // Set the global trace provider
  trace_api::Provider::SetTracerProvider(provider);

examples/zipkin/main.cc

@@ -26,9 +26,9 @@ void InitTracer()
  // Create zipkin exporter instance
  resource::ResourceAttributes attributes = {{"service.name", "zipkin_demo_service"}};
  auto resource = resource::Resource::Create(attributes);
- auto exporter = zipkin::ZipkinExporterFactory::Build(opts);
+ auto exporter  = zipkin::ZipkinExporterFactory::Build(opts);
  auto processor = trace_sdk::SimpleSpanProcessorFactory::Build(std::move(exporter));
- auto provider = trace_sdk::TracerProviderFactory::Build(std::move(processor), resource);
+ auto provider  = trace_sdk::TracerProviderFactory::Build(std::move(processor), resource);
  // Set the global trace provider
  trace::Provider::SetTracerProvider(provider);
 }

exporters/ostream/CMakeLists.txt

@@ -1,7 +1,5 @@
-add_library(
- opentelemetry_exporter_ostream_span
- src/span_exporter.cc
- src/span_exporter_factory.cc)
+add_library(opentelemetry_exporter_ostream_span src/span_exporter.cc
+ src/span_exporter_factory.cc)
 
 set_target_properties(opentelemetry_exporter_ostream_span
  PROPERTIES EXPORT_NAME ostream_span_exporter)

exporters/ostream/src/span_exporter_factory.cc

@@ -19,8 +19,8 @@ nostd::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Build()
 
 nostd::unique_ptr<trace_sdk::SpanExporter> OStreamSpanExporterFactory::Build(std::ostream &sout)
 {
- std::unique_ptr<trace_sdk::SpanExporter> exporter(new OStreamSpanExporter(sout));
- return exporter;
+ nostd::unique_ptr<trace_sdk::SpanExporter> exporter(new OStreamSpanExporter(sout));
+ return std::move(exporter);
 }
 
 } // namespace trace

exporters/otlp/BUILD

@@ -52,8 +52,8 @@ cc_library(
  hdrs = [
  "include/opentelemetry/exporters/otlp/otlp_environment.h",
  "include/opentelemetry/exporters/otlp/otlp_grpc_exporter.h",
- "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h",
  "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_factory.h",
+ "include/opentelemetry/exporters/otlp/otlp_grpc_exporter_options.h",
  "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
  "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
  ],
@@ -118,8 +118,8 @@ cc_library(
  hdrs = [
  "include/opentelemetry/exporters/otlp/otlp_environment.h",
  "include/opentelemetry/exporters/otlp/otlp_http_exporter.h",
- "include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h",
  "include/opentelemetry/exporters/otlp/otlp_http_exporter_factory.h",
+ "include/opentelemetry/exporters/otlp/otlp_http_exporter_options.h",
  "include/opentelemetry/exporters/otlp/protobuf_include_prefix.h",
  "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
  ],

exporters/otlp/CMakeLists.txt

@@ -19,8 +19,7 @@ target_link_libraries(
 if(WITH_OTLP_GRPC)
  find_package(gRPC REQUIRED)
  add_library(opentelemetry_exporter_otlp_grpc
- src/otlp_grpc_exporter.cc
- src/otlp_grpc_exporter_factory.cc)
+ src/otlp_grpc_exporter.cc src/otlp_grpc_exporter_factory.cc)
 
  set_target_properties(opentelemetry_exporter_otlp_grpc
  PROPERTIES EXPORT_NAME otlp_grpc_exporter)

exporters/zipkin/BUILD

@@ -25,8 +25,8 @@ cc_library(
  ],
  hdrs = [
  "include/opentelemetry/exporters/zipkin/zipkin_exporter.h",
- "include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h",
  "include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h",
+ "include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h",
  ],
  copts = [
  "-DCURL_STATICLIB",

exporters/zipkin/CMakeLists.txt

@@ -15,10 +15,9 @@
 include_directories(include)
 find_package(CURL REQUIRED)
 add_definitions(-DWITH_CURL)
-add_library(opentelemetry_exporter_zipkin_trace
- src/zipkin_exporter.cc
- src/zipkin_exporter_factory.cc
- src/recordable.cc)
+add_library(
+ opentelemetry_exporter_zipkin_trace
+ src/zipkin_exporter.cc src/zipkin_exporter_factory.cc src/recordable.cc)
 
 target_link_libraries(
  opentelemetry_exporter_zipkin_trace

exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter.h

@@ -3,8 +3,8 @@
 
 #pragma once
 
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 #include "opentelemetry/common/spin_lock_mutex.h"
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 #include "opentelemetry/ext/http/client/http_client_factory.h"
 #include "opentelemetry/ext/http/common/url_parser.h"
 #include "opentelemetry/sdk/common/env_variables.h"

sdk/include/opentelemetry/sdk/trace/batch_span_processor.h

@@ -4,9 +4,9 @@
 #pragma once
 
 #include "opentelemetry/sdk/common/circular_buffer.h"
+#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
 #include "opentelemetry/sdk/trace/exporter.h"
 #include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/sdk/trace/batch_span_processor_options.h"
 
 #include <atomic>
 #include <condition_variable>