Included formatting changes from tools/format.sh

bazel/extra_deps.bzl

@@ -3,8 +3,8 @@
 
 # Load prometheus C++ dependencies.
 
-load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
 load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+load("@com_github_jupp0r_prometheus_cpp//bazel:repositories.bzl", "prometheus_cpp_repositories")
 load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies")
 
 def opentelemetry_extra_deps():

examples/grpc/BUILD

@@ -1,10 +1,10 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-package(default_visibility = ["//visibility:public"])
-
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@com_github_grpc_grpc//bazel:cc_grpc_library.bzl", "cc_grpc_library")
+load("@rules_proto//proto:defs.bzl", "proto_library")
+
+package(default_visibility = ["//visibility:public"])
 
 proto_library(
     name = "messages_proto",

exporters/otlp/BUILD

@@ -1,10 +1,10 @@
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 
-package(default_visibility = ["//visibility:public"])
-
 load("//bazel:otel_cc_benchmark.bzl", "otel_cc_benchmark")
 
+package(default_visibility = ["//visibility:public"])
+
 cc_library(
     name = "otlp_recordable",
     srcs = [

sdk/include/opentelemetry/sdk/common/attributemap_hash.h

@@ -29,7 +29,7 @@ inline void GetHash(size_t &seed, const T &arg)
 template <class T>
 inline void GetHash(size_t &seed, const std::vector<T> &arg)
 {
-  for (const auto& v : arg)
+  for (const auto &v : arg)
   {
     GetHash<T>(seed, v);
   }

sdk/include/opentelemetry/sdk/common/global_log_handler.h

@@ -147,7 +147,7 @@ OPENTELEMETRY_END_NAMESPACE
   {                                                                                       \
     using opentelemetry::sdk::common::internal_log::GlobalLogHandler;                     \
     using opentelemetry::sdk::common::internal_log::LogHandler;                           \
-    if ((level) > GlobalLogHandler::GetLogLevel())                                          \
+    if ((level) > GlobalLogHandler::GetLogLevel())                                        \
     {                                                                                     \
       break;                                                                              \
     }                                                                                     \

sdk/include/opentelemetry/sdk/logs/logger_context.h

@@ -34,7 +34,7 @@ class LoggerContext
 {
 public:
   explicit LoggerContext(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                         const opentelemetry::sdk::resource::Resource& resource =
+                         const opentelemetry::sdk::resource::Resource &resource =
                              opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**

sdk/include/opentelemetry/sdk/logs/logger_provider.h

@@ -42,11 +42,11 @@ class OPENTELEMETRY_EXPORT LoggerProvider final : public opentelemetry::logs::Lo
    * not be a nullptr
    */
   explicit LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
-                          const opentelemetry::sdk::resource::Resource& resource =
+                          const opentelemetry::sdk::resource::Resource &resource =
                               opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   explicit LoggerProvider(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                          const opentelemetry::sdk::resource::Resource& resource =
+                          const opentelemetry::sdk::resource::Resource &resource =
                               opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**

sdk/include/opentelemetry/sdk/metrics/aggregation/default_aggregation.h

@@ -62,7 +62,7 @@ class DefaultAggregation
 
   static std::unique_ptr<Aggregation> CreateAggregation(
       AggregationType aggregation_type,
-      const InstrumentDescriptor& instrument_descriptor,
+      const InstrumentDescriptor &instrument_descriptor,
       const AggregationConfig *aggregation_config = nullptr)
   {
     switch (aggregation_type)
@@ -113,9 +113,10 @@ class DefaultAggregation
     }
   }
 
-  static std::unique_ptr<Aggregation> CloneAggregation(AggregationType aggregation_type,
-                                                       const InstrumentDescriptor& instrument_descriptor,
-                                                       const Aggregation &to_copy)
+  static std::unique_ptr<Aggregation> CloneAggregation(
+      AggregationType aggregation_type,
+      const InstrumentDescriptor &instrument_descriptor,
+      const Aggregation &to_copy)
   {
     const PointType point_data = to_copy.ToPoint();
     bool is_monotonic          = true;

sdk/include/opentelemetry/sdk/metrics/data/exemplar_data.h

@@ -69,7 +69,7 @@ class ExemplarData
   static PointType CreateDropPointData() { return DropPointData{}; }
 
 private:
-  ExemplarData(const std::shared_ptr<opentelemetry::trace::SpanContext>& context,
+  ExemplarData(const std::shared_ptr<opentelemetry::trace::SpanContext> &context,
                opentelemetry::common::SystemTimestamp timestamp,
                const PointDataAttributes &point_data_attr)
       : context_(*context.get()), timestamp_(timestamp), point_data_attr_(point_data_attr)

sdk/include/opentelemetry/sdk/metrics/meter_context.h

@@ -54,7 +54,7 @@ class MeterContext : public std::enable_shared_from_this<MeterContext>
    */
   MeterContext(
       std::unique_ptr<ViewRegistry> views = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      const opentelemetry::sdk::resource::Resource& resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({})) noexcept;
 
   /**
@@ -131,7 +131,7 @@ class MeterContext : public std::enable_shared_from_this<MeterContext>
    *
    * @param meter
    */
-  void AddMeter(const std::shared_ptr<Meter>& meter);
+  void AddMeter(const std::shared_ptr<Meter> &meter);
 
   void RemoveMeter(nostd::string_view name,
                    nostd::string_view version,

sdk/include/opentelemetry/sdk/metrics/meter_provider.h

@@ -39,8 +39,8 @@ class OPENTELEMETRY_EXPORT MeterProvider final : public opentelemetry::metrics::
    * @param resource  The resources for this meter provider.
    */
   MeterProvider(
-      std::unique_ptr<ViewRegistry> views = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
-      const sdk::resource::Resource& resource    = sdk::resource::Resource::Create({})) noexcept;
+      std::unique_ptr<ViewRegistry> views     = std::unique_ptr<ViewRegistry>(new ViewRegistry()),
+      const sdk::resource::Resource &resource = sdk::resource::Resource::Create({})) noexcept;
 
   /**
    * Initialize a new meter provider with a specified context

sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h

@@ -33,7 +33,7 @@ namespace metrics
 class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStorage
 {
 public:
-  AsyncMetricStorage(const InstrumentDescriptor& instrument_descriptor,
+  AsyncMetricStorage(const InstrumentDescriptor &instrument_descriptor,
                      const AggregationType aggregation_type,
 #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW
                      ExemplarFilterType exempler_filter_type,

sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h

@@ -66,10 +66,11 @@ class AttributesHashMap
    * If not present, it uses the provided callback to generate
    * value and store in the hash
    */
-  Aggregation *GetOrSetDefault(const opentelemetry::common::KeyValueIterable &attributes,
-                               const AttributesProcessor *attributes_processor,
-                               const std::function<std::unique_ptr<Aggregation>()>& aggregation_callback,
-                               size_t hash)
+  Aggregation *GetOrSetDefault(
+      const opentelemetry::common::KeyValueIterable &attributes,
+      const AttributesProcessor *attributes_processor,
+      const std::function<std::unique_ptr<Aggregation>()> &aggregation_callback,
+      size_t hash)
   {
     auto it = hash_map_.find(hash);
     if (it != hash_map_.end())
@@ -88,8 +89,9 @@ class AttributesHashMap
     return hash_map_[hash].second.get();
   }
 
-  Aggregation *GetOrSetDefault(const std::function<std::unique_ptr<Aggregation>()>& aggregation_callback,
-                               size_t hash)
+  Aggregation *GetOrSetDefault(
+      const std::function<std::unique_ptr<Aggregation>()> &aggregation_callback,
+      size_t hash)
   {
     auto it = hash_map_.find(hash);
     if (it != hash_map_.end())
@@ -107,9 +109,10 @@ class AttributesHashMap
     return hash_map_[hash].second.get();
   }
 
-  Aggregation *GetOrSetDefault(const MetricAttributes &attributes,
-                               const std::function<std::unique_ptr<Aggregation>()>& aggregation_callback,
-                               size_t hash)
+  Aggregation *GetOrSetDefault(
+      const MetricAttributes &attributes,
+      const std::function<std::unique_ptr<Aggregation>()> &aggregation_callback,
+      size_t hash)
   {
     auto it = hash_map_.find(hash);
     if (it != hash_map_.end())
@@ -199,7 +202,7 @@ class AttributesHashMap
   size_t attributes_limit_;
 
   Aggregation *GetOrSetOveflowAttributes(
-      const std::function<std::unique_ptr<Aggregation>()>& aggregation_callback)
+      const std::function<std::unique_ptr<Aggregation>()> &aggregation_callback)
   {
     auto agg = aggregation_callback();
     return GetOrSetOveflowAttributes(std::move(agg));

sdk/include/opentelemetry/sdk/metrics/state/multi_metric_storage.h

@@ -31,7 +31,7 @@ namespace metrics
 class SyncMultiMetricStorage : public SyncWritableMetricStorage
 {
 public:
-  void AddStorage(const std::shared_ptr<SyncWritableMetricStorage>& storage)
+  void AddStorage(const std::shared_ptr<SyncWritableMetricStorage> &storage)
   {
     storages_.push_back(storage);
   }
@@ -81,7 +81,7 @@ class SyncMultiMetricStorage : public SyncWritableMetricStorage
 class AsyncMultiMetricStorage : public AsyncWritableMetricStorage
 {
 public:
-  void AddStorage(const std::shared_ptr<AsyncWritableMetricStorage>& storage)
+  void AddStorage(const std::shared_ptr<AsyncWritableMetricStorage> &storage)
   {
     storages_.push_back(storage);
   }

sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h

@@ -56,7 +56,7 @@ class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage
 #endif  // ENABLE_METRICS_EXEMPLAR_PREVIEW
 
 public:
-  SyncMetricStorage(const InstrumentDescriptor& instrument_descriptor,
+  SyncMetricStorage(const InstrumentDescriptor &instrument_descriptor,
                     const AggregationType aggregation_type,
                     const AttributesProcessor *attributes_processor,
 #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

sdk/include/opentelemetry/sdk/metrics/state/temporal_metric_storage.h

@@ -40,7 +40,7 @@ class TemporalMetricStorage
                     nostd::span<std::shared_ptr<CollectorHandle>> collectors,
                     opentelemetry::common::SystemTimestamp sdk_start_ts,
                     opentelemetry::common::SystemTimestamp collection_ts,
-                    const std::shared_ptr<AttributesHashMap>& delta_metrics,
+                    const std::shared_ptr<AttributesHashMap> &delta_metrics,
                     nostd::function_ref<bool(MetricData)> callback) noexcept;
 
 private:

sdk/include/opentelemetry/sdk/metrics/sync_instruments.h

@@ -37,7 +37,7 @@ class Synchronous
 class LongCounter : public Synchronous, public opentelemetry::metrics::Counter<uint64_t>
 {
 public:
-  LongCounter(const InstrumentDescriptor& instrument_descriptor,
+  LongCounter(const InstrumentDescriptor &instrument_descriptor,
               std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(uint64_t value,
@@ -56,7 +56,7 @@ class DoubleCounter : public Synchronous, public opentelemetry::metrics::Counter
 {
 
 public:
-  DoubleCounter(const InstrumentDescriptor& instrument_descriptor,
+  DoubleCounter(const InstrumentDescriptor &instrument_descriptor,
                 std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(double value,
@@ -72,7 +72,7 @@ class DoubleCounter : public Synchronous, public opentelemetry::metrics::Counter
 class LongUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<int64_t>
 {
 public:
-  LongUpDownCounter(const InstrumentDescriptor& instrument_descriptor,
+  LongUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                     std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(int64_t value,
@@ -88,7 +88,7 @@ class LongUpDownCounter : public Synchronous, public opentelemetry::metrics::UpD
 class DoubleUpDownCounter : public Synchronous, public opentelemetry::metrics::UpDownCounter<double>
 {
 public:
-  DoubleUpDownCounter(const InstrumentDescriptor& instrument_descriptor,
+  DoubleUpDownCounter(const InstrumentDescriptor &instrument_descriptor,
                       std::unique_ptr<SyncWritableMetricStorage> storage);
 
   void Add(double value,
@@ -104,7 +104,7 @@ class DoubleUpDownCounter : public Synchronous, public opentelemetry::metrics::U
 class LongHistogram : public Synchronous, public opentelemetry::metrics::Histogram<uint64_t>
 {
 public:
-  LongHistogram(const InstrumentDescriptor& instrument_descriptor,
+  LongHistogram(const InstrumentDescriptor &instrument_descriptor,
                 std::unique_ptr<SyncWritableMetricStorage> storage);
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2
@@ -124,7 +124,7 @@ class LongHistogram : public Synchronous, public opentelemetry::metrics::Histogr
 class DoubleHistogram : public Synchronous, public opentelemetry::metrics::Histogram<double>
 {
 public:
-  DoubleHistogram(const InstrumentDescriptor& instrument_descriptor,
+  DoubleHistogram(const InstrumentDescriptor &instrument_descriptor,
                   std::unique_ptr<SyncWritableMetricStorage> storage);
 
 #if OPENTELEMETRY_ABI_VERSION_NO >= 2

sdk/include/opentelemetry/sdk/metrics/view/attributes_processor.h

@@ -64,7 +64,7 @@ class FilteringAttributesProcessor : public AttributesProcessor
 {
 public:
   FilteringAttributesProcessor(
-      const std::unordered_map<std::string, bool>& allowed_attribute_keys = {})
+      const std::unordered_map<std::string, bool> &allowed_attribute_keys = {})
       : allowed_attribute_keys_(allowed_attribute_keys)
   {}
 

sdk/include/opentelemetry/sdk/trace/recordable.h

@@ -116,7 +116,7 @@ class Recordable
    * Add a link to a span with default (empty) attributes.
    * @param span_context the span context of the linked span
    */
-  void AddLink(const opentelemetry::trace::SpanContext& span_context)
+  void AddLink(const opentelemetry::trace::SpanContext &span_context)
   {
     AddLink(span_context, opentelemetry::sdk::GetEmptyAttributes());
   }

sdk/include/opentelemetry/sdk/trace/samplers/parent.h

@@ -27,7 +27,7 @@ namespace trace
 class ParentBasedSampler : public Sampler
 {
 public:
-  explicit ParentBasedSampler(const std::shared_ptr<Sampler>& delegate_sampler) noexcept;
+  explicit ParentBasedSampler(const std::shared_ptr<Sampler> &delegate_sampler) noexcept;
   /** The decision either respects the parent span's sampling decision or delegates to
    * delegateSampler for root spans
    * @return Returns DROP always

sdk/include/opentelemetry/sdk/trace/span_data.h

@@ -74,7 +74,7 @@ class SpanDataEvent
 class SpanDataLink
 {
 public:
-  SpanDataLink(const opentelemetry::trace::SpanContext& span_context,
+  SpanDataLink(const opentelemetry::trace::SpanContext &span_context,
                const opentelemetry::common::KeyValueIterable &attributes)
       : span_context_(span_context), attribute_map_(attributes)
   {}

sdk/include/opentelemetry/sdk/trace/tracer_context.h

@@ -39,7 +39,7 @@ class TracerContext
 public:
   explicit TracerContext(
       std::vector<std::unique_ptr<SpanProcessor>> &&processor,
-      const opentelemetry::sdk::resource::Resource& resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =

sdk/include/opentelemetry/sdk/trace/tracer_provider.h

@@ -43,15 +43,15 @@ class OPENTELEMETRY_EXPORT TracerProvider final : public opentelemetry::trace::T
    */
   explicit TracerProvider(
       std::unique_ptr<SpanProcessor> processor,
-      const opentelemetry::sdk::resource::Resource& resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =
           std::unique_ptr<IdGenerator>(new RandomIdGenerator())) noexcept;
 
   explicit TracerProvider(
       std::vector<std::unique_ptr<SpanProcessor>> &&processors,
-      const opentelemetry::sdk::resource::Resource& resource =
+      const opentelemetry::sdk::resource::Resource &resource =
           opentelemetry::sdk::resource::Resource::Create({}),
       std::unique_ptr<Sampler> sampler = std::unique_ptr<AlwaysOnSampler>(new AlwaysOnSampler),
       std::unique_ptr<IdGenerator> id_generator =

sdk/src/logs/logger_context.cc

@@ -19,7 +19,7 @@ namespace logs
 {
 
 LoggerContext::LoggerContext(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                             const opentelemetry::sdk::resource::Resource& resource) noexcept
+                             const opentelemetry::sdk::resource::Resource &resource) noexcept
     : resource_(resource),
       processor_(
           std::unique_ptr<LogRecordProcessor>(new MultiLogRecordProcessor(std::move(processors))))

sdk/src/logs/logger_provider.cc

@@ -29,7 +29,7 @@ namespace logs
 {
 
 LoggerProvider::LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
-                               const opentelemetry::sdk::resource::Resource& resource) noexcept
+                               const opentelemetry::sdk::resource::Resource &resource) noexcept
 {
   std::vector<std::unique_ptr<LogRecordProcessor>> processors;
   processors.emplace_back(std::move(processor));
@@ -38,7 +38,7 @@ LoggerProvider::LoggerProvider(std::unique_ptr<LogRecordProcessor> &&processor,
 }
 
 LoggerProvider::LoggerProvider(std::vector<std::unique_ptr<LogRecordProcessor>> &&processors,
-                               const opentelemetry::sdk::resource::Resource& resource) noexcept
+                               const opentelemetry::sdk::resource::Resource &resource) noexcept
     : context_{std::make_shared<LoggerContext>(std::move(processors), std::move(resource))}
 {}
 

sdk/src/metrics/aggregation/lastvalue_aggregation.cc

@@ -28,9 +28,7 @@ LongLastValueAggregation::LongLastValueAggregation()
   point_data_.value_              = static_cast<int64_t>(0);
 }
 
-LongLastValueAggregation::LongLastValueAggregation(LastValuePointData &&data)
-    : point_data_{data}
-{}
+LongLastValueAggregation::LongLastValueAggregation(LastValuePointData &&data) : point_data_{data} {}
 
 LongLastValueAggregation::LongLastValueAggregation(const LastValuePointData &data)
     : point_data_{data}

sdk/src/metrics/meter.cc

@@ -456,7 +456,7 @@ std::vector<MetricData> Meter::Collect(CollectorHandle *collector,
   for (auto &metric_storage : storage_registry_)
   {
     metric_storage.second->Collect(collector, ctx->GetCollectors(), ctx->GetSDKStartTime(),
-                                   collect_ts, [&metric_data_list](const MetricData& metric_data) {
+                                   collect_ts, [&metric_data_list](const MetricData &metric_data) {
                                      metric_data_list.push_back(metric_data);
                                      return true;
                                    });