Skip to content

Revert "[Partial Fix] - remove/comment end timestamp from OTLP export metrics" #668

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
merged 1 commit into from
Apr 19, 2023
Merged

Revert "[Partial Fix] - remove/comment end timestamp from OTLP export metrics" #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Metrics.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ void Counter::to_prometheus(std::stringstream &out, Metric::LabelMap add_labels)
out << name_snake({}, add_labels) << ' ' << _value << std::endl;
}

void Counter::to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, [[maybe_unused]] timespec &end, Metric::LabelMap add_labels) const
void Counter::to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, timespec &end, Metric::LabelMap add_labels) const
{
auto metric = scope.add_metrics();
metric->set_name(base_name_snake());
metric->set_description(_desc);
auto gauge_data_point = metric->mutable_gauge()->add_data_points();
gauge_data_point->set_as_int(_value);
gauge_data_point->set_start_time_unix_nano(timespec_to_uint64(start));
//gauge_data_point->set_time_unix_nano(timespec_to_uint64(end));
gauge_data_point->set_time_unix_nano(timespec_to_uint64(end));
for (const auto &label: add_labels) {
auto attribute = gauge_data_point->add_attributes();
attribute->set_key(label.first);
Expand Down Expand Up @@ -79,15 +79,15 @@ void Cardinality::to_prometheus(std::stringstream &out, Metric::LabelMap add_lab
out << name_snake({}, add_labels) << ' ' << lround(_set.get_estimate()) << std::endl;
}

void Cardinality::to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, [[maybe_unused]] timespec &end, Metric::LabelMap add_labels) const
void Cardinality::to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, timespec &end, Metric::LabelMap add_labels) const
{
auto metric = scope.add_metrics();
metric->set_name(base_name_snake());
metric->set_description(_desc);
auto gauge_data_point = metric->mutable_gauge()->add_data_points();
gauge_data_point->set_as_int(lround(_set.get_estimate()));
gauge_data_point->set_start_time_unix_nano(timespec_to_uint64(start));
//gauge_data_point->set_time_unix_nano(timespec_to_uint64(end));
gauge_data_point->set_time_unix_nano(timespec_to_uint64(end));
for (const auto &label: add_labels) {
auto attribute = gauge_data_point->add_attributes();
attribute->set_key(label.first);
Expand Down
16 changes: 8 additions & 8 deletions src/Metrics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ struct comparator {
}
};

static inline uint64_t timespec_to_uint64(const timespec &stamp)
static inline uint64_t timespec_to_uint64(timespec &stamp)
{
return (stamp.tv_sec * 1000000000ULL) + stamp.tv_nsec;
return stamp.tv_sec * 1000000000ULL + stamp.tv_nsec;
}

class Metric
Expand Down Expand Up @@ -293,7 +293,7 @@ class Histogram final : public Metric
out << name_snake({"count"}, add_labels) << ' ' << _sketch.get_n() << std::endl;
}

void to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, [[maybe_unused]] timespec &end, LabelMap add_labels = {}) const
void to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, timespec &end, LabelMap add_labels = {}) const
{
if (_sketch.is_empty()) {
return;
Expand All @@ -316,7 +316,7 @@ class Histogram final : public Metric
m_hist->set_aggregation_temporality(metrics::v1::AggregationTemporality::AGGREGATION_TEMPORALITY_CUMULATIVE);
auto hist_data_point = m_hist->add_data_points();
hist_data_point->set_start_time_unix_nano(timespec_to_uint64(start));
// hist_data_point->set_time_unix_nano(timespec_to_uint64(end));
hist_data_point->set_time_unix_nano(timespec_to_uint64(end));

for (std::size_t i = 0; i < bins.size(); ++i) {
hist_data_point->add_explicit_bounds(bins[i] - pace);
Expand Down Expand Up @@ -448,7 +448,7 @@ class Quantile final : public Metric
}
}

void to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, [[maybe_unused]] timespec &end, LabelMap add_labels = {}) const override
void to_opentelemetry(metrics::v1::ScopeMetrics &scope, timespec &start, timespec &end, LabelMap add_labels = {}) const override
{
if (_quantile.is_empty()) {
return;
Expand All @@ -467,7 +467,7 @@ class Quantile final : public Metric
metric->set_description(_desc);
auto summary_data_point = metric->mutable_summary()->add_data_points();
summary_data_point->set_start_time_unix_nano(timespec_to_uint64(start));
// summary_data_point->set_time_unix_nano(timespec_to_uint64(end));
summary_data_point->set_time_unix_nano(timespec_to_uint64(end));
for (auto it = quantiles.begin(); it != quantiles.end(); ++it) {
auto quantile = summary_data_point->add_quantile_values();
quantile->set_quantile(fractions[it - quantiles.begin()]);
Expand Down Expand Up @@ -521,11 +521,11 @@ class TopN final : public Metric
return quantile.get_quantile(_percentile_threshold);
}

void _set_opentelemetry_data(opentelemetry::proto::metrics::v1::NumberDataPoint *data_point, uint64_t start, [[maybe_unused]] uint64_t end, const Metric::LabelMap &l, uint64_t value) const
void _set_opentelemetry_data(opentelemetry::proto::metrics::v1::NumberDataPoint *data_point, uint64_t start, uint64_t end, const Metric::LabelMap &l, uint64_t value) const
{
data_point->set_as_int(value);
data_point->set_start_time_unix_nano(start);
//data_point->set_time_unix_nano(end);
data_point->set_time_unix_nano(end);
for (const auto &label : l) {
auto attribute = data_point->add_attributes();
attribute->set_key(label.first);
Expand Down