Merge branch 'main' into cmake-config-find-dependencies

Author: marcalff

CMakeLists.txt

@@ -287,6 +287,10 @@ option(WITH_ASYNC_EXPORT_PREVIEW "Whether to enable async export" OFF)
 option(WITH_METRICS_EXEMPLAR_PREVIEW
        "Whether to enable exemplar within metrics" OFF)
 
+option(OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS
+       "Whether to build test libraries that are always linked as shared libs"
+       OFF)
+
 #
 # Verify options dependencies
 #

MODULE.bazel

@@ -3,7 +3,7 @@
 
 module(
     name = "opentelemetry-cpp",
-    version = "1.16.1",
+    version = "1.17.0",
     compatibility_level = 0,
     repo_name = "io_opentelemetry_cpp",
 )

api/test/CMakeLists.txt

@@ -10,4 +10,7 @@ add_subdirectory(metrics)
 add_subdirectory(logs)
 add_subdirectory(common)
 add_subdirectory(baggage)
-add_subdirectory(singleton)
+
+if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
+  add_subdirectory(singleton)
+endif()

examples/plugin/CMakeLists.txt

@@ -2,4 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_subdirectory(load)
-add_subdirectory(plugin)
+
+if(NOT OPENTELEMETRY_SKIP_DYNAMIC_LOADING_TESTS)
+  add_subdirectory(plugin)
+endif()

exporters/memory/src/in_memory_metric_data.cc

@@ -31,7 +31,9 @@ void SimpleAggregateInMemoryMetricData::Add(std::unique_ptr<ResourceMetrics> res
       const auto &metric = m.instrument_descriptor.name_;
       for (const auto &pda : m.point_data_attr_)
       {
-        data_[{scope, metric}].insert({pda.attributes, pda.point_data});
+        // NOTE: Explicit type conversion added for C++11 (gcc 4.8)
+        data_[std::tuple<std::string, std::string>{scope, metric}].insert(
+            {pda.attributes, pda.point_data});
       }
     }
   }
@@ -41,7 +43,8 @@ const SimpleAggregateInMemoryMetricData::AttributeToPoint &SimpleAggregateInMemo
     const std::string &scope,
     const std::string &metric)
 {
-  return data_[{scope, metric}];
+  // NOTE: Explicit type conversion added for C++11 (gcc 4.8)
+  return data_[std::tuple<std::string, std::string>{scope, metric}];
 }
 
 void SimpleAggregateInMemoryMetricData::Clear()

exporters/memory/src/in_memory_metric_exporter_factory.cc

@@ -49,7 +49,7 @@ class InMemoryMetricExporter final : public sdk::metrics::PushMetricExporter
       OTEL_INTERNAL_LOG_ERROR("[In Memory Metric Exporter] Exporting failed, exporter is shutdown");
       return ExportResult::kFailure;
     }
-    data_->Add(std::make_unique<ResourceMetrics>(data));
+    data_->Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{data}));
     return ExportResult::kSuccess;
   }
 
@@ -78,14 +78,15 @@ class InMemoryMetricExporter final : public sdk::metrics::PushMetricExporter
 std::unique_ptr<PushMetricExporter> InMemoryMetricExporterFactory::Create(
     const std::shared_ptr<InMemoryMetricData> &data)
 {
-  return Create(data, [](auto) { return AggregationTemporality::kCumulative; });
+  return Create(data,
+                [](sdk::metrics::InstrumentType) { return AggregationTemporality::kCumulative; });
 }
 
 std::unique_ptr<PushMetricExporter> InMemoryMetricExporterFactory::Create(
     const std::shared_ptr<InMemoryMetricData> &data,
     const AggregationTemporalitySelector &temporality)
 {
-  return std::make_unique<InMemoryMetricExporter>(data, temporality);
+  return std::unique_ptr<InMemoryMetricExporter>(new InMemoryMetricExporter{data, temporality});
 }
 
 }  // namespace memory

exporters/memory/test/in_memory_metric_data_test.cc

@@ -23,8 +23,8 @@ TEST(InMemoryMetricDataTest, CircularBuffer)
 {
   CircularBufferInMemoryMetricData buf(10);
   Resource resource = Resource::GetEmpty();
-  buf.Add(std::make_unique<ResourceMetrics>(
-      &resource, std::vector<ScopeMetrics>{{nullptr, std::vector<MetricData>{}}}));
+  buf.Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{
+      &resource, std::vector<ScopeMetrics>{{nullptr, std::vector<MetricData>{}}}}));
   EXPECT_EQ((*buf.Get().begin())->resource_, &resource);
 }
 
@@ -45,8 +45,8 @@ TEST(InMemoryMetricDataTest, SimpleAggregate)
   md.instrument_descriptor.name_ = "my-metric";
   md.point_data_attr_.push_back(pda);
 
-  agg.Add(std::make_unique<ResourceMetrics>(
-      &resource, std::vector<ScopeMetrics>{{scope.get(), std::vector<MetricData>{md}}}));
+  agg.Add(std::unique_ptr<ResourceMetrics>(new ResourceMetrics{
+      &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);

exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_options.h

@@ -28,6 +28,12 @@ struct PrometheusExporterOptions
 
   // Populating otel_scope_name/otel_scope_labels attributes
   bool without_otel_scope = false;
+
+  // Option to export metrics without the unit suffix
+  bool without_units = false;
+
+  // Option to export metrics without the type suffix
+  bool without_type_suffix = false;
 };
 
 }  // namespace metrics

exporters/prometheus/include/opentelemetry/exporters/prometheus/exporter_utils.h

@@ -30,12 +30,18 @@ class PrometheusExporterUtils
    * @param populate_target_info whether to populate target_info
    * @param without_otel_scope whether to populate otel_scope_name and otel_scope_version
    * attributes
+   * @param without_units exporter configuration controlling whether to append unit suffix in
+   * the exported metrics.
+   * @param without_type_suffix exporter configuration controlling whether to append type suffix in
+   * the exported metrics.
    * @return a collection of translated metrics that is acceptable by Prometheus
    */
   static std::vector<::prometheus::MetricFamily> TranslateToPrometheus(
       const sdk::metrics::ResourceMetrics &data,
       bool populate_target_info = true,
-      bool without_otel_scope   = false);
+      bool without_otel_scope   = false,
+      bool without_units        = false,
+      bool without_type_suffix  = false);
 
 private:
   /**
@@ -61,7 +67,9 @@ class PrometheusExporterUtils
 
   static std::string MapToPrometheusName(const std::string &name,
                                          const std::string &unit,
-                                         ::prometheus::MetricType prometheus_type);
+                                         ::prometheus::MetricType prometheus_type,
+                                         bool without_units,
+                                         bool without_type_suffix);
 
   /**
    * A utility function that returns the equivalent Prometheus name for the provided OTLP metric

exporters/prometheus/src/exporter_options.cc

@@ -48,10 +48,33 @@ inline bool GetPrometheusPopulateTargetInfo()
   return exists ? setting : true;
 }
 
+inline bool GetPrometheusWithoutUnits()
+{
+  constexpr char kPrometheusWithoutUnits[] = "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_UNITS";
+  bool setting;
+  const auto exists =
+      opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutUnits, setting);
+
+  return exists ? setting : false;
+}
+
+inline bool GetPrometheusWithoutTypeSuffix()
+{
+  constexpr char kPrometheusWithoutTypeSuffix[] =
+      "OTEL_CPP_PROMETHEUS_EXPORTER_WITHOUT_TYPE_SUFFIX";
+  bool setting;
+  const auto exists =
+      opentelemetry::sdk::common::GetBoolEnvironmentVariable(kPrometheusWithoutTypeSuffix, setting);
+
+  return exists ? setting : false;
+}
+
 PrometheusExporterOptions::PrometheusExporterOptions()
     : url(GetPrometheusDefaultHttpEndpoint()),
       populate_target_info(GetPrometheusPopulateTargetInfo()),
-      without_otel_scope(GetPrometheusWithoutOtelScope())
+      without_otel_scope(GetPrometheusWithoutOtelScope()),
+      without_units(GetPrometheusWithoutUnits()),
+      without_type_suffix(GetPrometheusWithoutTypeSuffix())
 {}
 
 }  // namespace metrics