diff --git a/docs/orleans/host/monitoring/index.md b/docs/orleans/host/monitoring/index.md
index dba903d718bb8..c7c1b646939fe 100644
--- a/docs/orleans/host/monitoring/index.md
+++ b/docs/orleans/host/monitoring/index.md
@@ -369,8 +369,22 @@ builder.Services.AddOpenTelemetry()
             ResourceBuilder.CreateDefault()
                 .AddService(serviceName: "GPSTracker", serviceVersion: "1.0"));
 
-        tracing.AddSource("Microsoft.Orleans.Runtime");
-        tracing.AddSource("Microsoft.Orleans.Application");
+        // Good baseline for general Orleans observability
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.ApplicationGrainActivitySourceName);
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.LifecycleActivitySourceName);
+
+        /*
+        // Other source also available
+        // Persistence spans
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.StorageActivitySourceName);
+        // Internal Runtime spans
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.RuntimeActivitySourceName);
+        */
+
+        /*
+        // Optionally add all Microsoft.Orleans.* Sources at once
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.AllActivitySourceName);
+        */
 
         tracing.AddZipkinExporter(zipkin =>
         {
diff --git a/docs/orleans/migration-guide.md b/docs/orleans/migration-guide.md
index 5e4541938d320..2bfd13193f8fe 100644
--- a/docs/orleans/migration-guide.md
+++ b/docs/orleans/migration-guide.md
@@ -282,8 +282,23 @@ builder.Services.AddOpenTelemetry()
             .AddService(serviceName: "ExampleService", serviceVersion: "1.0"));
 
         tracing.AddAspNetCoreInstrumentation();
-        tracing.AddSource("Microsoft.Orleans.Runtime");
-        tracing.AddSource("Microsoft.Orleans.Application");
+
+        // Good baseline for general Orleans observability
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.ApplicationGrainActivitySourceName);
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.LifecycleActivitySourceName);
+
+        /*
+        // Other source also available
+        // Persistence spans
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.StorageActivitySourceName);
+        // Internal Runtime spans
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.RuntimeActivitySourceName);
+        */
+
+        /*
+        // Optionally add all Microsoft.Orleans.* Sources at once
+        tracing.AddSource(Orleans.Diagnostics.ActivitySources.AllActivitySourceName);
+        */
 
         tracing.AddZipkinExporter(options =>
         {
@@ -294,8 +309,8 @@ builder.Services.AddOpenTelemetry()
 
 In the preceding code, OpenTelemetry is configured to monitor:
 
-- `Microsoft.Orleans.Runtime`
 - `Microsoft.Orleans.Application`
+- `Microsoft.Orleans.Lifecycle`
 
 To propagate activity, call <xref:Orleans.Hosting.ClientBuilderExtensions.AddActivityPropagation%2A>: