diff options
| author | Andrew Newdigate <andrew@gitlab.com> | 2019-02-20 18:22:51 +0300 |
|---|---|---|
| committer | Andrew Newdigate <andrew@gitlab.com> | 2019-02-22 10:56:46 +0300 |
| commit | ecf355c711defc3096dc37eb532e279a77d882db (patch) | |
| tree | d29eac80e44e09ad60c16b9f07d244db69137c14 /cmd/gitaly-ssh/upload_archive.go | |
| parent | bdafb162b31ddae5a0123d30b3138360b1fa3c83 (diff) | |
Support distributed tracing in gitaly-ssh
Diffstat (limited to 'cmd/gitaly-ssh/upload_archive.go')
| -rw-r--r-- | cmd/gitaly-ssh/upload_archive.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/gitaly-ssh/upload_archive.go b/cmd/gitaly-ssh/upload_archive.go index b7bb86466..104227d36 100644 --- a/cmd/gitaly-ssh/upload_archive.go +++ b/cmd/gitaly-ssh/upload_archive.go @@ -11,13 +11,13 @@ import ( "google.golang.org/grpc" ) -func uploadArchive(conn *grpc.ClientConn, req string) (int32, error) { +func uploadArchive(ctx context.Context, conn *grpc.ClientConn, req string) (int32, error) { var request gitalypb.SSHUploadArchiveRequest if err := jsonpb.UnmarshalString(req, &request); err != nil { return 0, fmt.Errorf("json unmarshal: %v", err) } - ctx, cancel := context.WithCancel(context.Background()) + ctx, cancel := context.WithCancel(ctx) defer cancel() return client.UploadArchive(ctx, conn, os.Stdin, os.Stdout, os.Stderr, &request) |