Ditch backgroundCtxWithSpan

Author: edigaryev

internal/executor/instance/persistentworker/isolation/tart/vm.go

@@ -13,13 +13,12 @@ import (
 )
 
 type VM struct {
-	ident                 string
-	env                   map[string]string
-	backgroundCtxWithSpan context.Context
-	runningVMCtx          context.Context
-	runningVMCtxCancel    context.CancelFunc
-	wg                    sync.WaitGroup
-	errChan               chan error
+	ident              string
+	env                map[string]string
+	runningVMCtx       context.Context
+	runningVMCtxCancel context.CancelFunc
+	wg                 sync.WaitGroup
+	errChan            chan error
 }
 
 type Info struct {
@@ -41,17 +40,16 @@ func NewVMClonedFrom(
 	env map[string]string,
 	logger *echelon.Logger,
 ) (*VM, error) {
-	backgroundCtxWithSpan := trace.ContextWithSpan(context.Background(), trace.SpanFromContext(ctx))
-
-	runningVMCtx, runningVMCtxCancel := context.WithCancel(backgroundCtxWithSpan)
+	runningVMCtx, runningVMCtxCancel := context.WithCancel(
+		trace.ContextWithSpan(context.Background(), trace.SpanFromContext(ctx)),
+	)
 
 	vm := &VM{
-		ident:                 to,
-		env:                   env,
-		backgroundCtxWithSpan: backgroundCtxWithSpan,
-		runningVMCtx:          runningVMCtx,
-		runningVMCtxCancel:    runningVMCtxCancel,
-		errChan:               make(chan error, 1),
+		ident:              to,
+		env:                env,
+		runningVMCtx:       runningVMCtx,
+		runningVMCtxCancel: runningVMCtxCancel,
+		errChan:            make(chan error, 1),
 	}
 
 	pullLogger := logger.Scoped("pull virtual machine")
@@ -227,14 +225,16 @@ func (vm *VM) Info(ctx context.Context) (*Info, error) {
 }
 
 func (vm *VM) Close() error {
+	ctx := trace.ContextWithSpan(context.Background(), trace.SpanFromContext(vm.runningVMCtx))
+
 	// Try to gracefully terminate the VM
 	//nolint:dogsled // not interested in the output for now
-	_, _, _ = Cmd(vm.backgroundCtxWithSpan, vm.env, "stop", "--timeout", "5", vm.ident)
+	_, _, _ = Cmd(ctx, vm.env, "stop", "--timeout", "5", vm.ident)
 
 	vm.runningVMCtxCancel()
 	vm.wg.Wait()
 
-	_, _, err := Cmd(vm.backgroundCtxWithSpan, vm.env, "delete", vm.ident)
+	_, _, err := Cmd(ctx, vm.env, "delete", vm.ident)
 
 	return err
 }

internal/executor/instance/persistentworker/isolation/vetu/vm.go

@@ -12,14 +12,13 @@ import (
 )
 
 type VM struct {
-	ident                 string
-	env                   map[string]string
-	resourceModifier      *resourcemodifier.Modifier
-	backgroundCtxWithSpan context.Context
-	runningVMCtx          context.Context
-	runningVMCtxCancel    context.CancelFunc
-	wg                    sync.WaitGroup
-	errChan               chan error
+	ident              string
+	env                map[string]string
+	resourceModifier   *resourcemodifier.Modifier
+	runningVMCtx       context.Context
+	runningVMCtxCancel context.CancelFunc
+	wg                 sync.WaitGroup
+	errChan            chan error
 }
 
 func NewVMClonedFrom(
@@ -31,18 +30,17 @@ func NewVMClonedFrom(
 	resourceModifier *resourcemodifier.Modifier,
 	logger *echelon.Logger,
 ) (*VM, error) {
-	backgroundCtxWithSpan := trace.ContextWithSpan(context.Background(), trace.SpanFromContext(ctx))
-
-	runningVMCtx, runningVMCtxCancel := context.WithCancel(backgroundCtxWithSpan)
+	runningVMCtx, runningVMCtxCancel := context.WithCancel(
+		trace.ContextWithSpan(context.Background(), trace.SpanFromContext(ctx)),
+	)
 
 	vm := &VM{
-		ident:                 to,
-		env:                   env,
-		resourceModifier:      resourceModifier,
-		backgroundCtxWithSpan: backgroundCtxWithSpan,
-		runningVMCtx:          runningVMCtx,
-		runningVMCtxCancel:    runningVMCtxCancel,
-		errChan:               make(chan error, 1),
+		ident:              to,
+		env:                env,
+		resourceModifier:   resourceModifier,
+		runningVMCtx:       runningVMCtx,
+		runningVMCtxCancel: runningVMCtxCancel,
+		errChan:            make(chan error, 1),
 	}
 
 	pullLogger := logger.Scoped("pull virtual machine")
@@ -175,14 +173,16 @@ func (vm *VM) RetrieveIP(ctx context.Context) (string, error) {
 }
 
 func (vm *VM) Close() error {
+	ctx := trace.ContextWithSpan(context.Background(), trace.SpanFromContext(vm.runningVMCtx))
+
 	// Try to gracefully terminate the VM
 	//nolint:dogsled // not interested in the output for now
-	_, _, _ = Cmd(vm.backgroundCtxWithSpan, vm.env, "stop", "--timeout", "5", vm.ident)
+	_, _, _ = Cmd(ctx, vm.env, "stop", "--timeout", "5", vm.ident)
 
 	vm.runningVMCtxCancel()
 	vm.wg.Wait()
 
-	_, _, err := Cmd(vm.backgroundCtxWithSpan, vm.env, "delete", vm.ident)
+	_, _, err := Cmd(ctx, vm.env, "delete", vm.ident)
 
 	return err
 }