diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c89f0ba67..22fd5e9fed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,9 @@ Increment the: * [SDK] Implement env var configuration for PeriodicExportingMetricReader [#3549](https://github.com/open-telemetry/opentelemetry-cpp/pull/3549) +* [SDK] Update default exemplar reservoir size for exponential histograms + [#3551](https://github.com/open-telemetry/opentelemetry-cpp/pull/3551) + ## [1.22 2025-07-11] * [DOC] Udpate link to membership document diff --git a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h index dfd10995a4..6ca88411af 100644 --- a/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h +++ b/sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_utils.h @@ -5,6 +5,8 @@ #ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW +# include + # include "opentelemetry/common/macros.h" # include "opentelemetry/sdk/metrics/aggregation/aggregation_config.h" # include "opentelemetry/sdk/metrics/exemplar/aligned_histogram_bucket_exemplar_reservoir.h" @@ -27,6 +29,23 @@ static inline MapAndResetCellType GetMapAndResetCellMethod( return &ReservoirCell::GetAndResetDouble; } +static inline size_t GetSimpleFixedReservoirDefaultSize(const AggregationType agg_type, + const AggregationConfig *const agg_config) + +{ + constexpr size_t kMaxBase2ExponentialHistogramReservoirSize = 20; + + if (agg_type == AggregationType::kBase2ExponentialHistogram) + { + const auto *histogram_agg_config = + static_cast(agg_config); + return (std::min)(kMaxBase2ExponentialHistogramReservoirSize, + histogram_agg_config->max_buckets_); + } + + return SimpleFixedSizeExemplarReservoir::kDefaultSimpleReservoirSize; +} + static inline nostd::shared_ptr GetExemplarReservoir( const AggregationType agg_type, const AggregationConfig *agg_config, @@ -52,7 +71,7 @@ static inline nostd::shared_ptr GetExemplarReservoir( } return nostd::shared_ptr(new SimpleFixedSizeExemplarReservoir( - SimpleFixedSizeExemplarReservoir::kDefaultSimpleReservoirSize, + GetSimpleFixedReservoirDefaultSize(agg_type, agg_config), SimpleFixedSizeExemplarReservoir::GetSimpleFixedSizeCellSelector(), GetMapAndResetCellMethod(instrument_descriptor))); }