diff --git a/extension/observer/ecsobserver/error.go b/extension/observer/ecsobserver/error.go
index 960293cd3f76..0affa4b5500d 100644
--- a/extension/observer/ecsobserver/error.go
+++ b/extension/observer/ecsobserver/error.go
@@ -28,9 +28,8 @@ import (
 // for log and metrics that can be used for debugging.
 
 const (
-	errKeyTask      = "task"
-	errKeyContainer = "container"
-	errKeyTarget    = "target"
+	errKeyTask   = "task"
+	errKeyTarget = "target"
 )
 
 type errWithAttributes interface {
@@ -73,7 +72,9 @@ func extractErrorFields(err error) ([]zap.Field, string) {
 	fields = errAttr.zapFields()
 	v, ok := errctx.ValueFrom(err, errKeyTask)
 	if ok {
-		if task, ok := v.(*Task); ok {
+		// Rename ok to tok because linter says it shadows outer ok.
+		// Though the linter seems to allow the similar block to shadow...
+		if task, tok := v.(*Task); tok {
 			fields = append(fields, zap.String("TaskArn", aws.StringValue(task.Task.TaskArn)))
 			scope = "Task"
 		}
diff --git a/extension/observer/ecsobserver/internal/errctx/value.go b/extension/observer/ecsobserver/internal/errctx/value.go
index a75aa288e815..65fe327fc1cb 100644
--- a/extension/observer/ecsobserver/internal/errctx/value.go
+++ b/extension/observer/ecsobserver/internal/errctx/value.go
@@ -67,7 +67,7 @@ func WithValue(err error, key string, val interface{}) error {
 	}
 }
 
-// WithValues attaches multiple key value pairs. The behaviour is similar to WithValue.
+// WithValues attaches multiple key value pairs. The behavior is similar to WithValue.
 func WithValues(err error, kvs map[string]interface{}) error {
 	if err == nil {
 		return nil