fix: update opentelemetry-demo to fix build error

currencyservice was not able to build c.f. * open-telemetry/opentelemetry-demo#1275 * open-telemetry/opentelemetry-demo#1296
mrasu · Mar 22, 2024 · eb57263 · eb57263
1 parent fd41774
commit eb57263
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/create-echoed/template/base/example/opentelemetry-demo/src/currencyservice/Dockerfile b/create-echoed/template/base/example/opentelemetry-demo/src/currencyservice/Dockerfile
@@ -14,22 +14,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM alpine
+FROM alpine:3.18 as builder
 
-RUN apk update
-RUN apk add git cmake make g++ grpc-dev re2-dev protobuf-dev c-ares-dev
+RUN apk update && apk add git cmake make g++ grpc-dev protobuf-dev linux-headers
 
-ARG OPENTELEMETRY_CPP_VERSION=1.10.0
+ARG OPENTELEMETRY_CPP_VERSION=1.13.0
 
 RUN git clone https://github.com/open-telemetry/opentelemetry-cpp \
-	&& cd opentelemetry-cpp/ \
-    	&& git checkout tags/v${OPENTELEMETRY_CPP_VERSION} -b v${OPENTELEMETRY_CPP_VERSION} \
-	&& mkdir build \
-	&& cd build \
-	&& cmake .. -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
-				-DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
-				-DWITH_EXAMPLES=OFF -DWITH_OTLP_GRPC=ON \
-	&& make -j$(nproc || sysctl -n hw.ncpu || echo 1) install && cd ../.. && rm -rf opentelemetry-cpp
+	  && cd opentelemetry-cpp/ \
+    && git checkout tags/v${OPENTELEMETRY_CPP_VERSION} -b v${OPENTELEMETRY_CPP_VERSION} \
+    && mkdir build \
+    && cd build \
+    && cmake .. -DCMAKE_CXX_STANDARD=17 -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+          -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF \
+          -DWITH_EXAMPLES=OFF -DWITH_OTLP_GRPC=ON -DWITH_ABSEIL=ON \
+    && make -j$(nproc || sysctl -n hw.ncpu || echo 1) install && cd ../..
 
 COPY . /currencyservice
 
@@ -38,5 +37,10 @@ RUN cd /currencyservice \
     && cmake .. \
     && make -j$(nproc || sysctl -n hw.ncpu || echo 1) install
 
+FROM alpine:3.18 as release
+
+RUN apk update && apk add grpc-dev protobuf-dev
+COPY --from=builder /usr/local /usr/local
+
 EXPOSE ${CURRENCY_SERVICE_PORT}
 ENTRYPOINT ./usr/local/bin/currencyservice ${CURRENCY_SERVICE_PORT}
diff --git a/...te-echoed/template/base/example/opentelemetry-demo/src/currencyservice/src/meter_common.h b/...te-echoed/template/base/example/opentelemetry-demo/src/currencyservice/src/meter_common.h
@@ -20,13 +20,13 @@ namespace
   std::string name{ "app_currency" };
   std::string schema{ "https://opentelemetry.io/schemas/1.2.0" };
 
-  void initMeter() 
+  void initMeter()
   {
     // Build MetricExporter
     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