From 6faba8798e142f40a953f837a227ea64cce46e08 Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 28 Dec 2022 12:12:01 +0100 Subject: [PATCH 1/3] Add resource detectors to cart service Signed-off-by: svrnm --- src/cartservice/src/Program.cs | 13 +++++++++++-- src/cartservice/src/cartservice.csproj | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/cartservice/src/Program.cs b/src/cartservice/src/Program.cs index 0f19c8d886..18f85eff6e 100644 --- a/src/cartservice/src/Program.cs +++ b/src/cartservice/src/Program.cs @@ -21,6 +21,7 @@ using Microsoft.Extensions.Diagnostics.HealthChecks; using OpenTelemetry.Metrics; using OpenTelemetry.Resources; +using OpenTelemetry.Extensions.Docker.Resources; using OpenTelemetry.Trace; using cartservice.services; using Microsoft.AspNetCore.Http; @@ -42,7 +43,11 @@ builder.Services.AddSingleton(cartStore); builder.Services.AddOpenTelemetryTracing((builder) => builder - .ConfigureResource(r => r.AddTelemetrySdk()) + .ConfigureResource(r => r + .AddTelemetrySdk() + .AddEnvironmentVariableDetector() + .AddDetector(new DockerResourceDetector()) + ) .AddRedisInstrumentation( cartStore.GetConnection(), options => options.SetVerboseDatabaseStatements = true) @@ -52,7 +57,11 @@ .AddOtlpExporter()); builder.Services.AddOpenTelemetryMetrics(builder => builder - .ConfigureResource(r => r.AddTelemetrySdk()) + .ConfigureResource(r => r + .AddTelemetrySdk() + .AddEnvironmentVariableDetector() + .AddDetector(new DockerResourceDetector()) + ) .AddRuntimeInstrumentation() .AddAspNetCoreInstrumentation() .AddOtlpExporter()); diff --git a/src/cartservice/src/cartservice.csproj b/src/cartservice/src/cartservice.csproj index a4cd172351..962849c2ae 100644 --- a/src/cartservice/src/cartservice.csproj +++ b/src/cartservice/src/cartservice.csproj @@ -7,6 +7,7 @@ + From 4c2381ab124d6c066da0705062a13276eb33a846 Mon Sep 17 00:00:00 2001 From: svrnm Date: Wed, 28 Dec 2022 12:15:45 +0100 Subject: [PATCH 2/3] Update docs and changelog Signed-off-by: svrnm --- CHANGELOG.md | 1 + docs/services/cartservice.md | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d122bb058e..46b854d1f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -166,3 +166,4 @@ significant modifications will be credited to OpenTelemetry Authors. ([#648](https://github.com/open-telemetry/opentelemetry-demo/pull/648)) * Add Jaeger-SPM-Config ([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655)) +* Add resource detectors to cart service diff --git a/docs/services/cartservice.md b/docs/services/cartservice.md index 314e6e56f3..bb54caac50 100644 --- a/docs/services/cartservice.md +++ b/docs/services/cartservice.md @@ -20,7 +20,11 @@ of the exporter and resource attributes is performed through environment variabl ```cs services.AddOpenTelemetryTracing((builder) => builder - .ConfigureResource(r => r.AddTelemetrySdk()) + .ConfigureResource(r => r + .AddTelemetrySdk() + .AddEnvironmentVariableDetector() + .AddDetector(new DockerResourceDetector()) + ) .AddRedisInstrumentation( cartStore.GetConnection(), options => options.SetVerboseDatabaseStatements = true) @@ -70,7 +74,11 @@ instrumentation libraries, exporters, etc. ```cs services.AddOpenTelemetryMetrics(builder => builder - .ConfigureResource(r => r.AddTelemetrySdk()) + .ConfigureResource(r => r + .AddTelemetrySdk() + .AddEnvironmentVariableDetector() + .AddDetector(new DockerResourceDetector()) + ) .AddRuntimeInstrumentation() .AddAspNetCoreInstrumentation() .AddOtlpExporter()); From 547aa4238c13853094a39a0347224c8af8101b6f Mon Sep 17 00:00:00 2001 From: Severin Neumann Date: Thu, 29 Dec 2022 10:58:46 +0100 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 46b854d1f1..aaa8af6e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -167,3 +167,4 @@ significant modifications will be credited to OpenTelemetry Authors. * Add Jaeger-SPM-Config ([#655](https://github.com/open-telemetry/opentelemetry-demo/pull/655)) * Add resource detectors to cart service +([#663](https://github.com/open-telemetry/opentelemetry-demo/pull/663))