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:
authorAndrew Newdigate <andrew@gitlab.com>2018-08-20 16:24:45 +0300
committerAndrew Newdigate <andrew@gitlab.com>2018-08-20 16:24:45 +0300
commit4ec21ecd820ef7587c58c1c28f4e1edca016040b (patch)
tree2b50f44bde917fc16f67498d479db2fbf9fe7231
parent71a578896f301d759247d15a6e62b89d0e3391c2 (diff)
Include Gitaly-Ruby in tracesan-opentracing
-rw-r--r--internal/rubyserver/rubyserver.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go
index 44cbbd8fc..b4972523e 100644
--- a/internal/rubyserver/rubyserver.go
+++ b/internal/rubyserver/rubyserver.go
@@ -21,6 +21,8 @@ import (
pb "gitlab.com/gitlab-org/gitaly-proto/go"
+ "github.com/grpc-ecosystem/go-grpc-middleware"
+ "github.com/grpc-ecosystem/go-grpc-middleware/tracing/opentracing"
"github.com/grpc-ecosystem/go-grpc-prometheus"
log "github.com/sirupsen/logrus"
"golang.org/x/net/context"
@@ -253,7 +255,7 @@ func dialOptions() []grpc.DialOption {
grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
return net.DialTimeout("unix", addr, timeout)
}),
- grpc.WithUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor),
- grpc.WithStreamInterceptor(grpc_prometheus.StreamClientInterceptor),
+ grpc.WithUnaryInterceptor(grpc_middleware.ChainUnaryClient(grpc_prometheus.UnaryClientInterceptor, grpc_opentracing.UnaryClientInterceptor())),
+ grpc.WithStreamInterceptor(grpc_middleware.ChainStreamClient(grpc_prometheus.StreamClientInterceptor, grpc_opentracing.StreamClientInterceptor())),
}
}