Ensure span ends (OffchainLabs#7405)

* Ensure span ends
* Merge refs/heads/master into span-ends
* Merge refs/heads/master into span-ends
* Add missed span end
* Merge branch 'span-ends' of github.com:prysmaticlabs/prysm into span-ends
* Merge refs/heads/master into span-ends

Author: terencechain

validator/client/runner.go

@@ -87,6 +87,7 @@ func run(ctx context.Context, v Validator) {
 		select {
 		case <-ctx.Done():
 			log.Info("Context canceled, stopping validator")
+			span.End()
 			return // Exit if context is canceled.
 		case slot := <-v.NextSlot():
 			span.AddAttributes(trace.Int64Attribute("slot", int64(slot)))
@@ -111,6 +112,7 @@ func run(ctx context.Context, v Validator) {
 			if featureconfig.Get().LocalProtection {
 				if err := v.UpdateProtections(ctx, slot); err != nil {
 					log.WithError(err).Error("Could not update validator protection")
+					span.End()
 					continue
 				}
 			}
@@ -125,6 +127,7 @@ func run(ctx context.Context, v Validator) {
 			allRoles, err := v.RolesAt(ctx, slot)
 			if err != nil {
 				log.WithError(err).Error("Could not get validator roles")
+				span.End()
 				continue
 			}
 			for pubKey, roles := range allRoles {