Fixed the prometheus push tests (taken from opentelemetry-cpp-contrib…

…) which were creating instrumentation scope and destroying it thus making the test flaky. Instead the scope is created once as it's done in the other test helper
malkia · Feb 15, 2024 · 9248a06 · 9248a06
1 parent f42c42c
commit 9248a06
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -1,5 +1,7 @@
 common --noexperimental_merged_skyframe_analysis_execution
 
+test --flaky_test_attempts=10
+
 # Copyright The OpenTelemetry Authors
 # SPDX-License-Identifier: Apache-2.0
 common --nolegacy_external_runfiles

diff --git a/exporters/prometheus/BUILD b/exporters/prometheus/BUILD
@@ -178,6 +178,7 @@ cc_library(
 
 cc_test(
     name = "prometheus_push_exporter_test",
+    flaky = True,
     srcs = [
         "test/push_exporter_test.cc",
     ],

diff --git a/exporters/prometheus/test/prometheus_push_test_helper.h b/exporters/prometheus/test/prometheus_push_test_helper.h
@@ -15,6 +15,9 @@ namespace exportermetrics = opentelemetry::exporter::metrics;
 namespace
 {  // NOLINT
 
+  auto instrumentation_scope =
+      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name", "1.9.1");
+
 inline opentelemetry::sdk::resource::Resource &GetEmptyResource()
 {
   static auto resource = opentelemetry::sdk::resource::Resource::Create(
@@ -33,9 +36,6 @@ inline metric_sdk::ResourceMetrics CreateSumPointData()
   sum_point_data2.value_ = 20.0;
   metric_sdk::ResourceMetrics data;
   data.resource_ = &GetEmptyResource();
-  auto instrumentation_scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
-                                                                             "1.9.1");
   metric_sdk::MetricData metric_data{
       metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
                                        metric_sdk::InstrumentType::kCounter,
@@ -65,9 +65,6 @@ inline metric_sdk::ResourceMetrics CreateHistogramPointData()
 
   metric_sdk::ResourceMetrics data;
   data.resource_ = &GetEmptyResource();
-  auto instrumentation_scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
-                                                                             "1.9.1");
   metric_sdk::MetricData metric_data{
       metric_sdk::InstrumentDescriptor{"library_name", "description", "unit",
                                        metric_sdk::InstrumentType::kHistogram,
@@ -86,9 +83,6 @@ inline metric_sdk::ResourceMetrics CreateLastValuePointData()
 {
   metric_sdk::ResourceMetrics data;
   data.resource_ = &GetEmptyResource();
-  auto instrumentation_scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
-                                                                             "1.2.0");
   metric_sdk::LastValuePointData last_value_point_data{};
   last_value_point_data.value_              = 10.0;
   last_value_point_data.is_lastvalue_valid_ = true;
@@ -115,9 +109,6 @@ inline metric_sdk::ResourceMetrics CreateDropPointData()
 {
   metric_sdk::ResourceMetrics data;
   data.resource_ = &GetEmptyResource();
-  auto instrumentation_scope =
-      opentelemetry::sdk::instrumentationscope::InstrumentationScope::Create("library_name",
-                                                                             "1.2.0");
   metric_sdk::DropPointData drop_point_data{};
   metric_sdk::DropPointData drop_point_data2{};
   metric_sdk::MetricData metric_data{

diff --git a/exporters/prometheus/test/push_exporter_test.cc b/exporters/prometheus/test/push_exporter_test.cc
@@ -136,8 +136,6 @@ TEST(PrometheusPushExporter, CollectionNotEnoughSpace)
 
   int max_collection_size = exporter.GetMaxCollectionSize();
 
-  GTEST_LOG_(INFO) << max_collection_size;
-
   // send export request to fill the
   // collection in the collector
   ExportResult code = ExportResult::kSuccess;