Skip to content

[SDK] Use sdk_start_ts for MetricData start_ts for instruments having cumulative aggregation temporality. #2086

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcalff merged 2 commits into from
Apr 12, 2023
Merged

[SDK] Use sdk_start_ts for MetricData start_ts for instruments having cumulative aggregation temporality. #2086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4311f2d
Use sdk_start_ts for MetricData start_ts for instruments having cumul…
davidmandle Apr 7, 2023
de77e9b
Merge branch 'main' into main
marcalff Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Increment the:
[#2088](https://github.com/open-telemetry/opentelemetry-cpp/pull/2088)
* [EXPORTER] Add OTLP HTTP SSL support
[#1793](https://github.com/open-telemetry/opentelemetry-cpp/pull/1793)
* [METRICS SDK] Use sdk_start_ts for MetricData start_ts for instruments having
cumulative aggregation temporality. [#2086](https://github.com/open-telemetry/opentelemetry-cpp/pull/2086)

Important changes:

Expand Down
5 changes: 4 additions & 1 deletion sdk/src/metrics/state/temporal_metric_storage.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
auto reported = last_reported_metrics_.find(collector);
if (reported != last_reported_metrics_.end())
{
last_collection_ts = last_reported_metrics_[collector].collection_ts;
auto last_aggr_hashmap = std::move(last_reported_metrics_[collector].attributes_map);
if (aggregation_temporarily == AggregationTemporality::kCumulative)
{
Expand All @@ -111,6 +110,10 @@ bool TemporalMetricStorage::buildMetrics(CollectorHandle *collector,
return true;
});
}
else
{
last_collection_ts = last_reported_metrics_[collector].collection_ts;
}
last_reported_metrics_[collector] =
LastReportedMetrics{std::move(merged_metrics), collection_ts};
}
Expand Down
8 changes: 8 additions & 0 deletions sdk/test/metrics/sync_metric_storage_counter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ TEST_P(WritableMetricStorageTestFixture, LongCounterSumAggregation)
count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
}
for (const auto &data_attr : metric_data.point_data_attr_)
{
const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
Expand Down Expand Up @@ -234,6 +238,10 @@ TEST_P(WritableMetricStorageTestFixture, DoubleCounterSumAggregation)
count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
}
for (const auto &data_attr : metric_data.point_data_attr_)
{
const auto &data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
Expand Down
8 changes: 8 additions & 0 deletions sdk/test/metrics/sync_metric_storage_histogram_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ TEST_P(WritableMetricStorageHistogramTestFixture, LongHistogram)
count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
}
for (const auto &data_attr : metric_data.point_data_attr_)
{
const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
Expand Down Expand Up @@ -236,6 +240,10 @@ TEST_P(WritableMetricStorageHistogramTestFixture, DoubleHistogram)
count_attributes = 0;
storage.Collect(
collector.get(), collectors, sdk_start_ts, collection_ts, [&](const MetricData &metric_data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(metric_data.start_ts, sdk_start_ts);
}
for (const auto &data_attr : metric_data.point_data_attr_)
{
const auto &data = opentelemetry::nostd::get<HistogramPointData>(data_attr.point_data);
Expand Down
8 changes: 8 additions & 0 deletions sdk/test/metrics/sync_metric_storage_up_down_counter_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ TEST_P(WritableMetricStorageTestFixture, LongUpDownCounterSumAggregation)
count_attributes = 0;
storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
[&](const MetricData data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(data.start_ts, sdk_start_ts);
}
for (auto data_attr : data.point_data_attr_)
{
auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
Expand Down Expand Up @@ -246,6 +250,10 @@ TEST_P(WritableMetricStorageTestFixture, DoubleUpDownCounterSumAggregation)
count_attributes = 0;
storage.Collect(collector.get(), collectors, sdk_start_ts, collection_ts,
[&](const MetricData data) {
if (temporality == AggregationTemporality::kCumulative)
{
EXPECT_EQ(data.start_ts, sdk_start_ts);
}
for (auto data_attr : data.point_data_attr_)
{
auto sum_data = opentelemetry::nostd::get<SumPointData>(data_attr.point_data);
Expand Down