Skip to content

Commit ea4ecab

Browse files
Merge branch 'main' into currencyservice-add-otlp-logs
2 parents 3d9292c + e37e626 commit ea4ecab

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ the release.
5656
([#1377](https://github.com/open-telemetry/opentelemetry-demo/pull/1377))
5757
* [currencyservice] Add OTLP logs
5858
([#1378](https://github.com/open-telemetry/opentelemetry-demo/pull/1378))
59+
* [cartservice] update .NET to .NET 8.0.2
60+
([#1380](https://github.com/open-telemetry/opentelemetry-demo/pull/1380))
5961

6062
## 1.7.2
6163

src/cartservice/src/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
# https://mcr.microsoft.com/v2/dotnet/sdk/tags/list
18-
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.101 AS builder
18+
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.200 AS builder
1919
ARG TARGETARCH
2020

2121
WORKDIR /usr/src/app/
@@ -30,7 +30,7 @@ RUN dotnet publish ./src/cartservice.csproj -v d -r linux-musl-$TARGETARCH --no-
3030
# -----------------------------------------------------------------------------
3131

3232
# https://mcr.microsoft.com/v2/dotnet/runtime-deps/tags/list
33-
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.1-alpine3.18
33+
FROM mcr.microsoft.com/dotnet/runtime-deps:8.0.2-alpine3.18
3434

3535
WORKDIR /usr/src/app/
3636
COPY --from=builder /cartservice/ ./

src/cartservice/src/cartservice.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
<PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.60.0" />
1515
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.7.0" />
1616
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.0" />
18-
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
19-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.0" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.7.1" />
18+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
19+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.7.1" />
2020
<PackageReference Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.4" />
2121
<PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.13" />
2222
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.7.0" />
23-
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.5" />
24-
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
23+
<PackageReference Include="OpenTelemetry.ResourceDetectors.Container" Version="1.0.0-beta.6" />
24+
<PackageReference Include="StackExchange.Redis" Version="2.7.17" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

src/cartservice/tests/cartservice.tests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
<ItemGroup>
88
<PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.1" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageReference Include="xunit" Version="2.6.5" />
9+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
11+
<PackageReference Include="xunit" Version="2.6.6" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

0 commit comments

Comments
 (0)