2 files changed, 16 insertions, 22 deletions

diff --git a/internal/handler/exec.go b/internal/handler/exec.go
index ac59dab..d11e1c3 100644
--- a/internal/handler/exec.go
+++ b/internal/handler/exec.go
@@ -45,16 +45,15 @@ type GitalyCommand struct {
 // RunGitalyCommand provides a bootstrap for Gitaly commands executed
 // through GitLab-Shell. It ensures that logging, tracing and other
 // common concerns are configured before executing the `handler`.
-func (gc *GitalyCommand) RunGitalyCommand(handler GitalyHandlerFunc) error {
-	gitalyConn, err := getConn(gc)
-
+func (gc *GitalyCommand) RunGitalyCommand(ctx context.Context, handler GitalyHandlerFunc) error {
+	gitalyConn, err := getConn(ctx, gc)
 	if err != nil {
 		return err
 	}
 
-	_, err = handler(gitalyConn.ctx, gitalyConn.conn)
+	defer gitalyConn.close()
 
-	gitalyConn.close()
+	_, err = handler(gitalyConn.ctx, gitalyConn.conn)
 
 	return err
 }
@@ -63,12 +62,7 @@ func (gc *GitalyCommand) RunGitalyCommand(handler GitalyHandlerFunc) error {
 // be run.
 func (gc *GitalyCommand) PrepareContext(ctx context.Context, repository *pb.Repository, response *accessverifier.Response, env sshenv.Env) (context.Context, context.CancelFunc) {
 	ctx, cancel := context.WithCancel(ctx)
-
-	gc.LogExecution(repository, response, env)
-
-	if response.CorrelationID != "" {
-		ctx = correlation.ContextWithCorrelation(ctx, response.CorrelationID)
-	}
+	gc.LogExecution(ctx, repository, response, env)
 
 	md, ok := metadata.FromOutgoingContext(ctx)
 	if !ok {
@@ -84,10 +78,10 @@ func (gc *GitalyCommand) PrepareContext(ctx context.Context, repository *pb.Repo
 	return ctx, cancel
 }
 
-func (gc *GitalyCommand) LogExecution(repository *pb.Repository, response *accessverifier.Response, env sshenv.Env) {
+func (gc *GitalyCommand) LogExecution(ctx context.Context, repository *pb.Repository, response *accessverifier.Response, env sshenv.Env) {
 	fields := log.Fields{
 		"command":         gc.ServiceName,
-		"correlation_id":  response.CorrelationID,
+		"correlation_id":  correlation.ExtractFromContext(ctx),
 		"gl_project_path": repository.GlProjectPath,
 		"gl_repository":   repository.GlRepository,
 		"user_id":         response.UserId,
@@ -113,7 +107,7 @@ func withOutgoingMetadata(ctx context.Context, features map[string]string) conte
 	return metadata.NewOutgoingContext(ctx, md)
 }
 
-func getConn(gc *GitalyCommand) (*GitalyConn, error) {
+func getConn(ctx context.Context, gc *GitalyCommand) (*GitalyConn, error) {
 	if gc.Address == "" {
 		return nil, fmt.Errorf("no gitaly_address given")
 	}
@@ -158,10 +152,10 @@ func getConn(gc *GitalyCommand) (*GitalyConn, error) {
 		tracing.WithConnectionString(gc.Config.GitlabTracing),
 	)
 
-	ctx, finished := tracing.ExtractFromEnv(context.Background())
-	ctx = withOutgoingMetadata(ctx, gc.Features)
+	childCtx, finished := tracing.ExtractFromEnv(ctx)
+	childCtx = withOutgoingMetadata(childCtx, gc.Features)
 
-	conn, err := client.Dial(gc.Address, connOpts)
+	conn, err := client.DialContext(childCtx, gc.Address, connOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -172,5 +166,5 @@ func getConn(gc *GitalyCommand) (*GitalyConn, error) {
 		conn.Close()
 	}
 
-	return &GitalyConn{ctx: ctx, conn: conn, close: finish}, nil
+	return &GitalyConn{ctx: childCtx, conn: conn, close: finish}, nil
 }
diff --git a/internal/handler/exec_test.go b/internal/handler/exec_test.go
index 915bf5a..6f84709 100644
--- a/internal/handler/exec_test.go
+++ b/internal/handler/exec_test.go
@@ -30,18 +30,18 @@ func TestRunGitalyCommand(t *testing.T) {
 		Address: "tcp://localhost:9999",
 	}
 
-	err := cmd.RunGitalyCommand(makeHandler(t, nil))
+	err := cmd.RunGitalyCommand(context.Background(), makeHandler(t, nil))
 	require.NoError(t, err)
 
 	expectedErr := errors.New("error")
-	err = cmd.RunGitalyCommand(makeHandler(t, expectedErr))
+	err = cmd.RunGitalyCommand(context.Background(), makeHandler(t, expectedErr))
 	require.Equal(t, err, expectedErr)
 }
 
 func TestMissingGitalyAddress(t *testing.T) {
 	cmd := GitalyCommand{Config: &config.Config{}}
 
-	err := cmd.RunGitalyCommand(makeHandler(t, nil))
+	err := cmd.RunGitalyCommand(context.Background(), makeHandler(t, nil))
 	require.EqualError(t, err, "no gitaly_address given")
 }
 
@@ -70,7 +70,7 @@ func TestGetConnMetadata(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			conn, err := getConn(tt.gc)
+			conn, err := getConn(context.Background(), tt.gc)
 			require.NoError(t, err)
 
 			md, exists := metadata.FromOutgoingContext(conn.ctx)