clang-format

dgoffredo · dgoffredo · commit f55f08fa9039 · 2022-12-06T08:18:00.000-05:00
diff --git a/src/datadog/collector.h b/src/datadog/collector.h
@@ -11,11 +11,11 @@
 // `response_handler` parameter to `Collector::send`.
 
 #include <memory>
-#include "optional.h"
 #include <vector>
 
 #include "expected.h"
 #include "json_fwd.hpp"
+#include "optional.h"
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/dict_reader.h b/src/datadog/dict_reader.h
@@ -5,8 +5,8 @@
 // context from externalized formats: HTTP headers, gRPC metadata, etc.
 
 #include <functional>
-#include "optional.h"
 
+#include "optional.h"
 #include "string_view.h"
 
 namespace datadog {
diff --git a/src/datadog/environment.h b/src/datadog/environment.h
@@ -14,9 +14,8 @@
 //
 // `lookup` retrieves the value of `Variable` in the environment.
 
-#include "optional.h"
-
 #include "json_fwd.hpp"
+#include "optional.h"
 #include "string_view.h"
 
 namespace datadog {
diff --git a/src/datadog/expected.h b/src/datadog/expected.h
@@ -37,10 +37,10 @@
 // error then it cannot be "dereferenced" with `operator*`, i.e. it is analogous
 // to `Optional<Error>` (and is implemented as such).
 
-#include "optional.h"
 #include <variant>
 
 #include "error.h"
+#include "optional.h"
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/http_client.h b/src/datadog/http_client.h
@@ -10,11 +10,11 @@
 
 #include <chrono>
 #include <functional>
-#include "optional.h"
 
 #include "error.h"
 #include "expected.h"
 #include "json_fwd.hpp"
+#include "optional.h"
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/net_util.h b/src/datadog/net_util.h
@@ -2,9 +2,10 @@
 
 // This component provides networking-related miscellanea.
 
-#include "optional.h"
 #include <string>
 
+#include "optional.h"
+
 namespace datadog {
 namespace tracing {
 
diff --git a/src/datadog/sampling_decision.h b/src/datadog/sampling_decision.h
@@ -5,7 +5,6 @@
 // contains supporting information about the reason for the decision.
 
 #include "optional.h"
-
 #include "rate.h"
 #include "sampling_mechanism.h"
 
diff --git a/src/datadog/span.cpp b/src/datadog/span.cpp
@@ -1,10 +1,10 @@
 #include "span.h"
 
 #include <cassert>
-#include "optional.h"
 #include <string>
 
 #include "dict_writer.h"
+#include "optional.h"
 #include "span_config.h"
 #include "span_data.h"
 #include "string_view.h"
diff --git a/src/datadog/span.h b/src/datadog/span.h
@@ -43,11 +43,11 @@
 #include <chrono>
 #include <functional>
 #include <memory>
-#include "optional.h"
 
 #include "clock.h"
 #include "error.h"
 #include "id_generator.h"
+#include "optional.h"
 #include "string_view.h"
 
 namespace datadog {
diff --git a/src/datadog/span_config.h b/src/datadog/span_config.h
@@ -13,12 +13,12 @@
 // when no corresponding property is specified in a `SpanConfig` argument.
 // See `SpanData::apply_config`.
 
-#include "optional.h"
 #include <string>
 #include <unordered_map>
 #include <variant>
 
 #include "clock.h"
+#include "optional.h"
 
 namespace datadog {
 namespace tracing {
diff --git a/src/datadog/span_data.h b/src/datadog/span_data.h
@@ -5,12 +5,12 @@
 
 #include <cstddef>
 #include <memory>
-#include "optional.h"
 #include <string>
 #include <unordered_map>
 
 #include "clock.h"
 #include "expected.h"
+#include "optional.h"
 #include "string_view.h"
 
 namespace datadog {
diff --git a/src/datadog/span_matcher.cpp b/src/datadog/span_matcher.cpp
@@ -1,11 +1,11 @@
 #include "span_matcher.h"
 
 #include <algorithm>
-#include "optional.h"
 
 #include "error.h"
 #include "glob.h"
 #include "json.hpp"
+#include "optional.h"
 #include "span_data.h"
 
 namespace datadog {
diff --git a/src/datadog/span_sampler_config.h b/src/datadog/span_sampler_config.h
@@ -7,11 +7,11 @@
 // `SpanSamplerConfig` is specified as the `span_sampler` property of
 // `TracerConfig`.
 
-#include "optional.h"
 #include <vector>
 
 #include "expected.h"
 #include "json_fwd.hpp"
+#include "optional.h"
 #include "rate.h"
 #include "span_matcher.h"
 
diff --git a/src/datadog/trace_sampler.h b/src/datadog/trace_sampler.h
@@ -84,13 +84,13 @@
 // `DD_TRACE_RATE_LIMIT` environment variable.
 
 #include <mutex>
-#include "optional.h"
 #include <string>
 #include <unordered_map>
 
 #include "clock.h"
 #include "json_fwd.hpp"
 #include "limiter.h"
+#include "optional.h"
 #include "rate.h"
 #include "trace_sampler_config.h"
 
diff --git a/src/datadog/trace_sampler_config.h b/src/datadog/trace_sampler_config.h
@@ -7,11 +7,11 @@
 // `TraceSamplerConfig` is specified as the `trace_sampler` property of
 // `TracerConfig`.
 
-#include "optional.h"
 #include <vector>
 
 #include "expected.h"
 #include "json_fwd.hpp"
+#include "optional.h"
 #include "rate.h"
 #include "span_matcher.h"
 
diff --git a/src/datadog/trace_segment.cpp b/src/datadog/trace_segment.cpp
@@ -3,7 +3,6 @@
 #include <cassert>
 #include <charconv>
 #include <limits>
-#include "optional.h"
 #include <string>
 #include <system_error>
 #include <unordered_map>
@@ -14,6 +13,7 @@
 #include "dict_writer.h"
 #include "error.h"
 #include "logger.h"
+#include "optional.h"
 #include "span_data.h"
 #include "span_sampler.h"
 #include "tag_propagation.h"
@@ -46,8 +46,8 @@ TraceSegment::TraceSegment(
     const std::shared_ptr<SpanSampler>& span_sampler,
     const std::shared_ptr<const SpanDefaults>& defaults,
     const PropagationStyles& injection_styles,
-    const Optional<std::string>& hostname,
-    Optional<std::string> origin, std::size_t tags_header_max_size,
+    const Optional<std::string>& hostname, Optional<std::string> origin,
+    std::size_t tags_header_max_size,
     std::unordered_map<std::string, std::string> trace_tags,
     Optional<SamplingDecision> sampling_decision,
     std::unique_ptr<SpanData> local_root)
@@ -78,9 +78,7 @@ const Optional<std::string>& TraceSegment::hostname() const {
   return hostname_;
 }
 
-const Optional<std::string>& TraceSegment::origin() const {
-  return origin_;
-}
+const Optional<std::string>& TraceSegment::origin() const { return origin_; }
 
 Optional<SamplingDecision> TraceSegment::sampling_decision() const {
   // `sampling_decision_` can change, so we need a lock.
diff --git a/src/datadog/trace_segment.h b/src/datadog/trace_segment.h
@@ -29,11 +29,11 @@
 #include <cstddef>
 #include <memory>
 #include <mutex>
-#include "optional.h"
 #include <unordered_map>
 #include <vector>
 
 #include "expected.h"
+#include "optional.h"
 #include "propagation_styles.h"
 #include "sampling_decision.h"
 
@@ -77,8 +77,7 @@ class TraceSegment {
                const std::shared_ptr<const SpanDefaults>& defaults,
                const PropagationStyles& injection_styles,
                const Optional<std::string>& hostname,
-               Optional<std::string> origin,
-               std::size_t tags_header_max_size,
+               Optional<std::string> origin, std::size_t tags_header_max_size,
                std::unordered_map<std::string, std::string> trace_tags,
                Optional<SamplingDecision> sampling_decision,
                std::unique_ptr<SpanData> local_root);
diff --git a/src/datadog/tracer.cpp b/src/datadog/tracer.cpp
@@ -38,8 +38,7 @@ class ExtractionPolicy {
 
 class DatadogExtractionPolicy : public ExtractionPolicy {
   Expected<Optional<std::uint64_t>> id(const DictReader& headers,
-                                            StringView header,
-                                            StringView kind) {
+                                       StringView header, StringView kind) {
     auto found = headers.lookup(header);
     if (!found) {
       return std::nullopt;
@@ -109,8 +108,7 @@ class DatadogExtractionPolicy : public ExtractionPolicy {
 
 class B3ExtractionPolicy : public DatadogExtractionPolicy {
   Expected<Optional<std::uint64_t>> id(const DictReader& headers,
-                                            StringView header,
-                                            StringView kind) {
+                                       StringView header, StringView kind) {
     auto found = headers.lookup(header);
     if (!found) {
       return std::nullopt;
diff --git a/src/datadog/tracer.h b/src/datadog/tracer.h
@@ -10,12 +10,11 @@
 // obtained from a `TracerConfig` via the `finalize_config` function.  See
 // `tracer_config.h`.
 
-#include "optional.h"
-
 #include "clock.h"
 #include "error.h"
 #include "expected.h"
 #include "id_generator.h"
+#include "optional.h"
 #include "span.h"
 #include "tracer_config.h"
 
