Update the osstream_metric_test with ExponentialHistogram

Author: felipesantosk

exporters/ostream/src/metric_exporter.cc

@@ -261,7 +261,7 @@ void OStreamMetricExporter::printPointData(const opentelemetry::sdk::metrics::Po
       sout_ << "\n  max: " << histogram_point_data.max_;
     }
     sout_ << "\n  scale: " << histogram_point_data.scale_;
-    sout_ << "\n  positive buckets: ";
+    sout_ << "\n  positive buckets:";
     if (!histogram_point_data.positive_buckets_.Empty())
     {
       for (auto i = histogram_point_data.positive_buckets_.StartIndex();
@@ -270,7 +270,7 @@ void OStreamMetricExporter::printPointData(const opentelemetry::sdk::metrics::Po
         sout_ << "\n\t" << i << ": " << histogram_point_data.positive_buckets_.Get(i);
       }
     }
-    sout_ << "\n  negative buckets: ";
+    sout_ << "\n  negative buckets:";
     if (!histogram_point_data.negative_buckets_.Empty())
     {
       for (auto i = histogram_point_data.negative_buckets_.StartIndex();

exporters/ostream/test/ostream_metric_test.cc

@@ -179,6 +179,115 @@ TEST(OStreamMetricsExporter, ExportHistogramPointData)
   ASSERT_EQ(stdoutOutput.str(), expected_output);
 }
 
+TEST(OStreamMetricsExporter, ExportBase2ExponentialHistogramPointData)
+{
+  auto exporter =
+      std::unique_ptr<metric_sdk::PushMetricExporter>(new exportermetrics::OStreamMetricExporter);
+
+  metric_sdk::Base2ExponentialHistogramPointData histogram_point_data1;
+  histogram_point_data1.count_          = 3;
+  histogram_point_data1.sum_            = 6.5;
+  histogram_point_data1.min_            = 0.0;
+  histogram_point_data1.max_            = 3.5;
+  histogram_point_data1.scale_          = 3;
+  histogram_point_data1.record_min_max_ = true;
+  histogram_point_data1.zero_count_     = 1;
+  histogram_point_data1.positive_buckets_ =
+      opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);
+  histogram_point_data1.negative_buckets_ =
+      opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);
+  histogram_point_data1.positive_buckets_.Increment(1, 1);
+  histogram_point_data1.negative_buckets_.Increment(-2, 1);
+
+  metric_sdk::Base2ExponentialHistogramPointData histogram_point_data2;
+  histogram_point_data2.count_          = 4;
+  histogram_point_data2.sum_            = 6.2;
+  histogram_point_data2.min_            = -0.03;
+  histogram_point_data2.max_            = 3.5;
+  histogram_point_data2.scale_          = 3;
+  histogram_point_data2.record_min_max_ = false;
+  histogram_point_data2.zero_count_     = 2;
+  histogram_point_data2.positive_buckets_ =
+      opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);
+  histogram_point_data2.negative_buckets_ =
+      opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);
+  histogram_point_data2.positive_buckets_.Increment(3, 1);
+  histogram_point_data2.negative_buckets_.Increment(-2, 1);
+  histogram_point_data2.negative_buckets_.Increment(-4, 2);
+
+  metric_sdk::ResourceMetrics data;
+  auto resource = opentelemetry::sdk::resource::Resource::Create(
+      opentelemetry::sdk::resource::ResourceAttributes{});
+  data.resource_ = &resource;
+  auto scope     = opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create(
+      "library_name", "1.2.0");
+  metric_sdk::MetricData metric_data{
+      metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
+                                       metric_sdk::InstrumentType::kCounter,
+                                       metric_sdk::InstrumentValueType::kDouble},
+      metric_sdk::AggregationTemporality::kDelta, opentelemetry::common::SystemTimestamp{},
+      opentelemetry::common::SystemTimestamp{},
+      std::vector<metric_sdk::PointDataAttributes>{
+          {metric_sdk::PointAttributes{{"a1", "b1"}, {"a2", "b2"}}, histogram_point_data1},
+          {metric_sdk::PointAttributes{{"a1", "b1"}}, histogram_point_data2}}};
+  data.scope_metric_data_ = std::vector<metric_sdk::ScopeMetrics>{
+      {scope.get(), std::vector<metric_sdk::MetricData>{metric_data}}};
+
+  std::stringstream stdoutOutput;
+  std::streambuf *sbuf = std::cout.rdbuf();
+  std::cout.rdbuf(stdoutOutput.rdbuf());
+
+  auto result = exporter->Export(data);
+  EXPECT_EQ(result, opentelemetry::sdk::common::ExportResult::kSuccess);
+  std::cout.rdbuf(sbuf);
+
+  std::string expected_output =
+      "{"
+      "\n  scope name\t: library_name"
+      "\n  schema url\t: "
+      "\n  version\t: 1.2.0"
+      "\n  start time\t: Thu Jan  1 00:00:00 1970"
+      "\n  end time\t: Thu Jan  1 00:00:00 1970"
+      "\n  instrument name\t: library_name"
+      "\n  description\t: description"
+      "\n  unit\t\t: unit"
+      "\n  type: Base2ExponentialHistogramPointData"
+      "\n  count: 3"
+      "\n  sum: 6.5"
+      "\n  zero_count: 1"
+      "\n  min: 0"
+      "\n  max: 3.5"
+      "\n  scale: 3"
+      "\n  positive buckets:"
+      "\n\t1: 1"
+      "\n  negative buckets:"
+      "\n\t-2: 1"
+      "\n  attributes\t\t: "
+      "\n\ta1: b1"
+      "\n\ta2: b2"
+      "\n  type: Base2ExponentialHistogramPointData"
+      "\n  count: 4"
+      "\n  sum: 6.2"
+      "\n  zero_count: 2"
+      "\n  scale: 3"
+      "\n  positive buckets:"
+      "\n\t3: 1"
+      "\n  negative buckets:"
+      "\n\t-4: 2"
+      "\n\t-3: 0"
+      "\n\t-2: 1"
+      "\n  attributes\t\t: "
+      "\n\ta1: b1"
+      "\n  resources\t:"
+      "\n\tservice.name: unknown_service"
+      "\n\ttelemetry.sdk.language: cpp"
+      "\n\ttelemetry.sdk.name: opentelemetry"
+      "\n\ttelemetry.sdk.version: ";
+  expected_output += OPENTELEMETRY_SDK_VERSION;
+  expected_output += "\n}\n";
+  ASSERT_EQ(stdoutOutput.str(), expected_output);
+}
+
 TEST(OStreamMetricsExporter, ExportLastValuePointData)
 {
   auto exporter =

exporters/otlp/test/otlp_metrics_serialization_test.cc

@@ -141,7 +141,7 @@ static metrics_sdk::MetricData CreateExponentialHistogramAggregationData(
   s_data_1.min_              = 0.0;
   s_data_1.max_              = 3.5;
   s_data_1.scale_            = 3;
-  s_data_2.record_min_max_   = true;
+  s_data_1.record_min_max_   = true;
   s_data_1.zero_count_       = 1;
   s_data_1.positive_buckets_ = opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);
   s_data_1.negative_buckets_ = opentelemetry::sdk::metrics::AdaptingCircularBufferCounter(10);