Merge branch 'cl-client-name' into 'master'

Specify client name when sending requests to Gitaly

See merge request gitlab-org/gitlab-workhorse!505

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/sirupsen/logrus v1.3.0
 	github.com/stretchr/testify v1.5.1
 	gitlab.com/gitlab-org/gitaly v1.74.0
-	gitlab.com/gitlab-org/labkit v0.0.0-20200327153541-fac94cb428e6
+	gitlab.com/gitlab-org/labkit v0.0.0-20200507062444-0149780c759d
 	golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f
 	golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
 	golang.org/x/tools v0.0.0-20200117161641-43d50277825c

internal/gitaly/gitaly.go

@@ -158,7 +158,9 @@ func newConnection(server Server) (*grpc.ClientConn, error) {
 			grpc_middleware.ChainStreamClient(
 				grpctracing.StreamClientTracingInterceptor(),
 				grpc_prometheus.StreamClientInterceptor,
-				grpccorrelation.StreamClientCorrelationInterceptor(),
+				grpccorrelation.StreamClientCorrelationInterceptor(
+					grpccorrelation.WithClientName("gitlab-workhorse"),
+				),
 			),
 		),
 
@@ -166,7 +168,9 @@ func newConnection(server Server) (*grpc.ClientConn, error) {
 			grpc_middleware.ChainUnaryClient(
 				grpctracing.UnaryClientTracingInterceptor(),
 				grpc_prometheus.UnaryClientInterceptor,
-				grpccorrelation.UnaryClientCorrelationInterceptor(),
+				grpccorrelation.UnaryClientCorrelationInterceptor(
+					grpccorrelation.WithClientName("gitlab-workhorse"),
+				),
 			),
 		),
 	)