From 1ce768f965f5f0950e5233af66a6a9264a63cd6b Mon Sep 17 00:00:00 2001 From: Petr Styblo Date: Wed, 29 Nov 2023 10:05:25 +0100 Subject: [PATCH] currencyservice: update opentelemetry-cpp to 1.12.0 (#1275) --- CHANGELOG.md | 2 ++ src/currencyservice/Dockerfile | 2 +- src/currencyservice/src/meter_common.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c024a49838..3cfe2273b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ release. ## Unreleased +* [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 index bb5b998221..9b0a85f855 100644 --- a/src/currencyservice/Dockerfile +++ b/src/currencyservice/Dockerfile @@ -19,7 +19,7 @@ FROM alpine RUN apk update RUN apk add git cmake make g++ grpc-dev re2-dev protobuf-dev c-ares-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 index 4deae86fa9..6167e9edfb 100644 --- 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