Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/service/repository/create_from_snapshot.go')
-rw-r--r--internal/service/repository/create_from_snapshot.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/service/repository/create_from_snapshot.go b/internal/service/repository/create_from_snapshot.go
index de8db898b..f307a8d3f 100644
--- a/internal/service/repository/create_from_snapshot.go
+++ b/internal/service/repository/create_from_snapshot.go
@@ -1,6 +1,7 @@
package repository
import (
+ "context"
"net"
"net/http"
"os"
@@ -12,7 +13,7 @@ import (
"gitlab.com/gitlab-org/gitaly/internal/helper"
"gitlab.com/gitlab-org/gitaly/internal/tempdir"
"gitlab.com/gitlab-org/labkit/correlation"
- "golang.org/x/net/context"
+ "gitlab.com/gitlab-org/labkit/tracing"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
@@ -39,7 +40,7 @@ var httpTransport = &http.Transport{
// (above). It also disables following redirects, as we don't expect this to be
// required for this RPC.
var httpClient = &http.Client{
- Transport: correlation.NewInstrumentedRoundTripper(httpTransport),
+ Transport: correlation.NewInstrumentedRoundTripper(tracing.NewRoundTripper(httpTransport)),
CheckRedirect: func(*http.Request, []*http.Request) error {
return http.ErrUseLastResponse
},