Merge branch 'main' into currencyservice-multistage

open-telemetry · Nov 29, 2023 · 9c7cc8c · 9c7cc8c
2 parents 836ceda + 1ce768f
commit 9c7cc8c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ release.
 
 * [currencyservice] bring back multistage build
   ([#1276](https://github.com/open-telemetry/opentelemetry-demo/pull/1276))
+* [currencyservice]: update opentelemetry-cpp to 1.12.0
+  ([#1275](https://github.com/open-telemetry/opentelemetry-demo/pull/1275))
 * update loadgenerator dependencies and the base image
   ([#1274](https://github.com/open-telemetry/opentelemetry-demo/pull/1274))
 * add env var for pinning trace-based test tool version

diff --git a/src/currencyservice/Dockerfile b/src/currencyservice/Dockerfile
@@ -18,7 +18,7 @@ FROM alpine as builder
 
 RUN apk update && apk add git cmake make g++ grpc-dev protobuf-dev
 
-ARG OPENTELEMETRY_CPP_VERSION=1.10.0
+ARG OPENTELEMETRY_CPP_VERSION=1.12.0
 
 RUN git clone https://github.com/open-telemetry/opentelemetry-cpp \
 	  && cd opentelemetry-cpp/ \

diff --git a/src/currencyservice/src/meter_common.h b/src/currencyservice/src/meter_common.h
@@ -26,7 +26,7 @@ namespace
     otlp_exporter::OtlpGrpcMetricExporterOptions otlpOptions;
 
     // Configuration via environment variable not supported yet
-    otlpOptions.aggregation_temporality = metric_sdk::AggregationTemporality::kDelta;
+    otlpOptions.aggregation_temporality = otlp_exporter::PreferredAggregationTemporality::kDelta;
     auto exporter = otlp_exporter::OtlpGrpcMetricExporterFactory::Create(otlpOptions);
 
     // Build MeterProvider and Reader