Tracing: add grpc tracing interceptors (#591) · boltless.me/zoekt@88def9b

+1

cmd/zoekt-webserver/BUILD.bazel

··· 30 30 "@com_github_sourcegraph_log//:log", 31 31 "@com_github_sourcegraph_mountinfo//:mountinfo", 32 32 "@com_github_uber_jaeger_client_go//:jaeger-client-go", 33 + "@io_opentelemetry_go_contrib_instrumentation_google_golang_org_grpc_otelgrpc//:go_default_library", 33 34 "@io_opentelemetry_go_otel_trace//:trace", 34 35 "@org_golang_google_grpc//:go_default_library", 35 36 "@org_golang_x_net//http2",

+5 -1

cmd/zoekt-webserver/main.go

··· 38 38 "time" 39 39 40 40 "github.com/sourcegraph/mountinfo" 41 + "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" 41 42 "golang.org/x/net/http2" 42 43 "golang.org/x/net/http2/h2c" 43 44 "google.golang.org/grpc" ··· 282 283 log.Println("watchdog disabled") 283 284 } 284 285 285 - grpcServer := grpc.NewServer() 286 + grpcServer := grpc.NewServer( 287 + grpc.StreamInterceptor(otelgrpc.StreamServerInterceptor()), 288 + grpc.UnaryInterceptor(otelgrpc.UnaryServerInterceptor()), 289 + ) 286 290 v1.RegisterWebserverServiceServer(grpcServer, zoektgrpc.NewServer(web.NewTraceAwareSearcher(s.Searcher))) 287 291 288 292 srv := &http.Server{

+20 -6

deps.bzl

··· 126 126 name = "com_github_benbjohnson_clock", 127 127 build_file_proto_mode = "disable_global", 128 128 importpath = "github.com/benbjohnson/clock", 129 - sum = "h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=", 130 - version = "v1.1.0", 129 + sum = "h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=", 130 + version = "v1.3.0", 131 131 ) 132 132 go_repository( 133 133 name = "com_github_beorn7_perks", ··· 1799 1799 name = "com_github_stretchr_testify", 1800 1800 build_file_proto_mode = "disable_global", 1801 1801 importpath = "github.com/stretchr/testify", 1802 - sum = "h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=", 1803 - version = "v1.8.1", 1802 + sum = "h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=", 1803 + version = "v1.8.2", 1804 1804 ) 1805 1805 go_repository( 1806 1806 name = "com_github_tdewolff_minify_v2", ··· 1925 1925 name = "com_github_xeipuuv_gojsonpointer", 1926 1926 build_file_proto_mode = "disable_global", 1927 1927 importpath = "github.com/xeipuuv/gojsonpointer", 1928 - sum = "h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=", 1929 - version = "v0.0.0-20180127040702-4e3ac2762d5f", 1928 + sum = "h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=", 1929 + version = "v0.0.0-20190905194746-02993c407bfb", 1930 1930 ) 1931 1931 go_repository( 1932 1932 name = "com_github_xeipuuv_gojsonreference", ··· 2965 2965 version = "v0.24.0", 2966 2966 ) 2967 2967 go_repository( 2968 + name = "io_opentelemetry_go_contrib_instrumentation_google_golang_org_grpc_otelgrpc", 2969 + importpath = "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc", 2970 + sum = "h1:MUes2rbdXa1ce9mwKYzTyBG0CtqpLT0NgKTFAz8FIDs=", 2971 + version = "v0.39.0", 2972 + ) 2973 + 2974 + go_repository( 2968 2975 name = "io_opentelemetry_go_contrib_propagators_jaeger", 2969 2976 build_file_proto_mode = "disable_global", 2970 2977 importpath = "go.opentelemetry.io/contrib/propagators/jaeger", ··· 3020 3027 sum = "h1:Ntu7izEOIRHEgQNjbGc7j3eNtYMAiZfElJJ4JiiRDH4=", 3021 3028 version = "v1.13.0", 3022 3029 ) 3030 + go_repository( 3031 + name = "io_opentelemetry_go_otel_metric", 3032 + importpath = "go.opentelemetry.io/otel/metric", 3033 + sum = "h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q=", 3034 + version = "v0.36.0", 3035 + ) 3036 + 3023 3037 go_repository( 3024 3038 name = "io_opentelemetry_go_otel_sdk", 3025 3039 build_file_proto_mode = "disable_global",

+2

go.mod

··· 115 115 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect 116 116 github.com/yusufpapurcu/wmi v1.2.2 // indirect 117 117 go.opencensus.io v0.24.0 // indirect 118 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.39.0 // indirect 118 119 go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect 120 + go.opentelemetry.io/otel/metric v0.36.0 // indirect 119 121 go.opentelemetry.io/proto/otlp v0.19.0 // indirect 120 122 go.uber.org/multierr v1.9.0 // indirect 121 123 go.uber.org/zap v1.24.0 // indirect

+4

go.sum

··· 520 520 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= 521 521 go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= 522 522 go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= 523 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.39.0 h1:MUes2rbdXa1ce9mwKYzTyBG0CtqpLT0NgKTFAz8FIDs= 524 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.39.0/go.mod h1:tETUy0CG/bwb1vHaXyNZJJP9395sjxlQQ5e69KtvZMc= 523 525 go.opentelemetry.io/contrib/propagators/jaeger v1.14.0 h1:j6Xah53xRDrR+K1c4Y1uVHA0ESo69xDOblw+3OrVoF4= 524 526 go.opentelemetry.io/contrib/propagators/jaeger v1.14.0/go.mod h1:viOfwr1OqHmCF6G3KvKnnmpSJUX/rLzXztU18FC9ymU= 525 527 go.opentelemetry.io/contrib/propagators/ot v1.14.0 h1:jqxznjMkz/3l4NUsYq4OMbP+zs5twBbCZwSlSt82KXo= ··· 536 538 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0/go.mod h1:OhH1xvgA5jZW2M/S4PcvtDlFE1VULRRBsibBrKuJQGI= 537 539 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.13.0 h1:Ntu7izEOIRHEgQNjbGc7j3eNtYMAiZfElJJ4JiiRDH4= 538 540 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.13.0/go.mod h1:wZ9SAjm2sjw3vStBhlCfMZWZusyOQrwrHOFo00jyMC4= 541 + go.opentelemetry.io/otel/metric v0.36.0 h1:t0lgGI+L68QWt3QtOIlqM9gXoxqxWLhZ3R/e5oOAY0Q= 542 + go.opentelemetry.io/otel/metric v0.36.0/go.mod h1:wKVw57sd2HdSZAzyfOM9gTqqE8v7CbqWsYL6AyrH9qk= 539 543 go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM= 540 544 go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I= 541 545 go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY=

Configure Feed

Configure Feed