Skip to content

Commit

Permalink
Fix format
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomsonTan committed Mar 26, 2024
1 parent d76710a commit 1bd5550
Show file tree
Hide file tree
Showing 24 changed files with 163 additions and 159 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand Down Expand Up @@ -42,9 +42,10 @@ class AlignedHistogramBucketExemplarReservoir : public FixedSizeExemplarReservoi
return std::shared_ptr<ReservoirCellSelector>{new HistogramCellSelector(boundaries)};
}

AlignedHistogramBucketExemplarReservoir(size_t size,
std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
MapAndResetCellType map_and_reset_cell)
AlignedHistogramBucketExemplarReservoir(
size_t size,
std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
MapAndResetCellType map_and_reset_cell)
: FixedSizeExemplarReservoir(size + 1, reservoir_cell_selector, map_and_reset_cell)
{}

Expand All @@ -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
Expand All @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions sdk/include/opentelemetry/sdk/metrics/exemplar/filter_type.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
# include <memory>

#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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand Down
16 changes: 8 additions & 8 deletions sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand Down Expand Up @@ -71,9 +71,9 @@ class ExemplarReservoir
std::shared_ptr<ExemplarReservoir> reservoir);

static nostd::shared_ptr<ExemplarReservoir> GetSimpleFixedSizeExemplarReservoir(
size_t size,
std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
MapAndResetCellType map_and_reset_cell);
size_t size,
std::shared_ptr<ReservoirCellSelector> reservoir_cell_selector,
MapAndResetCellType map_and_reset_cell);

static nostd::shared_ptr<ExemplarReservoir> GetAlignedHistogramBucketExemplarReservoir(
size_t size,
Expand Down
18 changes: 9 additions & 9 deletions sdk/include/opentelemetry/sdk/metrics/exemplar/reservoir_cell.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <cstddef>
#include <memory>

#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 <cstddef>
# include <memory>

# 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <cstddef>
#include <vector>
# include <cstddef>
# include <vector>

#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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

#ifdef ENABLE_METRICS_EXEMPLAR_PREVIEW

#include <memory>
#include <vector>
# include <memory>
# include <vector>

#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
Expand All @@ -34,13 +34,12 @@ namespace metrics
class SimpleFixedSizeExemplarReservoir : public FixedSizeExemplarReservoir
{
public:

static const size_t kDefaultSimpleReservoirSize = 1;

static std::shared_ptr<ReservoirCellSelector> GetSimpleFixedSizeCellSelector(size_t size = kDefaultSimpleReservoirSize)
static std::shared_ptr<ReservoirCellSelector> GetSimpleFixedSizeCellSelector(
size_t size = kDefaultSimpleReservoirSize)
{
return std::shared_ptr<ReservoirCellSelector>{
new SimpleFixedSizeCellSelector{size}};
return std::shared_ptr<ReservoirCellSelector>{new SimpleFixedSizeCellSelector{size}};
}

SimpleFixedSizeExemplarReservoir(size_t size,
Expand Down Expand Up @@ -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<size_t>(-1);
size_t index = static_cast<size_t>(-1);

if (measurement_num < size_)
{
Expand All @@ -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
Expand Down
32 changes: 19 additions & 13 deletions sdk/include/opentelemetry/sdk/metrics/meter.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
{
Expand All @@ -169,30 +170,35 @@ class Meter final : public opentelemetry::metrics::Meter
return &ReservoirCell::GetAndResetDouble;
}

static nostd::shared_ptr<ExemplarReservoir> GetExemplarReservoir(const AggregationType agg_type, const AggregationConfig *agg_config, const InstrumentDescriptor &instrument_descriptor)
static nostd::shared_ptr<ExemplarReservoir> 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<const HistogramAggregationConfig *>(agg_config);
// Explicit bucket histogram aggregation with more than 1 bucket will use AlignedHistogramBucketExemplarReservoir.
const auto *histogram_agg_config =
static_cast<const HistogramAggregationConfig *>(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<ExemplarReservoir>(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<ExemplarReservoir>(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
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/metrics/meter_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/metrics/meter_provider.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Loading

0 comments on commit 1bd5550

Please sign in to comment.