From 210a5c141c9d76bc9718860d67d77d73997b1534 Mon Sep 17 00:00:00 2001 From: Andrew Newdigate Date: Mon, 25 Feb 2019 16:19:08 +0200 Subject: Adds distributed tracing instrumentation to GitLab-Shell Adds distributed tracing instrumentation to GitLab-Shell using LabKit --- go/internal/handler/upload_archive.go | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'go/internal/handler/upload_archive.go') diff --git a/go/internal/handler/upload_archive.go b/go/internal/handler/upload_archive.go index 2175300..eb2fa90 100644 --- a/go/internal/handler/upload_archive.go +++ b/go/internal/handler/upload_archive.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 UploadArchive(gitalyAddress string, request *pb.SSHUploadArchiveRequest) (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()) +// UploadArchive issues a Gitaly upload-archive rpc to the provided address +func UploadArchive(ctx context.Context, conn *grpc.ClientConn, request *pb.SSHUploadArchiveRequest) (int32, error) { + ctx, cancel := context.WithCancel(ctx) defer cancel() + return client.UploadArchive(ctx, conn, os.Stdin, os.Stdout, os.Stderr, request) } -- cgit v1.2.1