From bbb9502145fe32acbb0c58f3ddf0b83130f15e66 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 21 Dec 2023 19:58:54 +0000 Subject: [PATCH 1/3] fix aggregation change through view --- .../exporters/otlp/otlp_metric_utils.h | 2 +- exporters/otlp/src/otlp_metric_utils.cc | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h index 1adca861d8..a420972dc7 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h @@ -26,7 +26,7 @@ class OtlpMetricUtils { public: static opentelemetry::sdk::metrics::AggregationType GetAggregationType( - const opentelemetry::sdk::metrics::InstrumentType &instrument_type) noexcept; + const opentelemetry::v1::sdk::metrics::MetricData &metric_data) noexcept; static proto::metrics::v1::AggregationTemporality GetProtoAggregationTemporality( const opentelemetry::sdk::metrics::AggregationTemporality &aggregation_temporality) noexcept; diff --git a/exporters/otlp/src/otlp_metric_utils.cc b/exporters/otlp/src/otlp_metric_utils.cc index 50c5fdd9cc..73d1f3a734 100644 --- a/exporters/otlp/src/otlp_metric_utils.cc +++ b/exporters/otlp/src/otlp_metric_utils.cc @@ -25,25 +25,27 @@ proto::metrics::v1::AggregationTemporality OtlpMetricUtils::GetProtoAggregationT } metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType( - const opentelemetry::sdk::metrics::InstrumentType &instrument_type) noexcept + const opentelemetry::v1::sdk::metrics::MetricData &metric_data) noexcept { - - if (instrument_type == metric_sdk::InstrumentType::kCounter || - instrument_type == metric_sdk::InstrumentType::kUpDownCounter || - instrument_type == metric_sdk::InstrumentType::kObservableCounter || - instrument_type == metric_sdk::InstrumentType::kObservableUpDownCounter) + if (metric_data.point_data_attr_.size() == 0) + { + return metric_sdk::AggregationType::kDrop; + } + auto point_data_with_attributes = metric_data.point_data_attr_[0]; + if (nostd::holds_alternative(point_data_with_attributes.point_data)) { return metric_sdk::AggregationType::kSum; } - else if (instrument_type == metric_sdk::InstrumentType::kHistogram) + else if (nostd::holds_alternative( + point_data_with_attributes.point_data)) { return metric_sdk::AggregationType::kHistogram; } - else if (instrument_type == metric_sdk::InstrumentType::kObservableGauge) + else if (nostd::holds_alternative( + point_data_with_attributes.point_data)) { return metric_sdk::AggregationType::kLastValue; } - return metric_sdk::AggregationType::kDrop; } void OtlpMetricUtils::ConvertSumMetric(const metric_sdk::MetricData &metric_data, @@ -188,7 +190,7 @@ void OtlpMetricUtils::PopulateInstrumentInfoMetrics( metric->set_name(metric_data.instrument_descriptor.name_); metric->set_description(metric_data.instrument_descriptor.description_); metric->set_unit(metric_data.instrument_descriptor.unit_); - auto kind = GetAggregationType(metric_data.instrument_descriptor.type_); + auto kind = GetAggregationType(metric_data); switch (kind) { case metric_sdk::AggregationType::kSum: { From a96d0f23df43969734930d430896f8f3134765cb Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 21 Dec 2023 20:12:51 +0000 Subject: [PATCH 2/3] fix warning --- exporters/otlp/src/otlp_metric_utils.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/exporters/otlp/src/otlp_metric_utils.cc b/exporters/otlp/src/otlp_metric_utils.cc index 73d1f3a734..84c8183eb1 100644 --- a/exporters/otlp/src/otlp_metric_utils.cc +++ b/exporters/otlp/src/otlp_metric_utils.cc @@ -46,6 +46,7 @@ metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType( { return metric_sdk::AggregationType::kLastValue; } + return metric_sdk::AggregationType::kDrop; } void OtlpMetricUtils::ConvertSumMetric(const metric_sdk::MetricData &metric_data, From fce6477e105a942bc1a5725d43a65f6051605c71 Mon Sep 17 00:00:00 2001 From: Lalit Kumar Bhasin Date: Thu, 21 Dec 2023 20:31:39 +0000 Subject: [PATCH 3/3] more warnings --- .../include/opentelemetry/exporters/otlp/otlp_metric_utils.h | 2 +- exporters/otlp/src/otlp_metric_utils.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h index a420972dc7..c6e11aeff3 100644 --- a/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h +++ b/exporters/otlp/include/opentelemetry/exporters/otlp/otlp_metric_utils.h @@ -26,7 +26,7 @@ class OtlpMetricUtils { public: static opentelemetry::sdk::metrics::AggregationType GetAggregationType( - const opentelemetry::v1::sdk::metrics::MetricData &metric_data) noexcept; + const opentelemetry::sdk::metrics::MetricData &metric_data) noexcept; static proto::metrics::v1::AggregationTemporality GetProtoAggregationTemporality( const opentelemetry::sdk::metrics::AggregationTemporality &aggregation_temporality) noexcept; diff --git a/exporters/otlp/src/otlp_metric_utils.cc b/exporters/otlp/src/otlp_metric_utils.cc index 84c8183eb1..ed1620a56c 100644 --- a/exporters/otlp/src/otlp_metric_utils.cc +++ b/exporters/otlp/src/otlp_metric_utils.cc @@ -25,7 +25,7 @@ proto::metrics::v1::AggregationTemporality OtlpMetricUtils::GetProtoAggregationT } metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType( - const opentelemetry::v1::sdk::metrics::MetricData &metric_data) noexcept + const opentelemetry::sdk::metrics::MetricData &metric_data) noexcept { if (metric_data.point_data_attr_.size() == 0) {