[RFC] Refactor SumAggregation to be strongly typed

exporters/memory/test/in_memory_metric_data_test.cc

@@ -18,11 +18,11 @@
 
 using opentelemetry::exporter::memory::CircularBufferInMemoryMetricData;
 using opentelemetry::exporter::memory::SimpleAggregateInMemoryMetricData;
+using opentelemetry::sdk::metrics::DoubleSumPointData;
 using opentelemetry::sdk::metrics::MetricData;
 using opentelemetry::sdk::metrics::PointDataAttributes;
 using opentelemetry::sdk::metrics::ResourceMetrics;
 using opentelemetry::sdk::metrics::ScopeMetrics;
-using opentelemetry::sdk::metrics::SumPointData;
 using opentelemetry::sdk::resource::Resource;
 
 TEST(InMemoryMetricDataTest, CircularBuffer)
@@ -43,7 +43,7 @@ TEST(InMemoryMetricDataTest, SimpleAggregate)
   auto scope = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
       "my-scope", "1.0.0", "http://example.com");
 
-  SumPointData spd;
+  DoubleSumPointData spd;
   spd.value_ = 42.0;
   PointDataAttributes pda{{{"hello", "world"}}, spd};
 
@@ -55,7 +55,7 @@ TEST(InMemoryMetricDataTest, SimpleAggregate)
       &resource, std::vector<ScopeMetrics>{{scope.get(), std::vector<MetricData>{md}}}}));
   auto it = agg.Get("my-scope", "my-metric").begin();
 
-  auto saved_point = opentelemetry::nostd::get<SumPointData>(it->second);
+  auto saved_point = opentelemetry::nostd::get<DoubleSumPointData>(it->second);
 
-  EXPECT_EQ(opentelemetry::nostd::get<double>(saved_point.value_), 42.0);
+  EXPECT_EQ(saved_point.value_, 42.0);
 }

exporters/ostream/src/metric_exporter.cc

@@ -201,19 +201,18 @@ void OStreamMetricExporter::printInstrumentationInfoMetricData(
 
 void OStreamMetricExporter::printPointData(const opentelemetry::sdk::metrics::PointType &point_data)
 {
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data))
+  if (auto *long_sum_point_data = nostd::get_if<sdk::metrics::LongSumPointData>(&point_data))
   {
-    auto sum_point_data = nostd::get<sdk::metrics::SumPointData>(point_data);
-    sout_ << "\n  type\t\t: SumPointData";
+    sout_ << "\n  type\t\t: LongSumPointData";
     sout_ << "\n  value\t\t: ";
-    if (nostd::holds_alternative<double>(sum_point_data.value_))
-    {
-      sout_ << nostd::get<double>(sum_point_data.value_);
-    }
-    else if (nostd::holds_alternative<int64_t>(sum_point_data.value_))
-    {
-      sout_ << nostd::get<int64_t>(sum_point_data.value_);
-    }
+    sout_ << long_sum_point_data->value_;
+  }
+  else if (auto *double_sum_point_data =
+               nostd::get_if<sdk::metrics::DoubleSumPointData>(&point_data))
+  {
+    sout_ << "\n  type\t\t: DoubleSumPointData";
+    sout_ << "\n  value\t\t: ";
+    sout_ << double_sum_point_data->value_;
   }
   else if (nostd::holds_alternative<sdk::metrics::HistogramPointData>(point_data))
   {

exporters/ostream/test/ostream_metric_test.cc

@@ -40,9 +40,9 @@ TEST(OStreamMetricsExporter, ExportSumPointData)
   auto exporter =
       std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
 
-  metric_sdk::SumPointData sum_point_data{};
+  metric_sdk::DoubleSumPointData sum_point_data{};
   sum_point_data.value_ = 10.0;
-  metric_sdk::SumPointData sum_point_data2{};
+  metric_sdk::DoubleSumPointData sum_point_data2{};
   sum_point_data2.value_ = 20.0;
   metric_sdk::ResourceMetrics data;
   auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -80,11 +80,11 @@ TEST(OStreamMetricsExporter, ExportSumPointData)
       "\n  instrument name\t: library_name"
       "\n  description\t: description"
       "\n  unit\t\t: unit"
-      "\n  type\t\t: SumPointData"
+      "\n  type\t\t: DoubleSumPointData"
       "\n  value\t\t: 10"
       "\n  attributes\t\t: "
       "\n\ta1: b1"
-      "\n  type\t\t: SumPointData"
+      "\n  type\t\t: DoubleSumPointData"
       "\n  value\t\t: 20"
       "\n  attributes\t\t: "
       "\n\ta1: b1"

exporters/otlp/benchmark/otlp_http_metric_exporter_benchmark.cc

@@ -48,7 +48,7 @@ static ResourceMetrics MakeMetrics(std::size_t n_points)
 
   for (std::size_t i = 0; i < n_points; ++i)
   {
-    SumPointData sum;
+    DoubleSumPointData sum;
     sum.value_        = static_cast<double>(i);
     sum.is_monotonic_ = true;
 

exporters/otlp/src/otlp_metric_utils.cc

@@ -55,7 +55,10 @@ metric_sdk::AggregationType OtlpMetricUtils::GetAggregationType(
     return metric_sdk::AggregationType::kDrop;
   }
   auto point_data_with_attributes = metric_data.point_data_attr_[0];
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_with_attributes.point_data))
+  if (nostd::holds_alternative<sdk::metrics::LongSumPointData>(
+          point_data_with_attributes.point_data) ||
+      nostd::holds_alternative<sdk::metrics::DoubleSumPointData>(
+          point_data_with_attributes.point_data))
   {
     return metric_sdk::AggregationType::kSum;
   }
@@ -92,17 +95,23 @@ void OtlpMetricUtils::ConvertSumMetric(const metric_sdk::MetricData &metric_data
     proto::metrics::v1::NumberDataPoint *proto_sum_point_data = sum->add_data_points();
     proto_sum_point_data->set_start_time_unix_nano(start_ts);
     proto_sum_point_data->set_time_unix_nano(ts);
-    const auto &sum_data =
-        nostd::get<sdk::metrics::SumPointData>(point_data_with_attributes.point_data);
 
-    if ((nostd::holds_alternative<int64_t>(sum_data.value_)))
+    const auto *long_sum_data =
+        nostd::get_if<sdk::metrics::LongSumPointData>(&point_data_with_attributes.point_data);
+
+    if (long_sum_data != nullptr)
     {
-      proto_sum_point_data->set_as_int(nostd::get<int64_t>(sum_data.value_));
+      proto_sum_point_data->set_as_int(long_sum_data->value_);
     }
-    else
+
+    const auto *double_sum_data =
+        nostd::get_if<sdk::metrics::DoubleSumPointData>(&point_data_with_attributes.point_data);
+
+    if (double_sum_data != nullptr)
     {
-      proto_sum_point_data->set_as_double(nostd::get<double>(sum_data.value_));
+      proto_sum_point_data->set_as_double(double_sum_data->value_);
     }
+
     // set attributes
     for (auto &kv_attr : point_data_with_attributes.attributes)
     {

exporters/otlp/test/otlp_file_metric_exporter_test.cc

@@ -87,9 +87,9 @@ class OtlpFileMetricExporterTestPeer : public ::testing::Test
 
     auto exporter = OtlpFileMetricExporterFactory::Create(opts);
 
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
     sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data2{};
     sum_point_data2.value_ = 20.0;
     opentelemetry::sdk::metrics::ResourceMetrics data;
 

exporters/otlp/test/otlp_grpc_metric_exporter_test.cc

@@ -396,7 +396,7 @@ TEST_F(OtlpGrpcMetricExporterTestPeer, ExportPartialSuccess)
       mock_stub);
   auto exporter = GetExporter(std::move(stub_interface));
 
-  opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+  opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
   sum_point_data.value_ = 10.0;
   opentelemetry::sdk::metrics::ResourceMetrics data;
   auto resource = opentelemetry::sdk::resource::Resource::Create(

exporters/otlp/test/otlp_http_metric_exporter_test.cc

@@ -168,9 +168,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto client                = mock_otlp_client.second;
     auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
 
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
     sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data2{};
     sum_point_data2.value_ = 20.0;
     opentelemetry::sdk::metrics::ResourceMetrics data;
     auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -268,9 +268,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto client                = mock_otlp_client.second;
     auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
 
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
     sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data2{};
     sum_point_data2.value_ = 20.0;
     opentelemetry::sdk::metrics::ResourceMetrics data;
     auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -486,9 +486,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto client                = mock_otlp_client.second;
     auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
 
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
     sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data2{};
     sum_point_data2.value_ = 20.0;
     opentelemetry::sdk::metrics::ResourceMetrics data;
     auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -754,9 +754,9 @@ class OtlpHttpMetricExporterTestPeer : public ::testing::Test
     auto client                = mock_otlp_client.second;
     auto exporter = GetExporter(std::unique_ptr<OtlpHttpClient>{mock_otlp_http_client});
 
-    opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
     sum_point_data.value_ = 10.0;
-    opentelemetry::sdk::metrics::SumPointData sum_point_data2{};
+    opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data2{};
     sum_point_data2.value_ = 20.0;
     opentelemetry::sdk::metrics::ResourceMetrics data;
     auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -1277,7 +1277,7 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ExportPartialSuccess)
   auto mock_session =
       std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
-  opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+  opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
   sum_point_data.value_ = 10.0;
   opentelemetry::sdk::metrics::ResourceMetrics data;
   auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -1336,7 +1336,7 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ExportPartialSuccessJson)
   auto mock_session =
       std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
-  opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+  opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
   sum_point_data.value_ = 10.0;
   opentelemetry::sdk::metrics::ResourceMetrics data;
   auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -1392,7 +1392,7 @@ TEST_F(OtlpHttpMetricExporterTestPeer, ExportParseFailureReturnsFailure)
   auto mock_session =
       std::static_pointer_cast<http_client::nosend::Session>(no_send_client->session_);
 
-  opentelemetry::sdk::metrics::SumPointData sum_point_data{};
+  opentelemetry::sdk::metrics::DoubleSumPointData sum_point_data{};
   sum_point_data.value_ = 10.0;
   opentelemetry::sdk::metrics::ResourceMetrics data;
   auto resource = opentelemetry::sdk::resource::Resource::Create(

exporters/otlp/test/otlp_metrics_serialization_test.cc

@@ -51,7 +51,7 @@ static metrics_sdk::MetricData CreateSumAggregationData()
   metrics_sdk::InstrumentDescriptor inst_desc = {"Counter", "desc", "unit",
                                                  metrics_sdk::InstrumentType::kCounter,
                                                  metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
+  metrics_sdk::DoubleSumPointData s_data_1, s_data_2;
   s_data_1.value_ = 10.2;
   s_data_2.value_ = 20.2;
 
@@ -78,7 +78,7 @@ static metrics_sdk::MetricData CreateUpDownCounterAggregationData()
   metrics_sdk::InstrumentDescriptor inst_desc = {"UpDownCounter", "Robot Pose Y", "Meter",
                                                  metrics_sdk::InstrumentType::kUpDownCounter,
                                                  metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
+  metrics_sdk::DoubleSumPointData s_data_1, s_data_2;
   s_data_1.value_ = 1.35;
   s_data_2.value_ = 1.37;
 
@@ -219,7 +219,7 @@ static metrics_sdk::MetricData CreateObservableCounterAggregationData()
   metrics_sdk::InstrumentDescriptor inst_desc = {
       "ObservableCounter", "test description", "test unit",
       metrics_sdk::InstrumentType::kObservableCounter, metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2;
+  metrics_sdk::DoubleSumPointData s_data_1, s_data_2;
   s_data_1.value_ = 1.23;
   s_data_2.value_ = 4.56;
 
@@ -247,7 +247,7 @@ static metrics_sdk::MetricData CreateObservableUpDownCounterAggregationData()
       "ObservableUpDownCounter", "test description", "test unit",
       metrics_sdk::InstrumentType::kObservableUpDownCounter,
       metrics_sdk::InstrumentValueType::kDouble};
-  metrics_sdk::SumPointData s_data_1, s_data_2, s_data_3;
+  metrics_sdk::DoubleSumPointData s_data_1, s_data_2, s_data_3;
   s_data_1.value_ = 1.23;
   s_data_2.value_ = 4.56;
   s_data_3.value_ = 2.34;
@@ -468,7 +468,7 @@ TEST(OtlpMetricSerializationTest, AttributeTypes)
                                   metrics_sdk::InstrumentType::kCounter,
                                   metrics_sdk::InstrumentValueType::kDouble};
 
-  metrics_sdk::SumPointData point;
+  metrics_sdk::DoubleSumPointData point;
   point.value_ = 1.0;
 
   const std::array<uint8_t, 4> byte_values                             = {0xDE, 0xAD, 0xBE, 0xEF};

exporters/prometheus/src/exporter_utils.cc

@@ -149,7 +149,16 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
       bool is_monotonic  = true;
       if (kind == sdk::metrics::AggregationType::kSum)
       {
-        is_monotonic = nostd::get<sdk::metrics::SumPointData>(front.point_data).is_monotonic_;
+        if (auto *long_point_data =
+                nostd::get_if<sdk::metrics::LongSumPointData>(&front.point_data))
+        {
+          is_monotonic = long_point_data->is_monotonic_;
+        }
+        else if (auto *double_point_data =
+                     nostd::get_if<sdk::metrics::DoubleSumPointData>(&front.point_data))
+        {
+          is_monotonic = double_point_data->is_monotonic_;
+        }
       }
       const prometheus_client::MetricType type = TranslateType(kind, is_monotonic);
       metric_family.name = MapToPrometheusName(metric_data.instrument_descriptor.name_,
@@ -191,10 +200,20 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
             SetData(values, point_data_attr.attributes, scope, type, &metric_family,
                     data.resource_);
           }
-          else if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_attr.point_data))
+          else if (nostd::holds_alternative<sdk::metrics::LongSumPointData>(
+                       point_data_attr.point_data))
+          {
+            auto sum_point_data =
+                nostd::get<sdk::metrics::LongSumPointData>(point_data_attr.point_data);
+            std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
+            SetData(values, point_data_attr.attributes, scope, type, &metric_family,
+                    data.resource_);
+          }
+          else if (nostd::holds_alternative<sdk::metrics::DoubleSumPointData>(
+                       point_data_attr.point_data))
           {
             auto sum_point_data =
-                nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data);
+                nostd::get<sdk::metrics::DoubleSumPointData>(point_data_attr.point_data);
             std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
             SetData(values, point_data_attr.attributes, scope, type, &metric_family,
                     data.resource_);
@@ -208,10 +227,19 @@ std::vector<prometheus_client::MetricFamily> PrometheusExporterUtils::TranslateT
         }
         else  // Counter, Untyped
         {
-          if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_data_attr.point_data))
+          if (nostd::holds_alternative<sdk::metrics::LongSumPointData>(point_data_attr.point_data))
+          {
+            auto sum_point_data =
+                nostd::get<sdk::metrics::LongSumPointData>(point_data_attr.point_data);
+            std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
+            SetData(values, point_data_attr.attributes, scope, type, &metric_family,
+                    data.resource_);
+          }
+          else if (nostd::holds_alternative<sdk::metrics::DoubleSumPointData>(
+                       point_data_attr.point_data))
           {
             auto sum_point_data =
-                nostd::get<sdk::metrics::SumPointData>(point_data_attr.point_data);
+                nostd::get<sdk::metrics::DoubleSumPointData>(point_data_attr.point_data);
             std::vector<metric_sdk::ValueType> values{sum_point_data.value_};
             SetData(values, point_data_attr.attributes, scope, type, &metric_family,
                     data.resource_);
@@ -539,7 +567,8 @@ metric_sdk::AggregationType PrometheusExporterUtils::getAggregationType(
     const metric_sdk::PointType &point_type)
 {
 
-  if (nostd::holds_alternative<sdk::metrics::SumPointData>(point_type))
+  if (nostd::holds_alternative<sdk::metrics::LongSumPointData>(point_type) ||
+      nostd::holds_alternative<sdk::metrics::DoubleSumPointData>(point_type))
   {
     return metric_sdk::AggregationType::kSum;
   }

exporters/prometheus/test/collector_test.cc

@@ -35,7 +35,7 @@ class MockMetricProducer : public MetricProducer
   {
     std::this_thread::sleep_for(sleep_ms_);
     data_sent_size_++;
-    ResourceMetrics data = test_data_points_.CreateSumPointData();
+    ResourceMetrics data = test_data_points_.CreateDoubleSumPointData();
     return {data, MetricProducer::Status::kSuccess};
   }
 

exporters/prometheus/test/exporter_utils_test.cc

@@ -169,7 +169,7 @@ TEST(PrometheusExporterUtils, TranslateToPrometheusIntegerCounter)
        {"service.instance.id", "localhost:8000"},
        {"custom_resource_attr", "custom_resource_value"}});
   TestDataPoints dp;
-  metric_sdk::ResourceMetrics metrics_data = dp.CreateSumPointData();
+  metric_sdk::ResourceMetrics metrics_data = dp.CreateDoubleSumPointData();
   metrics_data.resource_                   = &resource;
 
   auto translated = PrometheusExporterUtils::TranslateToPrometheus(metrics_data);