From bef6a642a76e19afdd8afd2d398bfe61c5d3eda9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:16:13 -0500 Subject: [PATCH 1/2] chore(deps): update cartservice (#1249) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Austin Parker --- src/cartservice/src/cartservice.csproj | 4 ++-- src/cartservice/tests/cartservice.tests.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj index 3f9e98e27b..191cc7950b 100644 --- a/src/cartservice/src/cartservice.csproj +++ b/src/cartservice/src/cartservice.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/cartservice/tests/cartservice.tests.csproj b/src/cartservice/tests/cartservice.tests.csproj index 7f68649279..53f364e5a8 100644 --- a/src/cartservice/tests/cartservice.tests.csproj +++ b/src/cartservice/tests/cartservice.tests.csproj @@ -5,9 +5,9 @@ - + - + all From 18942fb66e32f7ab05c3d848546852ae0e500a19 Mon Sep 17 00:00:00 2001 From: Matt Hensley <130569+matt-hensley@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:39:10 -0500 Subject: [PATCH 2/2] cartservice: Add .NET process metrics (#1265) * add .NET process metrics * CHANGELOG entry --------- Co-authored-by: Austin Parker --- CHANGELOG.md | 2 ++ src/cartservice/src/Program.cs | 1 + src/cartservice/src/cartservice.csproj | 1 + 3 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d7ee6f26b..17dc0c89e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ release. ([#1239](https://github.com/open-telemetry/opentelemetry-demo/pull/1239)) * update PHP quoteservice to use 1.0.0 ([#1236](https://github.com/open-telemetry/opentelemetry-demo/pull/1236)) +* [cartservice] Add .NET memory, CPU, and thread metrics + ([#1265](https://github.com/open-telemetry/opentelemetry-demo/pull/1265)) * enable browser traffic in loadgenerator using playwright ([#1266](https://github.com/open-telemetry/opentelemetry-demo/pull/1266)) ## 1.6.0 diff --git a/src/cartservice/src/Program.cs b/src/cartservice/src/Program.cs index 6c7c612391..3a50e9be71 100644 --- a/src/cartservice/src/Program.cs +++ b/src/cartservice/src/Program.cs @@ -59,6 +59,7 @@ .AddHttpClientInstrumentation() .AddOtlpExporter()) .WithMetrics(meterBuilder => meterBuilder + .AddProcessInstrumentation() .AddRuntimeInstrumentation() .AddAspNetCoreInstrumentation() .AddOtlpExporter()); diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj index 191cc7950b..0274442663 100644 --- a/src/cartservice/src/cartservice.csproj +++ b/src/cartservice/src/cartservice.csproj @@ -14,6 +14,7 @@ +