55#include < prometheus/metric_family.h>
66#include < prometheus/metric_type.h>
77#include < algorithm>
8- #include < chrono>
98#include < cstddef>
109#include < cstdint>
1110#include < functional>
1918#include < utility>
2019#include < vector>
2120
22- #include " opentelemetry/common/timestamp.h"
2321#include " opentelemetry/exporters/prometheus/exporter_utils.h"
2422#include " opentelemetry/nostd/variant.h"
2523#include " opentelemetry/sdk/common/attribute_utils.h"
@@ -138,9 +136,8 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
138136 // Append target_info as the first metric
139137 if (populate_target_info && !data.scope_metric_data_ .empty ())
140138 {
141- SetTarget (data,
142- data.scope_metric_data_ .begin ()->metric_data_ .begin ()->end_ts .time_since_epoch (),
143- without_otel_scope ? nullptr : (*data.scope_metric_data_ .begin ()).scope_ , &output);
139+ SetTarget (data, without_otel_scope ? nullptr : (*data.scope_metric_data_ .begin ()).scope_ ,
140+ &output);
144141 }
145142
146143 for (const auto &instrumentation_info : data.scope_metric_data_ )
@@ -151,7 +148,6 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
151148 auto unit = metric_data.instrument_descriptor .unit_ ;
152149 prometheus_client::MetricFamily metric_family;
153150 metric_family.help = metric_data.instrument_descriptor .description_ ;
154- auto time = metric_data.end_ts .time_since_epoch ();
155151 auto front = metric_data.point_data_attr_ .front ();
156152 auto kind = getAggregationType (front.point_data );
157153 bool is_monotonic = true ;
@@ -185,7 +181,7 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
185181 sum = static_cast <double >(nostd::get<int64_t >(histogram_point_data.sum_ ));
186182 }
187183 SetData (std::vector<double >{sum, static_cast <double >(histogram_point_data.count_ )},
188- boundaries, counts, point_data_attr.attributes , scope, time, &metric_family,
184+ boundaries, counts, point_data_attr.attributes , scope, &metric_family,
189185 data.resource_ );
190186 }
191187 else if (type == prometheus_client::MetricType::Gauge)
@@ -196,15 +192,15 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
196192 auto last_value_point_data =
197193 nostd::get<sdk::metrics::LastValuePointData>(point_data_attr.point_data );
198194 std::vector<metric_sdk::ValueType> values{last_value_point_data.value_ };
199- SetData (values, point_data_attr.attributes , scope, type, time, &metric_family,
195+ SetData (values, point_data_attr.attributes , scope, type, &metric_family,
200196 data.resource_ );
201197 }
202198 else if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_attr.point_data ))
203199 {
204200 auto sum_point_data =
205201 nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data );
206202 std::vector<metric_sdk::ValueType> values{sum_point_data.value_ };
207- SetData (values, point_data_attr.attributes , scope, type, time, &metric_family,
203+ SetData (values, point_data_attr.attributes , scope, type, &metric_family,
208204 data.resource_ );
209205 }
210206 else
@@ -221,7 +217,7 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
221217 auto sum_point_data =
222218 nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data );
223219 std::vector<metric_sdk::ValueType> values{sum_point_data.value_ };
224- SetData (values, point_data_attr.attributes , scope, type, time, &metric_family,
220+ SetData (values, point_data_attr.attributes , scope, type, &metric_family,
225221 data.resource_ );
226222 }
227223 else
@@ -605,7 +601,6 @@ prometheus_client::MetricType PrometheusExporterUtils::TranslateType(
605601
606602void PrometheusExporterUtils::SetTarget (
607603 const sdk::metrics::ResourceMetrics &data,
608- std::chrono::nanoseconds time,
609604 const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
610605 std::vector<::prometheus::MetricFamily> *output)
611606{
@@ -624,7 +619,7 @@ void PrometheusExporterUtils::SetTarget(
624619 metric.info .value = 1.0 ;
625620
626621 metric_sdk::PointAttributes empty_attributes;
627- SetMetricBasic (metric, empty_attributes, time, scope, data.resource_ );
622+ SetMetricBasic (metric, empty_attributes, scope, data.resource_ );
628623
629624 for (auto &label : data.resource_ ->GetAttributes ())
630625 {
@@ -645,13 +640,12 @@ void PrometheusExporterUtils::SetData(
645640 const metric_sdk::PointAttributes &labels,
646641 const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
647642 prometheus_client::MetricType type,
648- std::chrono::nanoseconds time,
649643 prometheus_client::MetricFamily *metric_family,
650644 const opentelemetry::sdk::resource::Resource *resource)
651645{
652646 metric_family->metric .emplace_back ();
653647 prometheus_client::ClientMetric &metric = metric_family->metric .back ();
654- SetMetricBasic (metric, labels, time, scope, resource);
648+ SetMetricBasic (metric, labels, scope, resource);
655649 SetValue (values, type, &metric);
656650}
657651
@@ -666,13 +660,12 @@ void PrometheusExporterUtils::SetData(
666660 const std::vector<uint64_t > &counts,
667661 const metric_sdk::PointAttributes &labels,
668662 const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
669- std::chrono::nanoseconds time,
670663 prometheus_client::MetricFamily *metric_family,
671664 const opentelemetry::sdk::resource::Resource *resource)
672665{
673666 metric_family->metric .emplace_back ();
674667 prometheus_client::ClientMetric &metric = metric_family->metric .back ();
675- SetMetricBasic (metric, labels, time, scope, resource);
668+ SetMetricBasic (metric, labels, scope, resource);
676669 SetValue (values, boundaries, counts, &metric);
677670}
678671
@@ -682,11 +675,9 @@ void PrometheusExporterUtils::SetData(
682675void PrometheusExporterUtils::SetMetricBasic (
683676 prometheus_client::ClientMetric &metric,
684677 const metric_sdk::PointAttributes &labels,
685- std::chrono::nanoseconds time,
686678 const opentelemetry::sdk::instrumentationscope::InstrumentationScope *scope,
687679 const opentelemetry::sdk::resource::Resource *resource)
688680{
689- metric.timestamp_ms = time.count () / 1000000 ;
690681 if (labels.empty () && nullptr == resource)
691682 {
692683 return ;
0 commit comments