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

Fixed bazel build, clang-format.
marcalff · Jun 30, 2022 · 777a4fc · 777a4fc
1 parent af9a5f2
commit 777a4fc
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 15 deletions.
diff --git a/exporters/ostream/BUILD b/exporters/ostream/BUILD
@@ -93,10 +93,12 @@ cc_library(
     name = "ostream_span_exporter",
     srcs = [
         "src/span_exporter.cc",
+        "src/span_exporter_factory.cc",
     ],
     hdrs = [
         "include/opentelemetry/exporters/ostream/common_utils.h",
         "include/opentelemetry/exporters/ostream/span_exporter.h",
+        "include/opentelemetry/exporters/ostream/span_exporter_factory.h",
     ],
     strip_include_prefix = "include",
     tags = ["ostream"],

diff --git a/exporters/otlp/BUILD b/exporters/otlp/BUILD
@@ -47,11 +47,13 @@ cc_library(
     name = "otlp_grpc_exporter",
     srcs = [
         "src/otlp_grpc_exporter.cc",
+        "src/otlp_grpc_exporter_factory.cc",
     ],
     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/protobuf_include_prefix.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
     ],
@@ -111,10 +113,13 @@ cc_library(
     name = "otlp_http_exporter",
     srcs = [
         "src/otlp_http_exporter.cc",
+        "src/otlp_http_exporter_factory.cc",
     ],
     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/protobuf_include_prefix.h",
         "include/opentelemetry/exporters/otlp/protobuf_include_suffix.h",
     ],

diff --git a/exporters/zipkin/BUILD b/exporters/zipkin/BUILD
@@ -21,9 +21,12 @@ cc_library(
     name = "zipkin_exporter",
     srcs = [
         "src/zipkin_exporter.cc",
+        "src/zipkin_exporter_factory.cc",
     ],
     hdrs = [
         "include/opentelemetry/exporters/zipkin/zipkin_exporter.h",
+        "include/opentelemetry/exporters/zipkin/zipkin_exporter_options.h",
+        "include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h",
     ],
     copts = [
         "-DCURL_STATICLIB",

diff --git a/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h b/exporters/zipkin/include/opentelemetry/exporters/zipkin/zipkin_exporter_factory.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 #include "opentelemetry/nostd/unique_ptr.h"
 #include "opentelemetry/sdk/trace/exporter.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter
@@ -24,7 +24,8 @@ class ZipkinExporterFactory
   /**
    * Create a ZipkinExporter using the given options.
    */
-  static nostd::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(const ZipkinExporterOptions &options);
+  static nostd::unique_ptr<opentelemetry::sdk::trace::SpanExporter> Build(
+      const ZipkinExporterOptions &options);
 };
 
 }  // namespace zipkin

diff --git a/exporters/zipkin/src/zipkin_exporter_factory.cc b/exporters/zipkin/src/zipkin_exporter_factory.cc
@@ -1,9 +1,9 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
 #include "opentelemetry/exporters/zipkin/zipkin_exporter.h"
 #include "opentelemetry/exporters/zipkin/zipkin_exporter_options.h"
-#include "opentelemetry/exporters/zipkin/zipkin_exporter_factory.h"
 
 namespace http_client = opentelemetry::ext::http::client;
 

diff --git a/sdk/include/opentelemetry/sdk/trace/batch_span_processor_factory.h b/sdk/include/opentelemetry/sdk/trace/batch_span_processor_factory.h
@@ -3,9 +3,9 @@
 
 #pragma once
 
-#include "opentelemetry/sdk/trace/processor.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/version/version.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
@@ -17,9 +17,8 @@ namespace trace
 class BatchSpanProcessorFactory
 {
 public:
-  static nostd::unique_ptr<SpanProcessor> Build(
-      nostd::unique_ptr<SpanExporter> &&exporter,
-      const BatchSpanProcessorOptions &options);
+  static nostd::unique_ptr<SpanProcessor> Build(nostd::unique_ptr<SpanExporter> &&exporter,
+                                                const BatchSpanProcessorOptions &options);
 };
 
 }  // namespace trace

diff --git a/sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h b/sdk/include/opentelemetry/sdk/trace/tracer_provider_factory.h
@@ -5,9 +5,8 @@
 
 #include "opentelemetry/nostd/shared_ptr.h"
 #include "opentelemetry/sdk/trace/processor.h"
-#include "opentelemetry/trace/tracer_provider.h"
 #include "opentelemetry/sdk/trace/tracer_context.h"
-
+#include "opentelemetry/trace/tracer_provider.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk

diff --git a/sdk/src/trace/samplers/always_off_factory.cc b/sdk/src/trace/samplers/always_off_factory.cc
@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/samplers/always_off.h"
 #include "opentelemetry/sdk/trace/samplers/always_off_factory.h"
+#include "opentelemetry/sdk/trace/samplers/always_off.h"
 
 namespace trace_api = opentelemetry::trace;
 

diff --git a/sdk/src/trace/samplers/always_on_factory.cc b/sdk/src/trace/samplers/always_on_factory.cc
@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/samplers/always_on.h"
 #include "opentelemetry/sdk/trace/samplers/always_on_factory.h"
+#include "opentelemetry/sdk/trace/samplers/always_on.h"
 
 namespace trace_api = opentelemetry::trace;
 

diff --git a/sdk/src/trace/samplers/parent_factory.cc b/sdk/src/trace/samplers/parent_factory.cc
@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/samplers/parent.h"
 #include "opentelemetry/sdk/trace/samplers/parent_factory.h"
+#include "opentelemetry/sdk/trace/samplers/parent.h"
 
 namespace trace_api = opentelemetry::trace;
 

diff --git a/sdk/src/trace/simple_processor_factory.cc b/sdk/src/trace/simple_processor_factory.cc
@@ -1,8 +1,8 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
-#include "opentelemetry/sdk/trace/simple_processor.h"
 #include "opentelemetry/sdk/trace/simple_processor_factory.h"
+#include "opentelemetry/sdk/trace/simple_processor.h"
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace sdk

diff --git a/sdk/src/trace/tracer_provider_factory.cc b/sdk/src/trace/tracer_provider_factory.cc
@@ -32,8 +32,7 @@ nostd::shared_ptr<trace_api::TracerProvider> TracerProviderFactory::Build(
 nostd::shared_ptr<trace_api::TracerProvider> TracerProviderFactory::Build(
     std::shared_ptr<sdk::trace::TracerContext> context)
 {
-  nostd::shared_ptr<trace_api::TracerProvider> provider(
-      new trace_sdk::TracerProvider(context));
+  nostd::shared_ptr<trace_api::TracerProvider> provider(new trace_sdk::TracerProvider(context));
   return provider;
 }