From 61d4ee9d82c6cd2df12cf64073ac39f4a2d8046e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= Date: Mon, 10 Jul 2023 21:15:29 +0200 Subject: [PATCH] [cartservice] Update OTel .NET to 1.5.1 (#957) * [cartservice] Update OTel .NET to 1.5.1 * Update .NET docker images * Update changelog * Update alpine version --------- Co-authored-by: Carter Socha <43380952+cartersocha@users.noreply.github.com> Co-authored-by: Austin Parker --- CHANGELOG.md | 2 ++ src/cartservice/src/Dockerfile | 4 ++-- src/cartservice/src/cartservice.csproj | 10 +++++----- src/cartservice/tests/cartservice.tests.csproj | 4 ++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fb98ba6d4..0bff3f20c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,8 @@ release. ([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/935)) * [cartservice] update service to .NET 7 ([#942](https://github.com/open-telemetry/opentelemetry-demo/pull/942)) +* [cartservice] update .NET package to 1.5.1 release + ([#935](https://github.com/open-telemetry/opentelemetry-demo/pull/957)) * Introduce minimal mode to run demo ([#872](https://github.com/open-telemetry/opentelemetry-demo/pull/872)) * [frontendproxy]Envoy expose a route for the collector to route frontend spans diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile index a711986268..9f2a3eecb5 100644 --- a/src/cartservice/src/Dockerfile +++ b/src/cartservice/src/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # https://mcr.microsoft.com/v2/dotnet/sdk/tags/list -FROM mcr.microsoft.com/dotnet/sdk:7.0.304 AS builder +FROM mcr.microsoft.com/dotnet/sdk:7.0.305 AS builder WORKDIR /usr/src/app/ @@ -31,7 +31,7 @@ RUN \ # ----------------------------------------------------------------------------- # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list -FROM mcr.microsoft.com/dotnet/runtime-deps:7.0.7-alpine3.17 +FROM mcr.microsoft.com/dotnet/runtime-deps:7.0.8-alpine3.18 WORKDIR /usr/src/app/ COPY --from=builder /cartservice/ ./ diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj index 2f6c8c7f5e..3a3906f5e1 100644 --- a/src/cartservice/src/cartservice.csproj +++ b/src/cartservice/src/cartservice.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj index 7cc3a6f3e3..830ae8381a 100644 --- a/src/cartservice/tests/cartservice.tests.csproj +++ b/src/cartservice/tests/cartservice.tests.csproj @@ -5,8 +5,8 @@ - - + +