Build with otel-cpp v1.11.0 & use Cumulative temporality for UpDownCounter (#329)

Author: lalitb

.github/workflows/geneva_metrics.yml

@@ -11,8 +11,8 @@ on:
     paths:
       - "exporters/geneva/**"
       - ".github/workflows/geneva_metrics.yml"
-  
- cmake_linux:
+jobs:
+  cmake_linux:
     name: CMake on Linux
     runs-on: ubuntu-latest
     steps:
@@ -24,7 +24,7 @@ on:
         uses: actions/checkout@v3
         with:
           repository: "open-telemetry/opentelemetry-cpp"
-          ref: "v1.8.2"
+          ref: "v1.11.0"
           path: "otel_cpp"
           submodules: "recursive"
       - name: setup
@@ -34,13 +34,15 @@ on:
             ca-certificates wget git valgrind lcov
       - name: run tests
         run: |
+          sudo $GITHUB_WORKSPACE/otel_cpp/ci/setup_cmake.sh
           mkdir -p "$GITHUB_WORKSPACE/otel_cpp/build"
           cd "$GITHUB_WORKSPACE/otel_cpp/build"
-          cmake .. -DCMAKE_BUILD_TYPE=Debug 
-          cmake --build . -j --config Debug
-          cmake --install . --prefix "$HOME/prebuilt-otel" --config Debug
+          cmake .. -DOPENTELEMETRY_INSTALL=ON
+          cmake --build . -j${nproc}
+          cmake --install . --prefix "$HOME/prebuilt-otel"
           mkdir -p "$GITHUB_WORKSPACE/otel_cpp_contrib/exporters/geneva/build"
           cd "$GITHUB_WORKSPACE/otel_cpp_contrib/exporters/geneva/build"
-          cmake .. "-DCMAKE_PREFIX_PATH=$HOME/prebuilt-otel" -DCMAKE_BUILD_TYPE=Debug \
+          cmake .. "-DCMAKE_PREFIX_PATH=$HOME/prebuilt-otel" \
             -DBUILD_TESTING=ON -DBUILD_EXAMPLE=ON
-          cmake --build . -j --config Debug
+          cmake --build . -j${nproc}
+          ctest

exporters/geneva/example/example_metrics.cc

@@ -55,11 +55,11 @@ void initMetrics(const std::string &name, const std::string &account_name) {
   std::string counter_name = name + "_counter";
   std::unique_ptr<metric_sdk::InstrumentSelector> instrument_selector{
       new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kCounter,
-                                         counter_name)};
+                                         counter_name, "")};
   std::unique_ptr<metric_sdk::MeterSelector> meter_selector{
       new metric_sdk::MeterSelector(name, version, schema)};
   std::unique_ptr<metric_sdk::View> sum_view{new metric_sdk::View{
-      name, "description", metric_sdk::AggregationType::kSum}};
+      name, "description", "", metric_sdk::AggregationType::kSum}};
   p->AddView(std::move(instrument_selector), std::move(meter_selector),
              std::move(sum_view));
 
@@ -68,11 +68,11 @@ void initMetrics(const std::string &name, const std::string &account_name) {
   std::unique_ptr<metric_sdk::InstrumentSelector>
       observable_instrument_selector{new metric_sdk::InstrumentSelector(
           metric_sdk::InstrumentType::kObservableCounter,
-          observable_counter_name)};
+          observable_counter_name, "")};
   std::unique_ptr<metric_sdk::MeterSelector> observable_meter_selector{
       new metric_sdk::MeterSelector(name, version, schema)};
   std::unique_ptr<metric_sdk::View> observable_sum_view{new metric_sdk::View{
-      name, "description", metric_sdk::AggregationType::kSum}};
+      name, "description", "", metric_sdk::AggregationType::kSum}};
   p->AddView(std::move(observable_instrument_selector),
              std::move(observable_meter_selector),
              std::move(observable_sum_view));
@@ -81,7 +81,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
   std::string histogram_name = name + "_histogram";
   std::unique_ptr<metric_sdk::InstrumentSelector> histogram_instrument_selector{
       new metric_sdk::InstrumentSelector(metric_sdk::InstrumentType::kHistogram,
-                                         histogram_name)};
+                                         histogram_name, "")};
   std::unique_ptr<metric_sdk::MeterSelector> histogram_meter_selector{
       new metric_sdk::MeterSelector(name, version, schema)};
   std::shared_ptr<opentelemetry::sdk::metrics::AggregationConfig>
@@ -92,7 +92,7 @@ void initMetrics(const std::string &name, const std::string &account_name) {
       ->boundaries_ = std::vector<double>{0.0,   50.0,   100.0,  250.0,  500.0,
                                         750.0, 1000.0, 2500.0, 5000.0, 10000.0};
   std::unique_ptr<metric_sdk::View> histogram_view{new metric_sdk::View{
-      name, "description", metric_sdk::AggregationType::kHistogram,
+      name, "description", "", metric_sdk::AggregationType::kHistogram,
       aggregation_config}};
   p->AddView(std::move(histogram_instrument_selector),
              std::move(histogram_meter_selector), std::move(histogram_view));

exporters/geneva/example/stress_test_linux.cc

@@ -28,9 +28,11 @@
 #include <chrono>
 #include <sys/times.h>
 
+#ifdef HAVE_BOOST
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_io.hpp>
 #include <boost/uuid/uuid_generators.hpp>
+#endif
 
 namespace metrics_sdk      = opentelemetry::sdk::metrics;
 namespace nostd           = opentelemetry::nostd;

exporters/geneva/include/opentelemetry/exporters/geneva/metrics/exporter.h

@@ -4,10 +4,13 @@
 #pragma once
 
 #include "opentelemetry/common/spin_lock_mutex.h"
+#include "opentelemetry/common/timestamp.h"
 #include "opentelemetry/exporters/geneva/metrics/connection_string_parser.h"
 #include "opentelemetry/exporters/geneva/metrics/data_transport.h"
 #include "opentelemetry/exporters/geneva/metrics/exporter_options.h"
 #include "opentelemetry/sdk/metrics/push_metric_exporter.h"
+#include "opentelemetry/sdk/metrics/data/metric_data.h"
+
 
 OPENTELEMETRY_BEGIN_NAMESPACE
 namespace exporter {

exporters/geneva/src/exporter.cc

@@ -7,7 +7,7 @@
 #ifdef _WIN32
 #include "opentelemetry/exporters/geneva/metrics/etw_data_transport.h"
 #endif
-#include "opentelemetry/metrics/meter_provider.h"
+#include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk_config.h"
 
 #include <memory>
@@ -46,6 +46,10 @@ Exporter::Exporter(const ExporterOptions &options)
 
 sdk::metrics::AggregationTemporality Exporter::GetAggregationTemporality(
     sdk::metrics::InstrumentType instrument_type) const noexcept {
+  if (instrument_type == sdk::metrics::InstrumentType::kUpDownCounter)
+    {
+      return sdk::metrics::AggregationTemporality::kCumulative;
+    }
   return sdk::metrics::AggregationTemporality::kDelta;
 }
 

exporters/geneva/test/common/generate_metrics.h

@@ -2,6 +2,7 @@
 #include "opentelemetry/sdk/metrics/export/metric_producer.h"
 #include "opentelemetry/sdk/metrics/instruments.h"
 #include "opentelemetry/sdk/resource/resource.h"
+#include "opentelemetry/sdk/instrumentationscope/instrumentation_scope.h"
 
 #include<vector>
 
@@ -178,7 +179,7 @@ GenerateSumDataLongMetricsNonMonotonic(
           kUpDownCounterLongInstrumentUnit,
           opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter,
           opentelemetry::sdk::metrics::InstrumentValueType::kLong},
-      opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
+      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
       opentelemetry::common::SystemTimestamp{std::chrono::system_clock::now()},
       opentelemetry::common::SystemTimestamp{std::chrono::system_clock::now()},
       std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{
@@ -233,7 +234,7 @@ GenerateSumDataDoubleMetricsNonMonotonic(
           kUpDownCounterDoubleInstrumentUnit,
           opentelemetry::sdk::metrics::InstrumentType::kUpDownCounter,
           opentelemetry::sdk::metrics::InstrumentValueType::kDouble},
-      opentelemetry::sdk::metrics::AggregationTemporality::kDelta,
+      opentelemetry::sdk::metrics::AggregationTemporality::kCumulative,
       opentelemetry::common::SystemTimestamp{std::chrono::system_clock::now()},
       opentelemetry::common::SystemTimestamp{std::chrono::system_clock::now()},
       std::vector<opentelemetry::sdk::metrics::PointDataAttributes>{