diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h index 504d45feab..2768c4ed60 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h @@ -5,16 +5,16 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/common/global_log_handler.h" -#include "opentelemetry/sdk/metrics/data/exemplar_data.h" -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/common/global_log_handler.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace common @@ -42,9 +42,10 @@ class AlignedHistogramBucketExemplarReservoir : public FixedSizeExemplarReservoi return std::shared_ptr{new HistogramCellSelector(boundaries)}; } - AlignedHistogramBucketExemplarReservoir(size_t size, - std::shared_ptr reservoir_cell_selector, - MapAndResetCellType map_and_reset_cell) + AlignedHistogramBucketExemplarReservoir( + size_t size, + std::shared_ptr reservoir_cell_selector, + MapAndResetCellType map_and_reset_cell) : FixedSizeExemplarReservoir(size + 1, reservoir_cell_selector, map_and_reset_cell) {} @@ -54,7 +55,8 @@ class AlignedHistogramBucketExemplarReservoir : public FixedSizeExemplarReservoi const opentelemetry::context::Context &context, const opentelemetry::common::SystemTimestamp & /* timestamp */) noexcept override { - OTEL_INTERNAL_LOG_ERROR("AlignedHistogramBucketExemplarReservoir shouldn't be used with int64_t values"); + OTEL_INTERNAL_LOG_ERROR( + "AlignedHistogramBucketExemplarReservoir shouldn't be used with int64_t values"); } class HistogramCellSelector : public ReservoirCellSelector @@ -67,7 +69,8 @@ class AlignedHistogramBucketExemplarReservoir : public FixedSizeExemplarReservoi const MetricAttributes &attributes, const opentelemetry::context::Context &context) override { - OTEL_INTERNAL_LOG_ERROR("AlignedHistogramBucketExemplarReservoir shouldn't be used with int64_t values"); + OTEL_INTERNAL_LOG_ERROR( + "AlignedHistogramBucketExemplarReservoir shouldn't be used with int64_t values"); return -1; } diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h index 5dfa0f2e21..3d3d322fdf 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h @@ -5,10 +5,10 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include +# include -#include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/state/filtered_ordered_attribute_map.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace context diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/filtered_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/filtered_exemplar_reservoir.h index 71982604eb..8edd1d4d69 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/filtered_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/filtered_exemplar_reservoir.h @@ -5,12 +5,12 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace common diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h index 0fd0837b38..09ca5e9bbc 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h @@ -5,16 +5,16 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/context/context.h" -#include "opentelemetry/nostd/function_ref.h" -#include "opentelemetry/nostd/shared_ptr.h" -#include "opentelemetry/sdk/common/attribute_utils.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" +# include "opentelemetry/context/context.h" +# include "opentelemetry/nostd/function_ref.h" +# include "opentelemetry/nostd/shared_ptr.h" +# include "opentelemetry/sdk/common/attribute_utils.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h index 931fab9959..439697c197 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h @@ -5,12 +5,12 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace common diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h index 4bd9a120de..12fd7c30c3 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h @@ -5,12 +5,12 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace common @@ -71,9 +71,9 @@ class ExemplarReservoir std::shared_ptr reservoir); static nostd::shared_ptr GetSimpleFixedSizeExemplarReservoir( - size_t size, - std::shared_ptr reservoir_cell_selector, - MapAndResetCellType map_and_reset_cell); + size_t size, + std::shared_ptr reservoir_cell_selector, + MapAndResetCellType map_and_reset_cell); static nostd::shared_ptr GetAlignedHistogramBucketExemplarReservoir( size_t size, diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h index 186e557154..7aa2bdf298 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h @@ -5,15 +5,15 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include - -#include "opentelemetry/common/timestamp.h" -#include "opentelemetry/nostd/variant.h" -#include "opentelemetry/sdk/metrics/data/exemplar_data.h" -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/trace/context.h" -#include "opentelemetry/version.h" +# include +# include + +# include "opentelemetry/common/timestamp.h" +# include "opentelemetry/nostd/variant.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/trace/context.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace context diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h index dc920374e5..a75a26aec7 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h @@ -5,12 +5,12 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace context diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h index 3ac757fb20..88f8233244 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h @@ -5,15 +5,15 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include -#include +# include +# include -#include "opentelemetry/sdk/metrics/data/exemplar_data.h" -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" -#include "opentelemetry/version.h" +# include "opentelemetry/sdk/metrics/data/exemplar_data.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/fixed_size_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell_selector.h" +# include "opentelemetry/version.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace common @@ -34,13 +34,12 @@ namespace metrics class SimpleFixedSizeExemplarReservoir : public FixedSizeExemplarReservoir { public: - static const size_t kDefaultSimpleReservoirSize = 1; - static std::shared_ptr GetSimpleFixedSizeCellSelector(size_t size = kDefaultSimpleReservoirSize) + static std::shared_ptr GetSimpleFixedSizeCellSelector( + size_t size = kDefaultSimpleReservoirSize) { - return std::shared_ptr{ - new SimpleFixedSizeCellSelector{size}}; + return std::shared_ptr{new SimpleFixedSizeCellSelector{size}}; } SimpleFixedSizeExemplarReservoir(size_t size, @@ -68,7 +67,7 @@ class SimpleFixedSizeExemplarReservoir : public FixedSizeExemplarReservoir const opentelemetry::context::Context & /* context */) override { size_t measurement_num = measurements_seen_++; - size_t index = static_cast(-1); + size_t index = static_cast(-1); if (measurement_num < size_) { @@ -84,13 +83,13 @@ class SimpleFixedSizeExemplarReservoir : public FixedSizeExemplarReservoir } void reset() override {} - + private: size_t measurements_seen_ = 0; size_t size_; -}; // class SimpleFixedSizeCellSelector + }; // class SimpleFixedSizeCellSelector -}; // class SimpleFixedSizeExemplarReservoir +}; // class SimpleFixedSizeExemplarReservoir } // namespace metrics } // namespace sdk diff --git a/sdk/include/opentelemetry/sdk/metrics/meter.h b/sdk/include/opentelemetry/sdk/metrics/meter.h index 500090c798..84040acf7f 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter.h @@ -19,10 +19,10 @@ #include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h" #if ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h" -#include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h" +# include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h" #endif #include "opentelemetry/sdk/metrics/instrument_metadata_validator.h" @@ -159,7 +159,8 @@ class Meter final : public opentelemetry::metrics::Meter #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - static MapAndResetCellType GetMapAndResetCellMethod(const InstrumentDescriptor &instrument_descriptor) + static MapAndResetCellType GetMapAndResetCellMethod( + const InstrumentDescriptor &instrument_descriptor) { if (instrument_descriptor.value_type_ == InstrumentValueType::kLong) { @@ -169,30 +170,35 @@ class Meter final : public opentelemetry::metrics::Meter return &ReservoirCell::GetAndResetDouble; } - static nostd::shared_ptr GetExemplarReservoir(const AggregationType agg_type, const AggregationConfig *agg_config, const InstrumentDescriptor &instrument_descriptor) + static nostd::shared_ptr GetExemplarReservoir( + const AggregationType agg_type, + const AggregationConfig *agg_config, + const InstrumentDescriptor &instrument_descriptor) { if (agg_type == AggregationType::kHistogram) { - const auto *histogram_agg_config = static_cast(agg_config); - // Explicit bucket histogram aggregation with more than 1 bucket will use AlignedHistogramBucketExemplarReservoir. + const auto *histogram_agg_config = + static_cast(agg_config); + // Explicit bucket histogram aggregation with more than 1 bucket will use + // AlignedHistogramBucketExemplarReservoir. // https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/metrics/sdk.md#exemplar-defaults if (histogram_agg_config != nullptr && histogram_agg_config->boundaries_.size() > 1) { return nostd::shared_ptr(new AlignedHistogramBucketExemplarReservoir( histogram_agg_config->boundaries_.size(), - AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(histogram_agg_config->boundaries_), + AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector( + histogram_agg_config->boundaries_), GetMapAndResetCellMethod(instrument_descriptor))); } } return nostd::shared_ptr(new SimpleFixedSizeExemplarReservoir( - SimpleFixedSizeExemplarReservoir::kDefaultSimpleReservoirSize, - SimpleFixedSizeExemplarReservoir::GetSimpleFixedSizeCellSelector(), - GetMapAndResetCellMethod(instrument_descriptor))); + SimpleFixedSizeExemplarReservoir::kDefaultSimpleReservoirSize, + SimpleFixedSizeExemplarReservoir::GetSimpleFixedSizeCellSelector(), + GetMapAndResetCellMethod(instrument_descriptor))); } #endif // ENABLE_METRICS_EXEMPLAR_PREVIEW - }; } // namespace metrics } // namespace sdk diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_context.h b/sdk/include/opentelemetry/sdk/metrics/meter_context.h index 92b4d84c31..dae0a214c0 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_context.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_context.h @@ -14,7 +14,7 @@ #include "opentelemetry/nostd/span.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #endif #include "opentelemetry/sdk/metrics/view/view_registry.h" diff --git a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h index 4c85b46d1d..8aa8eae245 100644 --- a/sdk/include/opentelemetry/sdk/metrics/meter_provider.h +++ b/sdk/include/opentelemetry/sdk/metrics/meter_provider.h @@ -12,7 +12,7 @@ #include "opentelemetry/nostd/string_view.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #endif #include "opentelemetry/sdk/metrics/view/view_registry.h" diff --git a/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h index 147bcff179..9b5d59507c 100644 --- a/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h +++ b/sdk/include/opentelemetry/sdk/metrics/state/async_metric_storage.h @@ -12,8 +12,8 @@ #include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" @@ -65,7 +65,7 @@ class AsyncMetricStorage : public MetricStorage, public AsyncWritableMetricStora if (exemplar_filter_type_ == ExemplarFilterType::kAlwaysOn) { exemplar_reservoir_->OfferMeasurement(measurement.second, {}, {}, - std::chrono::system_clock::now()); + std::chrono::system_clock::now()); } #endif diff --git a/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h b/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h index 43c67cb804..a509080318 100644 --- a/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h +++ b/sdk/include/opentelemetry/sdk/metrics/state/attributes_hashmap.h @@ -28,7 +28,7 @@ const std::string kAttributesLimitOverflowKey = "otel.metrics.overflow"; const bool kAttributesLimitOverflowValue = true; const size_t kOverflowAttributesHash = opentelemetry::sdk::common::GetHashForAttributeMap( {{kAttributesLimitOverflowKey, - kAttributesLimitOverflowValue}}); // precalculated for optimization + kAttributesLimitOverflowValue}}); // precalculated for optimization class AttributeHashGenerator { diff --git a/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h b/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h index 81b3bc3f8a..dbce59fe3f 100644 --- a/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h +++ b/sdk/include/opentelemetry/sdk/metrics/state/sync_metric_storage.h @@ -19,8 +19,8 @@ #include "opentelemetry/sdk/metrics/aggregation/default_aggregation.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif #include "opentelemetry/sdk/metrics/state/attributes_hashmap.h" @@ -38,15 +38,16 @@ namespace metrics class SyncMetricStorage : public MetricStorage, public SyncWritableMetricStorage { -#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -static inline bool EnableExamplarFilter(ExemplarFilterType filter_type, const opentelemetry::context::Context &context) -{ - return filter_type == ExemplarFilterType::kAlwaysOn || - filter_type == ExemplarFilterType::kTraceBased && - opentelemetry::trace::GetSpan(context)->GetContext().IsValid() && - opentelemetry::trace::GetSpan(context)->GetContext().IsSampled(); -} + static inline bool EnableExamplarFilter(ExemplarFilterType filter_type, + const opentelemetry::context::Context &context) + { + return filter_type == ExemplarFilterType::kAlwaysOn || + filter_type == ExemplarFilterType::kTraceBased && + opentelemetry::trace::GetSpan(context)->GetContext().IsValid() && + opentelemetry::trace::GetSpan(context)->GetContext().IsSampled(); + } #endif // ENABLE_METRICS_EXEMPLAR_PREVIEW @@ -54,7 +55,7 @@ static inline bool EnableExamplarFilter(ExemplarFilterType filter_type, const op SyncMetricStorage(InstrumentDescriptor instrument_descriptor, const AggregationType aggregation_type, const AttributesProcessor *attributes_processor, -#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW ExemplarFilterType exempler_filter_type, nostd::shared_ptr &&exemplar_reservoir, #endif @@ -107,7 +108,8 @@ static inline bool EnableExamplarFilter(ExemplarFilterType filter_type, const op #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW if (EnableExamplarFilter(exemplar_filter_type_, context)) { - exemplar_reservoir_->OfferMeasurement(value, attributes, context, std::chrono::system_clock::now()); + exemplar_reservoir_->OfferMeasurement(value, attributes, context, + std::chrono::system_clock::now()); } #endif auto hash = opentelemetry::sdk::common::GetHashForAttributeMap( diff --git a/sdk/src/metrics/exemplar/reservoir.cc b/sdk/src/metrics/exemplar/reservoir.cc index ec3969e028..f62c01cc69 100644 --- a/sdk/src/metrics/exemplar/reservoir.cc +++ b/sdk/src/metrics/exemplar/reservoir.cc @@ -5,11 +5,11 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/no_exemplar_reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir_cell.h" +# include "opentelemetry/sdk/metrics/exemplar/simple_fixed_size_exemplar_reservoir.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk @@ -31,8 +31,9 @@ nostd::shared_ptr ExemplarReservoir::GetAlignedHistogramBucke std::shared_ptr reservoir_cell_selector, MapAndResetCellType map_and_reset_cell) { - return nostd::shared_ptr{ - new AlignedHistogramBucketExemplarReservoir{size, AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(), map_and_reset_cell}}; + return nostd::shared_ptr{new AlignedHistogramBucketExemplarReservoir{ + size, AlignedHistogramBucketExemplarReservoir::GetHistogramCellSelector(), + map_and_reset_cell}}; } nostd::shared_ptr ExemplarReservoir::GetNoExemplarReservoir() diff --git a/sdk/src/metrics/meter.cc b/sdk/src/metrics/meter.cc index 1c71102f32..587dd65f63 100644 --- a/sdk/src/metrics/meter.cc +++ b/sdk/src/metrics/meter.cc @@ -3,10 +3,10 @@ #include -#include "opentelemetry/sdk/metrics/meter.h" #include "opentelemetry/metrics/noop.h" #include "opentelemetry/nostd/shared_ptr.h" #include "opentelemetry/sdk/metrics/async_instruments.h" +#include "opentelemetry/sdk/metrics/meter.h" #include "opentelemetry/sdk/metrics/state/multi_metric_storage.h" #include "opentelemetry/sdk/metrics/state/observable_registry.h" #include "opentelemetry/sdk/metrics/state/sync_metric_storage.h" @@ -318,11 +318,13 @@ std::unique_ptr Meter::RegisterSyncMetricStorage( #endif auto success = view_registry->FindViews( - instrument_descriptor, *scope_, [this, &instrument_descriptor, &storages + instrument_descriptor, *scope_, + [this, &instrument_descriptor, &storages #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - , exemplar_filter_type + , + exemplar_filter_type #endif - ](const View &view) { + ](const View &view) { auto view_instr_desc = instrument_descriptor; if (!view.GetName().empty()) { @@ -338,7 +340,8 @@ std::unique_ptr Meter::RegisterSyncMetricStorage( view_instr_desc, view.GetAggregationType(), &view.GetAttributesProcessor(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW exemplar_filter_type, - GetExemplarReservoir(view.GetAggregationType(), view.GetAggregationConfig(), instrument_descriptor), + GetExemplarReservoir(view.GetAggregationType(), view.GetAggregationConfig(), + instrument_descriptor), #endif view.GetAggregationConfig())); storage_registry_[instrument_descriptor.name_] = storage; @@ -369,7 +372,7 @@ std::unique_ptr Meter::RegisterAsyncMetricStorage( } auto view_registry = ctx->GetViewRegistry(); std::unique_ptr storages(new AsyncMultiMetricStorage()); - + #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW auto exemplar_filter_type = ctx->GetExemplarFilter(); #endif @@ -378,9 +381,10 @@ std::unique_ptr Meter::RegisterAsyncMetricStorage( instrument_descriptor, *GetInstrumentationScope(), [this, &instrument_descriptor, &storages #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - , exemplar_filter_type + , + exemplar_filter_type #endif - ](const View &view) { + ](const View &view) { auto view_instr_desc = instrument_descriptor; if (!view.GetName().empty()) { @@ -396,7 +400,7 @@ std::unique_ptr Meter::RegisterAsyncMetricStorage( exemplar_filter_type, GetExemplarReservoir(view.GetAggregationType(), view.GetAggregationConfig(), instrument_descriptor), -#endif +#endif view.GetAggregationConfig())); storage_registry_[instrument_descriptor.name_] = storage; static_cast(storages.get())->AddStorage(storage); diff --git a/sdk/src/metrics/meter_provider.cc b/sdk/src/metrics/meter_provider.cc index 6dd4a6dad2..e075fac9aa 100644 --- a/sdk/src/metrics/meter_provider.cc +++ b/sdk/src/metrics/meter_provider.cc @@ -106,12 +106,10 @@ void MeterProvider::AddView(std::unique_ptr instrument_selec std::unique_ptr meter_selector, std::unique_ptr view) noexcept { - context_->AddView(std::move(instrument_selector), std::move(meter_selector), - std::move(view)); + context_->AddView(std::move(instrument_selector), std::move(meter_selector), std::move(view)); } -void MeterProvider::SetExemplarFilter( - metrics::ExemplarFilterType exemplar_filter_type) noexcept +void MeterProvider::SetExemplarFilter(metrics::ExemplarFilterType exemplar_filter_type) noexcept { context_->SetExemplarFilter(exemplar_filter_type); } diff --git a/sdk/test/metrics/async_metric_storage_test.cc b/sdk/test/metrics/async_metric_storage_test.cc index 4374af9415..b412d2b8e2 100644 --- a/sdk/test/metrics/async_metric_storage_test.cc +++ b/sdk/test/metrics/async_metric_storage_test.cc @@ -7,8 +7,8 @@ #include "opentelemetry/sdk/metrics/async_instruments.h" #ifdef ENABLE_METRICS_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" @@ -62,9 +62,8 @@ TEST_P(WritableMetricStorageTestFixture, TestAggregation) opentelemetry::sdk::metrics::AsyncMetricStorage storage( instr_desc, AggregationType::kSum, #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), -#endif + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), +#endif nullptr); int64_t get_count1 = 20; int64_t put_count1 = 10; @@ -158,8 +157,7 @@ TEST_P(WritableMetricStorageTestUpDownFixture, TestAggregation) opentelemetry::sdk::metrics::AsyncMetricStorage storage( instr_desc, AggregationType::kDefault, #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); int64_t get_count1 = 20; @@ -253,8 +251,7 @@ TEST_P(WritableMetricStorageTestObservableGaugeFixture, TestAggregation) opentelemetry::sdk::metrics::AsyncMetricStorage storage( instr_desc, AggregationType::kLastValue, #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); int64_t freq_cpu0 = 3; diff --git a/sdk/test/metrics/cardinality_limit_test.cc b/sdk/test/metrics/cardinality_limit_test.cc index 3633a8d40e..8c2edb4b0c 100644 --- a/sdk/test/metrics/cardinality_limit_test.cc +++ b/sdk/test/metrics/cardinality_limit_test.cc @@ -5,7 +5,7 @@ #include "opentelemetry/common/key_value_iterable_view.h" #include "opentelemetry/sdk/metrics/aggregation/sum_aggregation.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" #include "opentelemetry/sdk/metrics/state/attributes_hashmap.h" diff --git a/sdk/test/metrics/exemplar/histogram_exemplar_reservoir_test.cc b/sdk/test/metrics/exemplar/histogram_exemplar_reservoir_test.cc index 884768c4eb..41a6204d24 100644 --- a/sdk/test/metrics/exemplar/histogram_exemplar_reservoir_test.cc +++ b/sdk/test/metrics/exemplar/histogram_exemplar_reservoir_test.cc @@ -3,10 +3,10 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include +# include -#include "opentelemetry/sdk/metrics/exemplar/histogram_exemplar_reservoir.h" -#include +# include +# include "opentelemetry/sdk/metrics/exemplar/histogram_exemplar_reservoir.h" OPENTELEMETRY_BEGIN_NAMESPACE namespace sdk diff --git a/sdk/test/metrics/sync_metric_storage_counter_test.cc b/sdk/test/metrics/sync_metric_storage_counter_test.cc index cbceb376ce..c3a61f710b 100644 --- a/sdk/test/metrics/sync_metric_storage_counter_test.cc +++ b/sdk/test/metrics/sync_metric_storage_counter_test.cc @@ -8,8 +8,8 @@ #include "opentelemetry/nostd/shared_ptr.h" #if ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" @@ -34,7 +34,7 @@ TEST_P(WritableMetricStorageTestFixture, LongCounterSumAggregation) int64_t expected_total_get_requests = 0; int64_t expected_total_put_requests = 0; InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kCounter, - InstrumentValueType::kLong}; + InstrumentValueType::kLong}; std::map attributes_get = {{"RequestType", "GET"}}; std::map attributes_put = {{"RequestType", "PUT"}}; @@ -43,8 +43,7 @@ TEST_P(WritableMetricStorageTestFixture, LongCounterSumAggregation) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kSum, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); @@ -175,7 +174,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleCounterSumAggregation) double expected_total_get_requests = 0; double expected_total_put_requests = 0; InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kCounter, - InstrumentValueType::kDouble}; + InstrumentValueType::kDouble}; std::map attributes_get = {{"RequestType", "GET"}}; std::map attributes_put = {{"RequestType", "PUT"}}; @@ -184,8 +183,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleCounterSumAggregation) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kSum, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); diff --git a/sdk/test/metrics/sync_metric_storage_histogram_test.cc b/sdk/test/metrics/sync_metric_storage_histogram_test.cc index e859b73513..6063cdf89b 100644 --- a/sdk/test/metrics/sync_metric_storage_histogram_test.cc +++ b/sdk/test/metrics/sync_metric_storage_histogram_test.cc @@ -7,8 +7,8 @@ #include "opentelemetry/nostd/shared_ptr.h" #ifdef ENABLE_METRICS_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" -#include "opentelemetry/sdk/metrics/exemplar/reservoir.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/reservoir.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" @@ -35,7 +35,7 @@ TEST_P(WritableMetricStorageHistogramTestFixture, LongHistogram) int64_t expected_total_get_requests = 0; int64_t expected_total_put_requests = 0; InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kHistogram, - InstrumentValueType::kLong}; + InstrumentValueType::kLong}; std::map attributes_get = {{"RequestType", "GET"}}; std::map attributes_put = {{"RequestType", "PUT"}}; @@ -44,8 +44,7 @@ TEST_P(WritableMetricStorageHistogramTestFixture, LongHistogram) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kHistogram, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); @@ -177,7 +176,7 @@ TEST_P(WritableMetricStorageHistogramTestFixture, DoubleHistogram) double expected_total_get_requests = 0; double expected_total_put_requests = 0; InstrumentDescriptor instr_desc = {"name", "desc", "1unit", InstrumentType::kHistogram, - InstrumentValueType::kDouble}; + InstrumentValueType::kDouble}; std::map attributes_get = {{"RequestType", "GET"}}; std::map attributes_put = {{"RequestType", "PUT"}}; @@ -186,8 +185,7 @@ TEST_P(WritableMetricStorageHistogramTestFixture, DoubleHistogram) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kHistogram, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); diff --git a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc index b04288bcbc..216574a587 100644 --- a/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc +++ b/sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc @@ -7,7 +7,7 @@ #include "opentelemetry/nostd/shared_ptr.h" #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW -#include "opentelemetry/sdk/metrics/exemplar/filter_type.h" +# include "opentelemetry/sdk/metrics/exemplar/filter_type.h" #endif #include "opentelemetry/sdk/metrics/instruments.h" @@ -42,8 +42,7 @@ TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kSum, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr); @@ -193,8 +192,7 @@ TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation) opentelemetry::sdk::metrics::SyncMetricStorage storage( instr_desc, AggregationType::kSum, default_attributes_processor.get(), #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW - ExemplarFilterType::kAlwaysOff, - ExemplarReservoir::GetNoExemplarReservoir(), + ExemplarFilterType::kAlwaysOff, ExemplarReservoir::GetNoExemplarReservoir(), #endif nullptr);