Adds distributed tracing instrumentation to GitLab-Shellan-distributed-tracing

Adds distributed tracing instrumentation to GitLab-Shell using LabKit

1 files changed, 5 insertions, 13 deletions

diff --git a/go/internal/handler/upload_pack.go b/go/internal/handler/upload_pack.go
index dd146fb..1ce5ea3 100644
--- a/go/internal/handler/upload_pack.go
+++ b/go/internal/handler/upload_pack.go
@@ -2,25 +2,17 @@ package handler
 
 import (
 	"context"
-	"fmt"
 	"os"
 
 	pb "gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/client"
+	"google.golang.org/grpc"
 )
 
-func UploadPack(gitalyAddress string, request *pb.SSHUploadPackRequest) (int32, error) {
-	if gitalyAddress == "" {
-		return 0, fmt.Errorf("no gitaly_address given")
-	}
-
-	conn, err := client.Dial(gitalyAddress, dialOpts())
-	if err != nil {
-		return 0, err
-	}
-	defer conn.Close()
-
-	ctx, cancel := context.WithCancel(context.Background())
+// UploadPack issues a Gitaly upload-pack rpc to the provided address
+func UploadPack(ctx context.Context, conn *grpc.ClientConn, request *pb.SSHUploadPackRequest) (int32, error) {
+	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
+
 	return client.UploadPack(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request)
 }