Merge branch 'main' into opentelemetrybot/auto-update-registry-77c7ba…

…966e2457e38ab8afc0406efbca22b1234b
open-telemetry · May 22, 2024 · fba5347 · fba5347
2 parents 05da243 + 0d9789f
commit fba5347
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/content/en/docs/collector/_index.md b/content/en/docs/collector/_index.md
@@ -28,7 +28,7 @@ export their telemetry data.
 - _Observability_: An exemplar of an observable service.
 - _Extensibility_: Customizable without touching the core code.
 - _Unification_: Single codebase, deployable as an agent or collector with
-  support for traces, metrics, and logs (future).
+  support for traces, metrics, and logs.
 
 ## When to use a collector
 

diff --git a/content/en/docs/collector/building/receiver.md b/content/en/docs/collector/building/receiver.md
@@ -744,7 +744,9 @@ func (tailtracerRcvr *tailtracerReceiver) Start(ctx context.Context, host compon
 }
 
 func (tailtracerRcvr *tailtracerReceiver) Shutdown(ctx context.Context) error {
-	tailtracerRcvr.cancel()
+	if tailtracerRcvr.cancel != nil {
+		tailtracerRcvr.cancel()
+	}
 	return nil
 }
 ```
@@ -756,7 +758,7 @@ func (tailtracerRcvr *tailtracerReceiver) Shutdown(ctx context.Context) error {
   function field with the cancellation based on a new context created with
   `context.Background()` (according the Collector's API documentation
   suggestions).
-- Updated the `Stop()` method by adding a call to the `cancel()` context
+- Updated the `Shutdown()` method by adding a call to the `cancel()` context
   cancellation function.
 
 {{% /alert %}}
@@ -829,7 +831,9 @@ func (tailtracerRcvr *tailtracerReceiver) Start(ctx context.Context, host compon
 }
 
 func (tailtracerRcvr *tailtracerReceiver) Shutdown(ctx context.Context) error {
-	tailtracerRcvr.cancel()
+	if tailtracerRcvr.cancel != nil {
+		tailtracerRcvr.cancel()
+	}
 	return nil
 }
 ```