pkg/routine: Drop span

pkg/routine/instance.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/getsentry/sentry-go"
 	"github.com/pace/bricks/maintenance/errors"
 	"github.com/pace/bricks/pkg/lock/redis"
 
@@ -58,11 +57,6 @@ func (r *routineThatKeepsRunningOneInstance) Run(ctx context.Context) {
 // until it returns. Return the backoff duration after which another single run
 // should be performed.
 func (r *routineThatKeepsRunningOneInstance) singleRun(ctx context.Context) time.Duration {
-	span := sentry.StartSpan(ctx, "function", sentry.WithDescription(fmt.Sprintf("Routine %s", r.Name)))
-	defer span.Finish()
-
-	ctx = span.Context()
-
 	l := redis.NewLock("routine:lock:"+r.Name, redis.SetTTL(r.lockTTL))
 	lockCtx, cancel, err := l.AcquireAndKeepUp(ctx)
 	if err != nil {

pkg/routine/routine.go

@@ -95,7 +95,6 @@ func Run(parentCtx context.Context, routine func(context.Context)) (cancel conte
 	num := atomic.AddInt64(&ctr, 1)
 
 	span := sentry.StartTransaction(ctx, fmt.Sprintf("Routine %d", num), sentry.WithOpName("function"))
-	defer span.Finish()
 
 	ctx = span.Context()
 
@@ -110,6 +109,8 @@ func Run(parentCtx context.Context, routine func(context.Context)) (cancel conte
 	contextsMx.Unlock()
 	// deregister the above if context is done
 	go func() {
+		defer span.Finish()
+
 		<-ctx.Done()
 		// In case of a shutdown, this will block forever. But it doesn't hurt,
 		// because the program is about to exit anyway.
@@ -118,6 +119,7 @@ func Run(parentCtx context.Context, routine func(context.Context)) (cancel conte
 		delete(contexts, num)
 	}()
 	go func() {
+		defer span.Finish()
 		defer errors.HandleWithCtx(ctx, fmt.Sprintf("routine %d", num)) // handle panics
 		defer cancel()
 		routine(ctx)