refactor end span

Author: dobrac

.golangci.yml

@@ -72,16 +72,16 @@ linters:
       forbid:
         - pattern: "^new$"
           msg: "Use &Type{} instead."
-#        - pattern: os\.Getenv
-#          msg: "Add your field to the configuration model instead."
+    #        - pattern: os\.Getenv
+    #          msg: "Add your field to the configuration model instead."
 
     gocritic:
       disabled-checks:
         - appendAssign
     revive:
       enable-all-rules: true
       rules:
-        - { disabled: true, name: add-constant }  # todo: enable this
+        - { disabled: true, name: add-constant } # todo: enable this
         - { disabled: true, name: argument-limit }
         - { disabled: true, name: bare-return }
         - { disabled: true, name: blank-imports }
@@ -96,7 +96,7 @@ linters:
         - { disabled: true, name: early-return }
         - { disabled: true, name: enforce-switch-style }
         - { disabled: true, name: exported }
-        - { disabled: true, name: flag-parameter }   # todo: enable this
+        - { disabled: true, name: flag-parameter } # todo: enable this
         - { disabled: true, name: function-length }
         - { disabled: true, name: function-result-limit }
         - { disabled: true, name: get-return }
@@ -109,24 +109,24 @@ linters:
         - { disabled: true, name: package-comments }
         - { disabled: true, name: unchecked-type-assertion }
         - { disabled: true, name: unexported-naming }
-        - { disabled: true, name: unhandled-error }  #  todo: enable this
-        - { disabled: true, name: unnecessary-format }  # todo: enable this
-        - { disabled: true, name: unnecessary-stmt }  # todo: enable this
+        - { disabled: true, name: unhandled-error } #  todo: enable this
+        - { disabled: true, name: unnecessary-format } # todo: enable this
+        - { disabled: true, name: unnecessary-stmt } # todo: enable this
         - { disabled: true, name: unused-receiver }
-        - { disabled: true, name: use-errors-new }  # todo: enable this
+        - { disabled: true, name: use-errors-new } # todo: enable this
         - { disabled: true, name: var-declaration }
         - { disabled: true, name: var-naming }
 
     staticcheck:
       checks:
         - all
-        - -S1002  # Omit comparison with boolean constant
-        - -SA1019  # TODO: Remove (Using a deprecated function, variable, constant or field)
-        - -ST1000  # Incorrect or missing package comment
-        - -ST1020  # The documentation of an exported function should start with the function’s name
-        - -ST1021  # The documentation of an exported type should start with type’s name
-        - -ST1003  # Poorly chosen identifier
-        - -QF1008  # Omit embedded fields from selector expression
+        - -S1002 # Omit comparison with boolean constant
+        - -SA1019 # TODO: Remove (Using a deprecated function, variable, constant or field)
+        - -ST1000 # Incorrect or missing package comment
+        - -ST1020 # The documentation of an exported function should start with the function’s name
+        - -ST1021 # The documentation of an exported type should start with type’s name
+        - -ST1003 # Poorly chosen identifier
+        - -QF1008 # Omit embedded fields from selector expression
 
 run:
   go: 1.24.7

packages/orchestrator/internal/sandbox/sandbox.go

@@ -170,7 +170,7 @@ func (f *Factory) CreateSandbox(
 	apiConfigToStore *orchestrator.SandboxConfig,
 ) (s *Sandbox, e error) {
 	ctx, span := tracer.Start(ctx, "create sandbox")
-	defer func() { endSpan(span, e) }()
+	defer endSpan(span, &e)
 
 	execCtx, execSpan := startExecutionSpan(ctx)
 
@@ -181,7 +181,7 @@ func (f *Factory) CreateSandbox(
 		if e != nil {
 			cleanupErr := cleanup.Run(ctx)
 			e = errors.Join(e, cleanupErr)
-			endSpan(execSpan, e)
+			endSpan(execSpan, &e)
 		}
 	}()
 
@@ -331,10 +331,11 @@ func (f *Factory) CreateSandbox(
 	return sbx, nil
 }
 
-func endSpan(span trace.Span, err error) {
-	if err != nil {
-		span.RecordError(err)
-		span.SetStatus(codes.Error, err.Error())
+// Usage: defer endSpan(span, &err)
+func endSpan(span trace.Span, err *error) {
+	if err != nil && *err != nil {
+		span.RecordError(*err)
+		span.SetStatus(codes.Error, (*err).Error())
 	}
 
 	span.End()
@@ -352,7 +353,7 @@ func (f *Factory) ResumeSandbox(
 	apiConfigToStore *orchestrator.SandboxConfig,
 ) (s *Sandbox, e error) {
 	ctx, span := tracer.Start(ctx, "resume sandbox")
-	defer func() { endSpan(span, e) }()
+	defer endSpan(span, &e)
 
 	execCtx, execSpan := startExecutionSpan(ctx)
 
@@ -363,7 +364,7 @@ func (f *Factory) ResumeSandbox(
 		if e != nil {
 			cleanupErr := cleanup.Run(ctx)
 			e = errors.Join(e, cleanupErr)
-			endSpan(execSpan, e)
+			endSpan(execSpan, &e)
 		}
 	}()