Merge branch 'main' into feature/updatesystems

open-telemetry · Feb 23, 2023 · 83f0a5c · 83f0a5c
2 parents 358f234 + 6d4fb62
commit 83f0a5c
Show file tree

Hide file tree

Showing 48 changed files with 1,252 additions and 228 deletions.
diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Startup.cs
@@ -110,7 +110,7 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
                     tcs.SetResult(true);
                 });
 
-            return tcs.Task.ContinueWith(antecedent => tokenRegistration.Dispose());
+            return tcs.Task.ContinueWith(antecedent => tokenRegistration.Dispose(), stoppingToken);
         }
     }
 }