diff --git a/CHANGELOG.md b/CHANGELOG.md index b7c65a739f..8fc312fd6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,8 +37,10 @@ the release. ([#1515](https://github.com/open-telemetry/opentelemetry-demo/pull/1486)) * [frontend] Fix imageloading issues on optimized images. bump next.js version ([#1571](https://github.com/open-telemetry/opentelemetry-demo/pull/1571)) -* [cartservice] bump .NET package to 1.8.1 release - ([#1514](https://github.com/open-telemetry/opentelemetry-demo/pull/1514)), ([#1580](https://github.com/open-telemetry/opentelemetry-demo/pull/1580)) +* [cartservice] bump .NET package to 1.9.0 release + ([#1610](https://github.com/open-telemetry/opentelemetry-demo/pull/1610), + [#1514](https://github.com/open-telemetry/opentelemetry-demo/pull/1514), + [#1580](https://github.com/open-telemetry/opentelemetry-demo/pull/1580)) * [kafka] Fix permission issue with the telemetry agent when running in docker compose ([#1574](https://github.com/open-telemetry/opentelemetry-demo/pull/1574)) * [flagd] Add flagd service to minimal docker compose deployment diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile index a312e5057c..e2a12e7e78 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 --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.202 AS builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.302 AS builder ARG TARGETARCH WORKDIR /usr/src/app/ @@ -30,7 +30,7 @@ RUN dotnet publish ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH --no- # ----------------------------------------------------------------------------- # https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list -FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.3-alpine3.19 +FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.6-alpine3.20 WORKDIR /usr/src/app/ COPY --from=builder /cartservice/ ./ diff --git a/src/cartservice/src/Program.cs b/src/cartservice/src/Program.cs index 41340845ed..15baaa64df 100644 --- a/src/cartservice/src/Program.cs +++ b/src/cartservice/src/Program.cs @@ -13,8 +13,6 @@ using OpenTelemetry.Instrumentation.StackExchangeRedis; using OpenTelemetry.Logs; using OpenTelemetry.Metrics; -using OpenTelemetry.ResourceDetectors.Container; -using OpenTelemetry.ResourceDetectors.Host; using OpenTelemetry.Resources; using OpenTelemetry.Trace; using OpenFeature; @@ -57,8 +55,8 @@ Action appResourceBuilder = resource => resource - .AddDetector(new ContainerResourceDetector()) - .AddDetector(new HostDetector()); + .AddContainerDetector() + .AddHostDetector(); builder.Services.AddOpenTelemetry() .ConfigureResource(appResourceBuilder) diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj index 66b8fa23b0..ea7705e133 100644 --- a/src/cartservice/src/cartservice.csproj +++ b/src/cartservice/src/cartservice.csproj @@ -15,22 +15,22 @@ - - - - - - - - - - - - + + + + + + + + + + + + - + - + diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj index c6226fa98e..4c7a083d85 100644 --- a/src/cartservice/tests/cartservice.tests.csproj +++ b/src/cartservice/tests/cartservice.tests.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive