Add resource detectors to cart service (open-telemetry#663)

jmichalak9 · Jan 7, 2023 · 3cc2008 · 3cc2008
1 parent 10569e6
commit 3cc2008
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -166,3 +166,5 @@ 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
+([#663](https://github.com/open-telemetry/opentelemetry-demo/pull/663))
diff --git 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());

diff --git 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<ICartStore>(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
@@ -7,6 +7,7 @@
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore" Version="2.44.0" />
     <PackageReference Include="Grpc.AspNetCore.HealthChecks" Version="2.46.0" />
+    <PackageReference Include="OpenTelemetry.Extensions.Docker" Version="1.0.0-beta.1" />
     <PackageReference Include="StackExchange.Redis" Version="2.5.43" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.3.1" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.0.0-rc9.8" />