From 41295edcaa5b96063231c322e72e2ebaff7388e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Kie=C5=82kowicz?= <pkiekowicz@splunk.com>
Date: Fri, 15 Mar 2024 08:06:16 +0100
Subject: [PATCH 1/2] [cartservice] update .NET to .NET 8.0.3

---
 CHANGELOG.md                                   | 2 ++
 src/cartservice/src/Dockerfile                 | 4 ++--
 src/cartservice/src/cartservice.csproj         | 8 ++++----
 src/cartservice/tests/cartservice.tests.csproj | 8 ++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e18986ee52..80d69ce843 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@ the release.
   ([#1449](https://github.com/open-telemetry/opentelemetry-demo/pull/1449))
 * [Frontend-proxy] Add restart policy to compose file
   ([#1448](https://github.com/open-telemetry/opentelemetry-demo/pull/1448))
+* [cartservice] update .NET to .NET 8.0.3
+  ([#1460](https://github.com/open-telemetry/opentelemetry-demo/pull/1460))
 
 ## 1.8.0
 
diff --git a/src/cartservice/src/Dockerfile b/src/cartservice/src/Dockerfile
index ec3960d9a1..e1ffcc64c2 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.200 AS builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.202 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.2-alpine3.18
+FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.3-alpine3.19
 
 WORKDIR /usr/src/app/
 COPY --from=builder /cartservice/ ./
diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj
index b66f433594..50564fb32b 100644
--- a/src/cartservice/src/cartservice.csproj
+++ b/src/cartservice/src/cartservice.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.AspNetCore" Version="2.60.0" />
-    <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.60.0" />
+    <PackageReference Include="Grpc.AspNetCore" Version="2.61.0" />
+    <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.61.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
@@ -22,10 +22,10 @@
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
     <PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
     <PackageReference Include="OpenTelemetry.ResourceDetectors.Host" Version="0.1.0-alpha.2" />
-    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
     <PackageReference Include="OpenFeature.Contrib.Providers.Flagd" Version="0.1.8" />
     <PackageReference Include="OpenFeature.Contrib.Hooks.Otel" Version="0.1.4" />
-    <PackageReference Include="OpenFeature" Version="1.4.1" />
+    <PackageReference Include="OpenFeature" Version="1.5.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj
index 707d436391..7e65d7c94e 100644
--- a/src/cartservice/tests/cartservice.tests.csproj
+++ b/src/cartservice/tests/cartservice.tests.csproj
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
-    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
+    <PackageReference Include="Grpc.Net.Client" Version="2.61.0" />
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.6.6" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From fb3d5aa24568ab20191efd5251533a92dfab150f Mon Sep 17 00:00:00 2001
From: Juliano Costa <juliano.costa@datadoghq.com>
Date: Fri, 15 Mar 2024 10:38:58 +0100
Subject: [PATCH 2/2] Fix tracetest

---
 test/tracetesting/checkout-service/place-order.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tracetesting/checkout-service/place-order.yaml b/test/tracetesting/checkout-service/place-order.yaml
index 6ccb6ce84d..29ab057b98 100644
--- a/test/tracetesting/checkout-service/place-order.yaml
+++ b/test/tracetesting/checkout-service/place-order.yaml
@@ -33,7 +33,7 @@ spec:
         }
   specs:
   - name: It returns a valid order
-    selector: span[tracetest.span.type="general" name="Trigger test"]
+    selector: span[tracetest.span.type="general" name="Tracetest trigger"]
     assertions:
     - attr:tracetest.response.body | json_path '$.order.orderId' != ""
     - attr:tracetest.response.body | json_path '$.order.shippingTrackingId' != ""