Reduced logging level for collector shutdown due to context cancel (#…

…5258) * Reduced logging level for collector shutdown due to context cancel Signed-off-by: Corbin Phelps <[email protected]> * Updated changelog with PR number Signed-off-by: Corbin Phelps <[email protected]> * Modified logging of context cancel to include error string Signed-off-by: Corbin Phelps <[email protected]> * Added back error wrap on zap.Error Signed-off-by: Corbin Phelps <[email protected]>
open-telemetry · Apr 26, 2022 · 15d79e6 · 15d79e6
1 parent a8ad007
commit 15d79e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -28,6 +28,7 @@
 ### 💡 Enhancements 💡
 
 - Extend config.Map.Unmarshal hook to check map key string to any TextUnmarshaler not only ComponentID (#5244)
+- Collector will no longer print error with stack trace when the collector is shutdown due to a context cancel. (#5258)
 
 ### 🧰 Bug fixes 🧰
 - Fix translation from otlp.Request to pdata representation, changes to the returned pdata not all reflected to the otlp.Request (#5197)

diff --git a/service/collector.go b/service/collector.go
@@ -183,7 +183,8 @@ LOOP:
 			col.logger.Info("Received shutdown request")
 			break LOOP
 		case <-ctx.Done():
-			col.logger.Error("Context done, terminating process", zap.Error(ctx.Err()))
+			col.logger.Info("Context done, terminating process", zap.Error(ctx.Err()))
+
 			// Call shutdown with background context as the passed in context has been canceled
 			return col.shutdown(context.Background())
 		}