3 files changed, 45 insertions, 7 deletions

diff --git a/internal/command/command_test.go b/internal/command/command_test.go
index 8eda53261..dd23c85d6 100644
--- a/internal/command/command_test.go
+++ b/internal/command/command_test.go
@@ -21,7 +21,11 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/cgroups"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/protobuf/types/known/durationpb"
 )
 
 func TestNew_environment(t *testing.T) {
@@ -196,7 +200,18 @@ func TestNew_spawnTimeout(t *testing.T) {
 
 	// And after some time we expect that spawning of the command fails due to the configured
 	// timeout.
-	require.Equal(t, fmt.Errorf("process spawn timed out after 200ms"), <-errCh)
+	err := <-errCh
+	var structErr structerr.Error
+	require.ErrorAs(t, err, &structErr)
+	details := structErr.Details()
+	require.Len(t, details, 1)
+
+	limitErr, ok := details[0].(*gitalypb.LimitError)
+	require.True(t, ok)
+
+	testhelper.RequireGrpcCode(t, err, codes.ResourceExhausted)
+	require.Equal(t, "process spawn timed out after 200ms", limitErr.ErrorMessage)
+	require.Equal(t, durationpb.New(0), limitErr.RetryAfter)
 }
 
 func TestCommand_Wait_contextCancellationKillsCommand(t *testing.T) {
diff --git a/internal/command/spawntoken.go b/internal/command/spawntoken.go
index bdc4d664c..2b0065bf5 100644
--- a/internal/command/spawntoken.go
+++ b/internal/command/spawntoken.go
@@ -8,7 +8,10 @@ import (
 	"github.com/kelseyhightower/envconfig"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/tracing"
+	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
+	"google.golang.org/protobuf/types/known/durationpb"
 )
 
 var (
@@ -60,22 +63,26 @@ func getSpawnToken(ctx context.Context) (putToken func(), err error) {
 
 	select {
 	case spawnTokens <- struct{}{}:
-		logTime(ctx, start, "")
+		recordTime(ctx, start, "")
 
 		return func() {
 			<-spawnTokens
 		}, nil
 	case <-time.After(spawnConfig.Timeout):
-		logTime(ctx, start, "spawn token timeout")
+		recordTime(ctx, start, "spawn token timeout")
 		spawnTimeoutCount.Inc()
 
-		return nil, fmt.Errorf("process spawn timed out after %v", spawnConfig.Timeout)
+		msg := fmt.Sprintf("process spawn timed out after %v", spawnConfig.Timeout)
+		return nil, structerr.NewResourceExhausted(msg).WithDetail(&gitalypb.LimitError{
+			ErrorMessage: msg,
+			RetryAfter:   durationpb.New(0),
+		})
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	}
 }
 
-func logTime(ctx context.Context, start time.Time, msg string) {
+func recordTime(ctx context.Context, start time.Time, msg string) {
 	delta := time.Since(start)
 
 	if stats := StatsFromContext(ctx); stats != nil {
diff --git a/internal/command/spawntoken_test.go b/internal/command/spawntoken_test.go
index 3f10d5bb3..62f534b7f 100644
--- a/internal/command/spawntoken_test.go
+++ b/internal/command/spawntoken_test.go
@@ -2,9 +2,14 @@ package command
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/gitaly/v16/internal/structerr"
 	"gitlab.com/gitlab-org/gitaly/v16/internal/testhelper"
+	"gitlab.com/gitlab-org/gitaly/v16/proto/go/gitalypb"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/protobuf/types/known/durationpb"
 )
 
 func TestGetSpawnToken_CommandStats(t *testing.T) {
@@ -27,7 +32,7 @@ func TestGetSpawnToken_CommandStats_timeout(t *testing.T) {
 	priorTimeout := spawnConfig.Timeout
 	priorSpawnTokens := spawnTokens
 
-	spawnConfig.Timeout = 0
+	spawnConfig.Timeout = 1 * time.Millisecond
 	spawnTokens = make(chan struct{}, 1)
 	spawnTokens <- struct{}{}
 	defer func() {
@@ -39,7 +44,18 @@ func TestGetSpawnToken_CommandStats_timeout(t *testing.T) {
 	ctx = InitContextStats(ctx)
 
 	_, err := getSpawnToken(ctx)
-	require.ErrorContains(t, err, "process spawn timed out after")
+
+	var structErr structerr.Error
+	require.ErrorAs(t, err, &structErr)
+	details := structErr.Details()
+	require.Len(t, details, 1)
+
+	limitErr, ok := details[0].(*gitalypb.LimitError)
+	require.True(t, ok)
+
+	testhelper.RequireGrpcCode(t, err, codes.ResourceExhausted)
+	require.Equal(t, "process spawn timed out after 1ms", limitErr.ErrorMessage)
+	require.Equal(t, durationpb.New(0), limitErr.RetryAfter)
 
 	stats := StatsFromContext(ctx)
 	require.NotNil(t, stats)