diff --git a/Makefile b/Makefile index 251440ebd6a..a5c6b260f02 100644 --- a/Makefile +++ b/Makefile @@ -465,7 +465,7 @@ PROTO_GOGO_MAPPINGS := $(shell echo \ .PHONY: proto proto: - # Generate gogo, gRPC-Gateway, swagger, go-validators, gRPC-storage-plugin output. + # Generate gogo, swagger, go-validators, gRPC-storage-plugin output. # # -I declares import folders, in order of importance # This is how proto resolves the protofile imports. @@ -473,8 +473,6 @@ proto: # folders and use the first one it finds. # # --gogo_out generates GoGo Protobuf output with gRPC plugin enabled. - # --grpc-gateway_out generates gRPC-Gateway output. - # --swagger_out generates an OpenAPI 2.0 specification for our gRPC-Gateway endpoints. # --govalidators_out generates Go validation files for our messages types, if specified. # # The lines starting with Mgoogle/... are proto import replacements, @@ -495,8 +493,6 @@ proto: $(PROTO_INCLUDES) \ --gogo_out=plugins=grpc,$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/api_v2 \ idl/proto/api_v2/query.proto - ### grpc-gateway generates 'query.pb.gw.go' that does not respect (gogoproto.customname) = "TraceID" - ### --grpc-gateway_out=$(PROTO_GOGO_MAPPINGS):$(PWD)/proto-gen/ \ ### --swagger_out=allow_merge=true:$(PWD)/proto-gen/openapi/ \ $(PROTOC) \ diff --git a/go.mod b/go.mod index bf6821dbbc9..0b9064df216 100644 --- a/go.mod +++ b/go.mod @@ -32,7 +32,6 @@ require ( github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.7.4 github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 - github.com/grpc-ecosystem/grpc-gateway v1.14.5 github.com/hashicorp/go-hclog v0.15.0 github.com/hashicorp/go-plugin v1.4.0 github.com/hashicorp/yamux v0.0.0-20190923154419-df201c70410d // indirect diff --git a/go.sum b/go.sum index 92a7fd342ac..7d55d743eba 100644 --- a/go.sum +++ b/go.sum @@ -150,7 +150,6 @@ github.com/frankban/quicktest v1.7.3/go.mod h1:V1d2J5pfxYH6EjBAgSK7YNXcXlTWxUHdE github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/globalsign/mgo v0.0.0-20180905125535-1ca0a4f7cbcb/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= @@ -258,13 +257,11 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb h1:H3tisfjQwq9FTyWqlKsZpgoYrsvn2pmTWvAiDHa5pho= github.com/gocql/gocql v0.0.0-20200228163523-cd4b606dd2fb/go.mod h1:DL0ekTmBSTdlNF25Orwt/JMzqIq3EJ4MVa/J/uK64OY= -github.com/gogo/googleapis v1.1.0 h1:kFkMAZBNAn4j7K0GiZr8cRYzejq68VbheufiV3YuyFI= github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -320,8 +317,6 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaD github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.14.5 h1:aiLxiiVzAXb7wb3lAmubA69IokWOoUNe+E7TdGKh8yw= -github.com/grpc-ecosystem/grpc-gateway v1.14.5/go.mod h1:UJ0EZAp832vCd54Wev9N1BMKEyvcZ5+IM0AwDrnlkEc= github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed h1:5upAirOpQc1Q53c0bnx2ufif5kANL7bfZWcc6VJWJd8= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= @@ -490,7 +485,6 @@ github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9 h1:Q github.com/opentracing-contrib/go-stdlib v0.0.0-20190519235532-cf7a6c988dc9/go.mod h1:PLldrQSroqzH70Xl+1DQcGnefIbqsKR7UDaiux3zV+w= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/opentracing/opentracing-go v1.1.0 h1:pWlfV3Bxv7k65HYwkikxat0+s3pV4bsqf19k25Ur8rU= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -553,7 +547,6 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563 h1:dY6ETXrvDG7Sa4vE8ZQG4yqWg6UnOcbqTAahkV813vQ= github.com/rcrowley/go-metrics v0.0.0-20190826022208-cac0b30c2563/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -604,8 +597,6 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E= -github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k= github.com/spf13/viper v1.7.1 h1:pM5oEahlgWv/WnHXpgbKz7iLIxRf65tye2Ci+XFK5sk= github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= @@ -618,7 +609,6 @@ github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoH github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -750,7 +740,6 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190921015927-1a5e07d1ff72/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= @@ -886,7 +875,6 @@ google.golang.org/genproto v0.0.0-20190530194941-fb225487d101/go.mod h1:z3L6/3dT google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20190927181202-20e1ac93f88c/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215 h1:0Uz5jLJQioKgVozXa1gzGbzYxbb/rhQEVvSWxzw5oUs= google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -900,7 +888,6 @@ google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.24.0/go.mod h1:XDChyiUovWa60DnaeDeZmSW86xtLtjtZbwvSiRnRtcA= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= @@ -940,7 +927,6 @@ gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRN gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -955,8 +941,6 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.1.1 h1:EVDuO03OCZwpV2t/tLLxPmPiomagMoBOgfPt0FM+4IY= -honnef.co/go/tools v0.1.1/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= honnef.co/go/tools v0.1.2 h1:SMdYLJl312RXuxXziCCHhRsp/tvct9cGKey0yv95tZM= honnef.co/go/tools v0.1.2/go.mod h1:NgwopIslSNH47DimFoV78dnkksY2EFtX0ajyb3K/las= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/idl b/idl index 52fb4c94406..34396033ff1 160000 --- a/idl +++ b/idl @@ -1 +1 @@ -Subproject commit 52fb4c944067f7661e6a5fa23ba4c44c6f9c2923 +Subproject commit 34396033ff11c60fced342ab2858ace278fedaa8 diff --git a/model/model.pb.go b/model/model.pb.go index 9c77da73246..166307a44a8 100644 --- a/model/model.pb.go +++ b/model/model.pb.go @@ -11,7 +11,6 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - golang_proto "github.com/golang/protobuf/proto" io "io" math "math" time "time" @@ -19,7 +18,6 @@ import ( // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = golang_proto.Marshal var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen @@ -575,6 +573,15 @@ func (m *Trace_ProcessMapping) GetProcess() Process { return Process{} } +// Note that both Span and Batch may contain a Process. +// This is different from the Thrift model which was only used +// for transport, because Proto model is also used by the backend +// as the domain model, where once a batch is received it is split +// into individual spans which are all processed independently, +// and therefore they all need a Process. As far as on-the-wire +// semantics, both Batch and Spans in the same message may contain +// their own instances of Process, with span.Process taking priority +// over batch.Process. type Batch struct { Spans []*Span `protobuf:"bytes,1,rep,name=spans,proto3" json:"spans,omitempty"` Process *Process `protobuf:"bytes,2,opt,name=process,proto3" json:"process,omitempty"` @@ -703,95 +710,82 @@ func (m *DependencyLink) GetSource() string { func init() { proto.RegisterEnum("jaeger.api_v2.ValueType", ValueType_name, ValueType_value) - golang_proto.RegisterEnum("jaeger.api_v2.ValueType", ValueType_name, ValueType_value) proto.RegisterEnum("jaeger.api_v2.SpanRefType", SpanRefType_name, SpanRefType_value) - golang_proto.RegisterEnum("jaeger.api_v2.SpanRefType", SpanRefType_name, SpanRefType_value) proto.RegisterType((*KeyValue)(nil), "jaeger.api_v2.KeyValue") - golang_proto.RegisterType((*KeyValue)(nil), "jaeger.api_v2.KeyValue") proto.RegisterType((*Log)(nil), "jaeger.api_v2.Log") - golang_proto.RegisterType((*Log)(nil), "jaeger.api_v2.Log") proto.RegisterType((*SpanRef)(nil), "jaeger.api_v2.SpanRef") - golang_proto.RegisterType((*SpanRef)(nil), "jaeger.api_v2.SpanRef") proto.RegisterType((*Process)(nil), "jaeger.api_v2.Process") - golang_proto.RegisterType((*Process)(nil), "jaeger.api_v2.Process") proto.RegisterType((*Span)(nil), "jaeger.api_v2.Span") - golang_proto.RegisterType((*Span)(nil), "jaeger.api_v2.Span") proto.RegisterType((*Trace)(nil), "jaeger.api_v2.Trace") - golang_proto.RegisterType((*Trace)(nil), "jaeger.api_v2.Trace") proto.RegisterType((*Trace_ProcessMapping)(nil), "jaeger.api_v2.Trace.ProcessMapping") - golang_proto.RegisterType((*Trace_ProcessMapping)(nil), "jaeger.api_v2.Trace.ProcessMapping") proto.RegisterType((*Batch)(nil), "jaeger.api_v2.Batch") - golang_proto.RegisterType((*Batch)(nil), "jaeger.api_v2.Batch") proto.RegisterType((*DependencyLink)(nil), "jaeger.api_v2.DependencyLink") - golang_proto.RegisterType((*DependencyLink)(nil), "jaeger.api_v2.DependencyLink") } func init() { proto.RegisterFile("model.proto", fileDescriptor_4c16552f9fdb66d8) } -func init() { golang_proto.RegisterFile("model.proto", fileDescriptor_4c16552f9fdb66d8) } var fileDescriptor_4c16552f9fdb66d8 = []byte{ - // 961 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x41, 0x8f, 0xdb, 0x44, - 0x14, 0xee, 0x24, 0x76, 0x6c, 0xbf, 0x64, 0x57, 0xd1, 0xb4, 0x74, 0xdd, 0x20, 0x36, 0x21, 0x15, - 0x52, 0xa8, 0x4a, 0xb6, 0x5d, 0xda, 0x3d, 0x20, 0x24, 0x54, 0xef, 0x12, 0x30, 0x64, 0x37, 0x68, - 0x76, 0x05, 0x82, 0x8b, 0x35, 0xeb, 0x4c, 0x5c, 0xb7, 0x8e, 0xc7, 0xb2, 0x1d, 0xa3, 0xdc, 0xf8, - 0x09, 0x88, 0x13, 0x47, 0xb8, 0xf2, 0x2b, 0x38, 0xf6, 0xc8, 0x81, 0x13, 0x12, 0x0b, 0x5a, 0x2e, - 0xfd, 0x19, 0x68, 0xc6, 0xe3, 0x6c, 0x37, 0x54, 0xb0, 0xbd, 0x70, 0xca, 0xbc, 0x99, 0xef, 0x7b, + // 957 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xc1, 0x6f, 0xe3, 0xc4, + 0x17, 0xee, 0x24, 0x76, 0x6c, 0xbf, 0xa4, 0x55, 0x34, 0xbb, 0xbf, 0xad, 0x37, 0x3f, 0xd1, 0x84, + 0xac, 0x90, 0xc2, 0xaa, 0xa4, 0x6c, 0xd9, 0xed, 0x01, 0x21, 0xa1, 0x75, 0x4b, 0xc0, 0x90, 0x36, + 0x68, 0x5a, 0x81, 0xe0, 0x62, 0x4d, 0x9d, 0x89, 0xd7, 0xbb, 0x8e, 0xc7, 0xb2, 0x1d, 0xa3, 0xdc, + 0xf8, 0x13, 0x10, 0x27, 0x8e, 0x70, 0xe5, 0x2f, 0xd9, 0x23, 0x07, 0x4e, 0x48, 0x14, 0xd4, 0xd3, + 0xfe, 0x19, 0x68, 0xc6, 0xe3, 0x74, 0x1b, 0x56, 0xd0, 0xbd, 0x70, 0xca, 0xbc, 0x99, 0xef, 0x7b, 0xf3, 0xde, 0xf7, 0xbe, 0x89, 0xa1, 0x39, 0xe7, 0x53, 0x16, 0x0d, 0x93, 0x94, 0xe7, 0x1c, 0x6f, - 0x3c, 0xa1, 0x2c, 0x60, 0xe9, 0x90, 0x26, 0xa1, 0x57, 0xec, 0x76, 0x6e, 0x04, 0x3c, 0xe0, 0xf2, - 0x64, 0x47, 0xac, 0x4a, 0x50, 0xa7, 0x1b, 0x70, 0x1e, 0x44, 0x6c, 0x47, 0x46, 0xa7, 0x8b, 0xd9, - 0x4e, 0x1e, 0xce, 0x59, 0x96, 0xd3, 0x79, 0xa2, 0x00, 0xdb, 0xeb, 0x80, 0xe9, 0x22, 0xa5, 0x79, - 0xc8, 0xe3, 0xf2, 0xbc, 0xff, 0x2b, 0x02, 0xf3, 0x53, 0xb6, 0xfc, 0x9c, 0x46, 0x0b, 0x86, 0xdb, - 0x50, 0x7f, 0xca, 0x96, 0x36, 0xea, 0xa1, 0x81, 0x45, 0xc4, 0x12, 0xef, 0x40, 0xa3, 0xf0, 0xf2, - 0x65, 0xc2, 0xec, 0x5a, 0x0f, 0x0d, 0x36, 0x77, 0xed, 0xe1, 0xa5, 0xaa, 0x86, 0x92, 0x77, 0xb2, - 0x4c, 0x18, 0xd1, 0x0b, 0xf1, 0x83, 0xaf, 0x83, 0x5e, 0x78, 0x59, 0x9e, 0xda, 0x75, 0x99, 0x44, - 0x2b, 0x8e, 0xf3, 0x14, 0xbf, 0x26, 0xb2, 0x9c, 0x72, 0x1e, 0xd9, 0x5a, 0x0f, 0x0d, 0x4c, 0xa2, - 0x17, 0x0e, 0xe7, 0x11, 0xde, 0x02, 0xa3, 0xf0, 0xc2, 0x38, 0xdf, 0x7b, 0x60, 0xeb, 0x3d, 0x34, - 0xa8, 0x93, 0x46, 0xe1, 0x8a, 0x08, 0xbf, 0x0e, 0x56, 0xe1, 0xcd, 0x22, 0x4e, 0xc5, 0x51, 0xa3, - 0x87, 0x06, 0x88, 0x98, 0xc5, 0xa8, 0x8c, 0xf1, 0x2d, 0x30, 0x0b, 0xef, 0x34, 0x8c, 0x69, 0xba, - 0xb4, 0x8d, 0x1e, 0x1a, 0xb4, 0x88, 0x51, 0x38, 0x32, 0x7c, 0xcf, 0x7c, 0xfe, 0x43, 0x17, 0x3d, - 0xff, 0xb1, 0x8b, 0xfa, 0xdf, 0x20, 0xa8, 0x8f, 0x79, 0x80, 0x1d, 0xb0, 0x56, 0x8a, 0xc8, 0xbe, - 0x9a, 0xbb, 0x9d, 0x61, 0x29, 0xc9, 0xb0, 0x92, 0x64, 0x78, 0x52, 0x21, 0x1c, 0xf3, 0xd9, 0x59, - 0xf7, 0xda, 0xb7, 0x7f, 0x74, 0x11, 0xb9, 0xa0, 0xe1, 0x87, 0xd0, 0x98, 0x85, 0x2c, 0x9a, 0x66, - 0x76, 0xad, 0x57, 0x1f, 0x34, 0x77, 0xb7, 0xd6, 0x34, 0xa8, 0xe4, 0x73, 0x34, 0xc1, 0x26, 0x0a, - 0xdc, 0xff, 0x09, 0x81, 0x71, 0x9c, 0xd0, 0x98, 0xb0, 0x19, 0x7e, 0x08, 0x66, 0x9e, 0x52, 0x9f, - 0x79, 0xe1, 0x54, 0x56, 0xd1, 0x72, 0x3a, 0x02, 0xfb, 0xdb, 0x59, 0xd7, 0x38, 0x11, 0xfb, 0xee, - 0xc1, 0xf9, 0xc5, 0x92, 0x18, 0x12, 0xeb, 0x4e, 0xf1, 0x7d, 0x30, 0xb2, 0x84, 0xc6, 0x82, 0x55, - 0x93, 0x2c, 0x5b, 0xb1, 0x1a, 0x22, 0xb1, 0x24, 0xa9, 0x15, 0x69, 0x08, 0xa0, 0x3b, 0x15, 0x37, - 0xa5, 0x6c, 0x56, 0x8e, 0xac, 0x2e, 0x47, 0xd6, 0x59, 0x2b, 0x57, 0xd5, 0x24, 0x87, 0x66, 0xa4, - 0xe5, 0xa2, 0xef, 0x81, 0xf1, 0x59, 0xca, 0x7d, 0x96, 0x65, 0xf8, 0x4d, 0x68, 0x65, 0x2c, 0x2d, - 0x42, 0x9f, 0x79, 0x31, 0x9d, 0x33, 0xe5, 0x86, 0xa6, 0xda, 0x3b, 0xa2, 0x73, 0x86, 0xef, 0x83, - 0x96, 0xd3, 0xe0, 0x8a, 0x7a, 0x48, 0x68, 0xff, 0x77, 0x0d, 0x34, 0x71, 0xf3, 0xff, 0x28, 0xc5, - 0x5b, 0xb0, 0xc9, 0x13, 0x56, 0xba, 0xbd, 0x6c, 0xa5, 0xf4, 0xe4, 0xc6, 0x6a, 0x57, 0x36, 0xf3, - 0x3e, 0x40, 0xca, 0x66, 0x2c, 0x65, 0xb1, 0xcf, 0x32, 0x5b, 0x93, 0x2d, 0xdd, 0x7c, 0xb9, 0x66, - 0xaa, 0xa3, 0x17, 0xf0, 0xf8, 0x36, 0xe8, 0xb3, 0x48, 0x68, 0x21, 0x1c, 0xbc, 0xe1, 0x6c, 0xa8, - 0xaa, 0xf4, 0x91, 0xd8, 0x24, 0xe5, 0x19, 0xde, 0x07, 0xc8, 0x72, 0x9a, 0xe6, 0x9e, 0x30, 0x95, - 0x34, 0xf4, 0x95, 0x6d, 0x28, 0x79, 0xe2, 0x04, 0x7f, 0x00, 0x66, 0xf5, 0x76, 0xa5, 0xef, 0x9b, - 0xbb, 0xb7, 0xfe, 0x91, 0xe2, 0x40, 0x01, 0xca, 0x0c, 0xdf, 0x8b, 0x0c, 0x2b, 0xd2, 0x6a, 0x6a, - 0xe6, 0x95, 0xa7, 0x86, 0xef, 0x82, 0x16, 0xf1, 0x20, 0xb3, 0x2d, 0x49, 0xc1, 0x6b, 0x94, 0x31, - 0x0f, 0x2a, 0xb4, 0x40, 0xe1, 0x7b, 0x60, 0x24, 0xa5, 0x89, 0x6c, 0x90, 0x05, 0xae, 0xcb, 0xa8, - 0x2c, 0x46, 0x2a, 0x18, 0xbe, 0x0b, 0xa0, 0x96, 0x62, 0xb0, 0x4d, 0x31, 0x1e, 0x67, 0xe3, 0xfc, - 0xac, 0x6b, 0x29, 0xa4, 0x7b, 0x40, 0x2c, 0x05, 0x70, 0xa7, 0xb8, 0x03, 0xe6, 0xd7, 0x34, 0x8d, - 0xc3, 0x38, 0xc8, 0xec, 0x56, 0xaf, 0x3e, 0xb0, 0xc8, 0x2a, 0xee, 0x7f, 0x57, 0x03, 0x5d, 0x9a, - 0x06, 0xbf, 0x0d, 0xba, 0x30, 0x40, 0x66, 0x23, 0x59, 0xf4, 0xf5, 0x97, 0x8d, 0xb2, 0x44, 0xe0, - 0x4f, 0xa0, 0x59, 0x5d, 0x3f, 0xa7, 0x89, 0xb2, 0xf3, 0xed, 0x35, 0x82, 0xcc, 0x5a, 0x95, 0x7e, - 0x48, 0x93, 0x24, 0x8c, 0xab, 0xb6, 0xab, 0xe2, 0x0f, 0x69, 0x72, 0xa9, 0xb8, 0xfa, 0xe5, 0xe2, - 0x3a, 0x05, 0x6c, 0x5e, 0xe6, 0xaf, 0x35, 0x8e, 0xfe, 0xa3, 0xf1, 0xbd, 0x0b, 0x61, 0x6b, 0xff, - 0x26, 0xac, 0x2a, 0xab, 0x02, 0xf7, 0x9f, 0x80, 0xee, 0xd0, 0xdc, 0x7f, 0xfc, 0x2a, 0x9a, 0xbc, - 0xd2, 0x5d, 0xe8, 0xe2, 0xae, 0x05, 0x6c, 0x1e, 0xb0, 0x84, 0xc5, 0x53, 0x16, 0xfb, 0xcb, 0x71, - 0x18, 0x3f, 0xc5, 0x37, 0xa1, 0x91, 0xd0, 0x94, 0xc5, 0xb9, 0xfa, 0x0b, 0x51, 0x11, 0xbe, 0x01, - 0xba, 0xff, 0x38, 0x8c, 0xca, 0x87, 0x6c, 0x91, 0x32, 0xc0, 0x6f, 0x00, 0xf8, 0x34, 0x8a, 0x3c, - 0x9f, 0x2f, 0xe2, 0x5c, 0xbe, 0x54, 0x8d, 0x58, 0x62, 0x67, 0x5f, 0x6c, 0x88, 0x64, 0x19, 0x5f, - 0xa4, 0x3e, 0x93, 0x9f, 0x10, 0x8b, 0xa8, 0xe8, 0xce, 0x87, 0x60, 0xad, 0xbe, 0x41, 0x18, 0xa0, - 0x71, 0x7c, 0x42, 0xdc, 0xa3, 0x8f, 0xda, 0xd7, 0xb0, 0x09, 0x9a, 0x33, 0x99, 0x8c, 0xdb, 0x08, - 0x5b, 0xa0, 0xbb, 0x47, 0x27, 0x7b, 0x0f, 0xda, 0x35, 0xdc, 0x04, 0x63, 0x34, 0x9e, 0x3c, 0x12, - 0x41, 0x5d, 0xa0, 0x1d, 0xf7, 0xe8, 0x11, 0xf9, 0xb2, 0xad, 0xdd, 0x79, 0x07, 0x9a, 0x2f, 0xfc, - 0x2f, 0xe2, 0x16, 0x98, 0xfb, 0x1f, 0xbb, 0xe3, 0x03, 0x6f, 0x32, 0x6a, 0x5f, 0xc3, 0x6d, 0x68, - 0x8d, 0x26, 0xe3, 0xf1, 0xe4, 0x8b, 0x63, 0x6f, 0x44, 0x26, 0x87, 0x6d, 0xe4, 0xdc, 0x7b, 0x76, - 0xbe, 0x8d, 0x7e, 0x39, 0xdf, 0x46, 0x7f, 0x9e, 0x6f, 0xa3, 0x9f, 0xff, 0xda, 0x46, 0xb0, 0x15, - 0x72, 0xa5, 0x93, 0xf8, 0xc7, 0x0a, 0xe3, 0x40, 0xc9, 0xf5, 0x95, 0x2e, 0xbf, 0xe9, 0xa7, 0x0d, - 0xf9, 0x46, 0xdf, 0xfd, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x18, 0x22, 0x2c, 0x8e, 0xe3, 0x07, 0x00, - 0x00, + 0x3e, 0xa5, 0x2c, 0x60, 0xe9, 0x90, 0x26, 0xa1, 0x57, 0xec, 0x77, 0x6e, 0x07, 0x3c, 0xe0, 0xf2, + 0x64, 0x4f, 0xac, 0x4a, 0x50, 0xa7, 0x1b, 0x70, 0x1e, 0x44, 0x6c, 0x4f, 0x46, 0xe7, 0x8b, 0xd9, + 0x5e, 0x1e, 0xce, 0x59, 0x96, 0xd3, 0x79, 0xa2, 0x00, 0x3b, 0xeb, 0x80, 0xe9, 0x22, 0xa5, 0x79, + 0xc8, 0xe3, 0xf2, 0xbc, 0xff, 0x2b, 0x02, 0xf3, 0x33, 0xb6, 0xfc, 0x82, 0x46, 0x0b, 0x86, 0xdb, + 0x50, 0x7f, 0xc6, 0x96, 0x36, 0xea, 0xa1, 0x81, 0x45, 0xc4, 0x12, 0xef, 0x41, 0xa3, 0xf0, 0xf2, + 0x65, 0xc2, 0xec, 0x5a, 0x0f, 0x0d, 0xb6, 0xf6, 0xed, 0xe1, 0xb5, 0xaa, 0x86, 0x92, 0x77, 0xb6, + 0x4c, 0x18, 0xd1, 0x0b, 0xf1, 0x83, 0x6f, 0x81, 0x5e, 0x78, 0x59, 0x9e, 0xda, 0x75, 0x99, 0x44, + 0x2b, 0x4e, 0xf3, 0x14, 0xff, 0x4f, 0x64, 0x39, 0xe7, 0x3c, 0xb2, 0xb5, 0x1e, 0x1a, 0x98, 0x44, + 0x2f, 0x1c, 0xce, 0x23, 0xbc, 0x0d, 0x46, 0xe1, 0x85, 0x71, 0x7e, 0xf0, 0xd0, 0xd6, 0x7b, 0x68, + 0x50, 0x27, 0x8d, 0xc2, 0x15, 0x11, 0xfe, 0x3f, 0x58, 0x85, 0x37, 0x8b, 0x38, 0x15, 0x47, 0x8d, + 0x1e, 0x1a, 0x20, 0x62, 0x16, 0xa3, 0x32, 0xc6, 0x77, 0xc1, 0x2c, 0xbc, 0xf3, 0x30, 0xa6, 0xe9, + 0xd2, 0x36, 0x7a, 0x68, 0xd0, 0x22, 0x46, 0xe1, 0xc8, 0xf0, 0x7d, 0xf3, 0xc5, 0x8f, 0x5d, 0xf4, + 0xe2, 0xa7, 0x2e, 0xea, 0x7f, 0x8b, 0xa0, 0x3e, 0xe6, 0x01, 0x76, 0xc0, 0x5a, 0x29, 0x22, 0xfb, + 0x6a, 0xee, 0x77, 0x86, 0xa5, 0x24, 0xc3, 0x4a, 0x92, 0xe1, 0x59, 0x85, 0x70, 0xcc, 0xe7, 0x17, + 0xdd, 0x8d, 0xef, 0xfe, 0xe8, 0x22, 0x72, 0x45, 0xc3, 0x8f, 0xa0, 0x31, 0x0b, 0x59, 0x34, 0xcd, + 0xec, 0x5a, 0xaf, 0x3e, 0x68, 0xee, 0x6f, 0xaf, 0x69, 0x50, 0xc9, 0xe7, 0x68, 0x82, 0x4d, 0x14, + 0xb8, 0xff, 0x33, 0x02, 0xe3, 0x34, 0xa1, 0x31, 0x61, 0x33, 0xfc, 0x08, 0xcc, 0x3c, 0xa5, 0x3e, + 0xf3, 0xc2, 0xa9, 0xac, 0xa2, 0xe5, 0x74, 0x04, 0xf6, 0xb7, 0x8b, 0xae, 0x71, 0x26, 0xf6, 0xdd, + 0xa3, 0xcb, 0xab, 0x25, 0x31, 0x24, 0xd6, 0x9d, 0xe2, 0x07, 0x60, 0x64, 0x09, 0x8d, 0x05, 0xab, + 0x26, 0x59, 0xb6, 0x62, 0x35, 0x44, 0x62, 0x49, 0x52, 0x2b, 0xd2, 0x10, 0x40, 0x77, 0x2a, 0x6e, + 0x4a, 0xd9, 0xac, 0x1c, 0x59, 0x5d, 0x8e, 0xac, 0xb3, 0x56, 0xae, 0xaa, 0x49, 0x0e, 0xcd, 0x48, + 0xcb, 0x45, 0xdf, 0x03, 0xe3, 0xf3, 0x94, 0xfb, 0x2c, 0xcb, 0xf0, 0x9b, 0xd0, 0xca, 0x58, 0x5a, + 0x84, 0x3e, 0xf3, 0x62, 0x3a, 0x67, 0xca, 0x0d, 0x4d, 0xb5, 0x77, 0x42, 0xe7, 0x0c, 0x3f, 0x00, + 0x2d, 0xa7, 0xc1, 0x0d, 0xf5, 0x90, 0xd0, 0xfe, 0xef, 0x1a, 0x68, 0xe2, 0xe6, 0xff, 0x50, 0x8a, + 0xb7, 0x60, 0x8b, 0x27, 0xac, 0x74, 0x7b, 0xd9, 0x4a, 0xe9, 0xc9, 0xcd, 0xd5, 0xae, 0x6c, 0xe6, + 0x03, 0x80, 0x94, 0xcd, 0x58, 0xca, 0x62, 0x9f, 0x65, 0xb6, 0x26, 0x5b, 0xba, 0xf3, 0x6a, 0xcd, + 0x54, 0x47, 0x2f, 0xe1, 0xf1, 0x3d, 0xd0, 0x67, 0x91, 0xd0, 0x42, 0x38, 0x78, 0xd3, 0xd9, 0x54, + 0x55, 0xe9, 0x23, 0xb1, 0x49, 0xca, 0x33, 0x7c, 0x08, 0x90, 0xe5, 0x34, 0xcd, 0x3d, 0x61, 0x2a, + 0x69, 0xe8, 0x1b, 0xdb, 0x50, 0xf2, 0xc4, 0x09, 0xfe, 0x10, 0xcc, 0xea, 0xed, 0x4a, 0xdf, 0x37, + 0xf7, 0xef, 0xfe, 0x2d, 0xc5, 0x91, 0x02, 0x94, 0x19, 0x7e, 0x10, 0x19, 0x56, 0xa4, 0xd5, 0xd4, + 0xcc, 0x1b, 0x4f, 0x0d, 0xef, 0x82, 0x16, 0xf1, 0x20, 0xb3, 0x2d, 0x49, 0xc1, 0x6b, 0x94, 0x31, + 0x0f, 0x2a, 0xb4, 0x40, 0xe1, 0x77, 0xc1, 0x48, 0x4a, 0x13, 0xd9, 0x20, 0x0b, 0x5c, 0x97, 0x51, + 0x59, 0x8c, 0x54, 0x30, 0xbc, 0x0b, 0xa0, 0x96, 0x62, 0xb0, 0x4d, 0x31, 0x1e, 0x67, 0xf3, 0xf2, + 0xa2, 0x6b, 0x29, 0xa4, 0x7b, 0x44, 0x2c, 0x05, 0x70, 0xa7, 0xb8, 0x03, 0xe6, 0x37, 0x34, 0x8d, + 0xc3, 0x38, 0xc8, 0xec, 0x56, 0xaf, 0x3e, 0xb0, 0xc8, 0x2a, 0xee, 0x7f, 0x5f, 0x03, 0x5d, 0x9a, + 0x06, 0xbf, 0x0d, 0xba, 0x30, 0x40, 0x66, 0x23, 0x59, 0xf4, 0xad, 0x57, 0x8d, 0xb2, 0x44, 0xe0, + 0x4f, 0xa1, 0x59, 0x5d, 0x3f, 0xa7, 0x89, 0xb2, 0xf3, 0xbd, 0x35, 0x82, 0xcc, 0x5a, 0x95, 0x7e, + 0x4c, 0x93, 0x24, 0x8c, 0xab, 0xb6, 0xab, 0xe2, 0x8f, 0x69, 0x72, 0xad, 0xb8, 0xfa, 0xf5, 0xe2, + 0x3a, 0x05, 0x6c, 0x5d, 0xe7, 0xaf, 0x35, 0x8e, 0xfe, 0xa5, 0xf1, 0x83, 0x2b, 0x61, 0x6b, 0xff, + 0x24, 0xac, 0x2a, 0xab, 0x02, 0xf7, 0x9f, 0x82, 0xee, 0xd0, 0xdc, 0x7f, 0xf2, 0x3a, 0x9a, 0xbc, + 0xd6, 0x5d, 0xe8, 0xea, 0xae, 0x05, 0x6c, 0x1d, 0xb1, 0x84, 0xc5, 0x53, 0x16, 0xfb, 0xcb, 0x71, + 0x18, 0x3f, 0xc3, 0x77, 0xa0, 0x91, 0xd0, 0x94, 0xc5, 0xb9, 0xfa, 0x0b, 0x51, 0x11, 0xbe, 0x0d, + 0xba, 0xff, 0x24, 0x8c, 0xca, 0x87, 0x6c, 0x91, 0x32, 0xc0, 0x6f, 0x00, 0xf8, 0x34, 0x8a, 0x3c, + 0x9f, 0x2f, 0xe2, 0x5c, 0xbe, 0x54, 0x8d, 0x58, 0x62, 0xe7, 0x50, 0x6c, 0x88, 0x64, 0x19, 0x5f, + 0xa4, 0x3e, 0x93, 0x9f, 0x10, 0x8b, 0xa8, 0xe8, 0xfe, 0x47, 0x60, 0xad, 0xbe, 0x41, 0x18, 0xa0, + 0x71, 0x7a, 0x46, 0xdc, 0x93, 0x8f, 0xdb, 0x1b, 0xd8, 0x04, 0xcd, 0x99, 0x4c, 0xc6, 0x6d, 0x84, + 0x2d, 0xd0, 0xdd, 0x93, 0xb3, 0x83, 0x87, 0xed, 0x1a, 0x6e, 0x82, 0x31, 0x1a, 0x4f, 0x1e, 0x8b, + 0xa0, 0x2e, 0xd0, 0x8e, 0x7b, 0xf2, 0x98, 0x7c, 0xd5, 0xd6, 0xee, 0xbf, 0x03, 0xcd, 0x97, 0xfe, + 0x17, 0x71, 0x0b, 0xcc, 0xc3, 0x4f, 0xdc, 0xf1, 0x91, 0x37, 0x19, 0xb5, 0x37, 0x70, 0x1b, 0x5a, + 0xa3, 0xc9, 0x78, 0x3c, 0xf9, 0xf2, 0xd4, 0x1b, 0x91, 0xc9, 0x71, 0x1b, 0x39, 0xbb, 0xcf, 0x2f, + 0x77, 0xd0, 0x2f, 0x97, 0x3b, 0xe8, 0xcf, 0xcb, 0x1d, 0x04, 0xdb, 0x21, 0x57, 0x1a, 0x89, 0x7f, + 0xab, 0x30, 0x0e, 0x94, 0x54, 0x5f, 0xeb, 0xf2, 0x7b, 0x7e, 0xde, 0x90, 0xef, 0xf3, 0xbd, 0xbf, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x45, 0x11, 0xa2, 0xdf, 0x07, 0x00, 0x00, } func (this *KeyValue) Compare(that interface{}) int { diff --git a/plugin/storage/grpc/proto/storage.proto b/plugin/storage/grpc/proto/storage.proto index 739f31d1c94..a3e5eb9c31d 100644 --- a/plugin/storage/grpc/proto/storage.proto +++ b/plugin/storage/grpc/proto/storage.proto @@ -31,8 +31,6 @@ option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; // Enable custom Size method (Required by Marshal and Unmarshal). option (gogoproto.sizer_all) = true; -// Enable registration with golang/protobuf for the grpc-gateway. -option (gogoproto.goproto_registration) = true; message GetDependenciesRequest { google.protobuf.Timestamp start_time = 1 [ diff --git a/proto-gen/api_v2/collector.pb.go b/proto-gen/api_v2/collector.pb.go index 8eea19b161a..075e3c62dfe 100644 --- a/proto-gen/api_v2/collector.pb.go +++ b/proto-gen/api_v2/collector.pb.go @@ -9,8 +9,6 @@ import ( _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - golang_proto "github.com/golang/protobuf/proto" - _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" model "github.com/jaegertracing/jaeger/model" grpc "google.golang.org/grpc" io "io" @@ -19,7 +17,6 @@ import ( // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = golang_proto.Marshal var _ = fmt.Errorf var _ = math.Inf @@ -117,37 +114,30 @@ var xxx_messageInfo_PostSpansResponse proto.InternalMessageInfo func init() { proto.RegisterType((*PostSpansRequest)(nil), "jaeger.api_v2.PostSpansRequest") - golang_proto.RegisterType((*PostSpansRequest)(nil), "jaeger.api_v2.PostSpansRequest") proto.RegisterType((*PostSpansResponse)(nil), "jaeger.api_v2.PostSpansResponse") - golang_proto.RegisterType((*PostSpansResponse)(nil), "jaeger.api_v2.PostSpansResponse") } func init() { proto.RegisterFile("collector.proto", fileDescriptor_9305884a292fdf82) } -func init() { golang_proto.RegisterFile("collector.proto", fileDescriptor_9305884a292fdf82) } var fileDescriptor_9305884a292fdf82 = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0x31, 0x4f, 0xc2, 0x40, - 0x14, 0xc7, 0x3d, 0x14, 0x12, 0x8f, 0x10, 0xb1, 0x92, 0x48, 0x88, 0x29, 0xa4, 0x8b, 0x86, 0x48, - 0x0f, 0x6b, 0x5c, 0xd8, 0xa8, 0x2e, 0x3a, 0x11, 0xd8, 0x5c, 0xcc, 0x51, 0x2f, 0xd7, 0x9a, 0x72, - 0xef, 0xbc, 0x3b, 0xea, 0xe2, 0xe4, 0x47, 0xd0, 0x2f, 0xe4, 0xc8, 0x68, 0xe2, 0x6e, 0x0c, 0xfa, - 0x41, 0x0c, 0x6d, 0x35, 0x82, 0x71, 0x7a, 0xef, 0xee, 0xff, 0xcb, 0xff, 0xfd, 0xdf, 0xc3, 0x5b, - 0x01, 0xc4, 0x31, 0x0b, 0x0c, 0x28, 0x57, 0x2a, 0x30, 0x60, 0x55, 0x6e, 0x28, 0xe3, 0x4c, 0xb9, - 0x54, 0x46, 0x57, 0x89, 0xd7, 0x28, 0x4f, 0xe0, 0x9a, 0xc5, 0x99, 0xd6, 0xa8, 0x71, 0xe0, 0x90, - 0xb6, 0x64, 0xd1, 0xe5, 0xbf, 0x7b, 0x1c, 0x80, 0xc7, 0x8c, 0x50, 0x19, 0x11, 0x2a, 0x04, 0x18, - 0x6a, 0x22, 0x10, 0x3a, 0x57, 0x0f, 0xd3, 0x12, 0x74, 0x38, 0x13, 0x1d, 0x7d, 0x47, 0x39, 0x67, - 0x8a, 0x80, 0x4c, 0x89, 0xbf, 0xb4, 0x73, 0x86, 0xab, 0x03, 0xd0, 0x66, 0x24, 0xa9, 0xd0, 0x43, - 0x76, 0x3b, 0x65, 0xda, 0x58, 0x5d, 0x5c, 0x1c, 0x53, 0x13, 0x84, 0x75, 0xd4, 0x42, 0x07, 0x65, - 0xaf, 0xe6, 0x2e, 0x25, 0x74, 0xfd, 0x85, 0xe6, 0x6f, 0xcc, 0xde, 0x9a, 0x6b, 0xc3, 0x0c, 0x74, - 0x76, 0xf0, 0xf6, 0x2f, 0x17, 0x2d, 0x41, 0x68, 0xe6, 0xdd, 0xe3, 0xea, 0xe9, 0xf7, 0xae, 0x23, - 0xa6, 0x92, 0x28, 0x60, 0x56, 0x88, 0x37, 0x7f, 0x40, 0xab, 0xb9, 0x62, 0xbc, 0x1a, 0xa4, 0xd1, - 0xfa, 0x1f, 0xc8, 0x66, 0x38, 0xf5, 0x87, 0xd7, 0xcf, 0xa7, 0x82, 0xe5, 0x54, 0xd2, 0x63, 0x24, - 0x1e, 0xd1, 0x0b, 0xb9, 0x87, 0xda, 0x7e, 0xf2, 0xd8, 0xf7, 0xad, 0xa2, 0xb7, 0x7e, 0xe4, 0x76, - 0xdb, 0x05, 0x54, 0x50, 0x27, 0x18, 0x5f, 0xa4, 0x66, 0xad, 0xfe, 0xe0, 0xdc, 0xda, 0x0f, 0x8d, - 0x91, 0xba, 0x47, 0x08, 0x8f, 0x4c, 0x38, 0x1d, 0xbb, 0x01, 0x4c, 0x48, 0x36, 0xcb, 0x28, 0x1a, - 0x44, 0x82, 0xe7, 0xaf, 0xd9, 0xdc, 0x46, 0x2f, 0x73, 0x1b, 0xbd, 0xcf, 0x6d, 0xf4, 0xfc, 0x61, - 0x23, 0xbc, 0x1b, 0x81, 0xbb, 0x04, 0xe6, 0xd9, 0x2e, 0x4b, 0x59, 0x1d, 0x97, 0xd2, 0xbb, 0x1e, - 0x7f, 0x05, 0x00, 0x00, 0xff, 0xff, 0x69, 0xe8, 0xca, 0x55, 0xe8, 0x01, 0x00, 0x00, + // 262 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x4f, 0xce, 0xcf, 0xc9, + 0x49, 0x4d, 0x2e, 0xc9, 0x2f, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcd, 0x4a, 0x4c, + 0x4d, 0x4f, 0x2d, 0xd2, 0x4b, 0x2c, 0xc8, 0x8c, 0x2f, 0x33, 0x92, 0xe2, 0xce, 0xcd, 0x4f, 0x49, + 0xcd, 0x81, 0xc8, 0x49, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x99, 0xfa, 0x20, 0x16, 0x54, 0x54, + 0x26, 0x3d, 0x3f, 0x3f, 0x3d, 0x27, 0x55, 0x3f, 0xb1, 0x20, 0x53, 0x3f, 0x31, 0x2f, 0x2f, 0xbf, + 0x24, 0xb1, 0x24, 0x33, 0x3f, 0xaf, 0x18, 0x22, 0xab, 0xe4, 0xc2, 0x25, 0x10, 0x90, 0x5f, 0x5c, + 0x12, 0x5c, 0x90, 0x98, 0x57, 0x1c, 0x94, 0x5a, 0x58, 0x9a, 0x5a, 0x5c, 0x22, 0x64, 0xc0, 0xc5, + 0x9a, 0x94, 0x58, 0x92, 0x9c, 0x21, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xa2, 0x87, 0x62, + 0xa7, 0x9e, 0x13, 0x48, 0xce, 0x89, 0xe5, 0xc4, 0x3d, 0x79, 0x86, 0x20, 0x88, 0x42, 0x25, 0x61, + 0x2e, 0x41, 0x24, 0x53, 0x8a, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x8d, 0x6a, 0xb8, 0x04, 0x9c, 0x61, + 0xae, 0x0f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0x15, 0xca, 0xe0, 0xe2, 0x84, 0x2b, 0x14, 0x92, + 0x47, 0x33, 0x18, 0xdd, 0x21, 0x52, 0x0a, 0xb8, 0x15, 0x40, 0xec, 0x50, 0x92, 0x68, 0xba, 0xfc, + 0x64, 0x32, 0x93, 0x90, 0x12, 0x2f, 0xd8, 0x7b, 0x65, 0x46, 0xfa, 0xc5, 0x20, 0x69, 0x2b, 0x46, + 0x2d, 0x27, 0xdd, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x91, + 0x4b, 0x3c, 0x33, 0x1f, 0x6a, 0x56, 0x49, 0x51, 0x62, 0x72, 0x66, 0x5e, 0x3a, 0xd4, 0xc8, 0x28, + 0x36, 0x08, 0x9d, 0xc4, 0x06, 0x0e, 0x0e, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x18, + 0xa1, 0x12, 0x71, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto-gen/api_v2/query.pb.go b/proto-gen/api_v2/query.pb.go index 39545dc9b1e..b3c5b815e10 100644 --- a/proto-gen/api_v2/query.pb.go +++ b/proto-gen/api_v2/query.pb.go @@ -11,8 +11,6 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - golang_proto "github.com/golang/protobuf/proto" - _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" github_com_jaegertracing_jaeger_model "github.com/jaegertracing/jaeger/model" model "github.com/jaegertracing/jaeger/model" grpc "google.golang.org/grpc" @@ -23,7 +21,6 @@ import ( // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = golang_proto.Marshal var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen @@ -705,104 +702,85 @@ func (m *GetDependenciesResponse) GetDependencies() []model.DependencyLink { func init() { proto.RegisterType((*GetTraceRequest)(nil), "jaeger.api_v2.GetTraceRequest") - golang_proto.RegisterType((*GetTraceRequest)(nil), "jaeger.api_v2.GetTraceRequest") proto.RegisterType((*SpansResponseChunk)(nil), "jaeger.api_v2.SpansResponseChunk") - golang_proto.RegisterType((*SpansResponseChunk)(nil), "jaeger.api_v2.SpansResponseChunk") proto.RegisterType((*ArchiveTraceRequest)(nil), "jaeger.api_v2.ArchiveTraceRequest") - golang_proto.RegisterType((*ArchiveTraceRequest)(nil), "jaeger.api_v2.ArchiveTraceRequest") proto.RegisterType((*ArchiveTraceResponse)(nil), "jaeger.api_v2.ArchiveTraceResponse") - golang_proto.RegisterType((*ArchiveTraceResponse)(nil), "jaeger.api_v2.ArchiveTraceResponse") proto.RegisterType((*TraceQueryParameters)(nil), "jaeger.api_v2.TraceQueryParameters") - golang_proto.RegisterType((*TraceQueryParameters)(nil), "jaeger.api_v2.TraceQueryParameters") proto.RegisterMapType((map[string]string)(nil), "jaeger.api_v2.TraceQueryParameters.TagsEntry") - golang_proto.RegisterMapType((map[string]string)(nil), "jaeger.api_v2.TraceQueryParameters.TagsEntry") proto.RegisterType((*FindTracesRequest)(nil), "jaeger.api_v2.FindTracesRequest") - golang_proto.RegisterType((*FindTracesRequest)(nil), "jaeger.api_v2.FindTracesRequest") proto.RegisterType((*GetServicesRequest)(nil), "jaeger.api_v2.GetServicesRequest") - golang_proto.RegisterType((*GetServicesRequest)(nil), "jaeger.api_v2.GetServicesRequest") proto.RegisterType((*GetServicesResponse)(nil), "jaeger.api_v2.GetServicesResponse") - golang_proto.RegisterType((*GetServicesResponse)(nil), "jaeger.api_v2.GetServicesResponse") proto.RegisterType((*GetOperationsRequest)(nil), "jaeger.api_v2.GetOperationsRequest") - golang_proto.RegisterType((*GetOperationsRequest)(nil), "jaeger.api_v2.GetOperationsRequest") proto.RegisterType((*Operation)(nil), "jaeger.api_v2.Operation") - golang_proto.RegisterType((*Operation)(nil), "jaeger.api_v2.Operation") proto.RegisterType((*GetOperationsResponse)(nil), "jaeger.api_v2.GetOperationsResponse") - golang_proto.RegisterType((*GetOperationsResponse)(nil), "jaeger.api_v2.GetOperationsResponse") proto.RegisterType((*GetDependenciesRequest)(nil), "jaeger.api_v2.GetDependenciesRequest") - golang_proto.RegisterType((*GetDependenciesRequest)(nil), "jaeger.api_v2.GetDependenciesRequest") proto.RegisterType((*GetDependenciesResponse)(nil), "jaeger.api_v2.GetDependenciesResponse") - golang_proto.RegisterType((*GetDependenciesResponse)(nil), "jaeger.api_v2.GetDependenciesResponse") } func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } -func init() { golang_proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } var fileDescriptor_5c6ac9b241082464 = []byte{ - // 1015 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0x47, 0x4e, 0x1c, 0xdb, 0x4f, 0x76, 0x4b, 0xd7, 0x4e, 0x2b, 0x54, 0xb0, 0x1d, 0x85, 0x96, - 0x4c, 0x87, 0x48, 0xa9, 0x19, 0x86, 0x92, 0x61, 0x06, 0xe2, 0xa6, 0xf5, 0xa4, 0xd0, 0x52, 0xd4, - 0x9c, 0xe0, 0xe0, 0xd9, 0x58, 0x8b, 0x2c, 0x1c, 0xaf, 0x54, 0x69, 0xed, 0xc6, 0xc3, 0x70, 0xe1, - 0x13, 0x30, 0x70, 0xe1, 0xc4, 0x95, 0x13, 0xdf, 0x81, 0x63, 0x8f, 0xcc, 0x70, 0xe3, 0x10, 0x98, - 0xc0, 0x07, 0x61, 0xf6, 0x8f, 0x1c, 0x5b, 0xce, 0xa4, 0xa1, 0x07, 0x4e, 0xde, 0x7d, 0xfb, 0xde, - 0xef, 0xfd, 0xfb, 0xbd, 0x67, 0x81, 0xfe, 0x74, 0x44, 0xe2, 0x89, 0x1d, 0xc5, 0x21, 0x0b, 0x51, - 0xe5, 0x2b, 0x4c, 0x7c, 0x12, 0xdb, 0x38, 0x0a, 0xba, 0xe3, 0x96, 0xa9, 0x0f, 0x43, 0x8f, 0x1c, - 0xca, 0x37, 0xb3, 0xe6, 0x87, 0x7e, 0x28, 0x8e, 0x0e, 0x3f, 0x29, 0xe9, 0xeb, 0x7e, 0x18, 0xfa, - 0x87, 0xc4, 0xc1, 0x51, 0xe0, 0x60, 0x4a, 0x43, 0x86, 0x59, 0x10, 0xd2, 0x44, 0xbd, 0x36, 0xd4, - 0xab, 0xb8, 0x1d, 0x8c, 0xbe, 0x74, 0x58, 0x30, 0x24, 0x09, 0xc3, 0xc3, 0x48, 0x29, 0xd4, 0xb3, - 0x0a, 0xde, 0x28, 0x16, 0x08, 0xea, 0xfd, 0x6d, 0xf1, 0xd3, 0xdb, 0xf4, 0x09, 0xdd, 0x4c, 0x9e, - 0x61, 0xdf, 0x27, 0xb1, 0x13, 0x46, 0xc2, 0xc5, 0xa2, 0x3b, 0x8b, 0xc2, 0xe5, 0x0e, 0x61, 0xfb, - 0x31, 0xee, 0x11, 0x97, 0x3c, 0x1d, 0x91, 0x84, 0xa1, 0x2f, 0xa0, 0xc8, 0xf8, 0xbd, 0x1b, 0x78, - 0x86, 0xd6, 0xd4, 0x36, 0xca, 0xed, 0x8f, 0x9e, 0x1f, 0x37, 0x5e, 0xf9, 0xe3, 0xb8, 0xb1, 0xe9, - 0x07, 0xac, 0x3f, 0x3a, 0xb0, 0x7b, 0xe1, 0xd0, 0x91, 0x69, 0x73, 0xc5, 0x80, 0xfa, 0xea, 0xe6, - 0xc8, 0xe4, 0x05, 0xda, 0xde, 0xee, 0xc9, 0x71, 0xa3, 0xa0, 0x8e, 0x6e, 0x41, 0x20, 0xee, 0x79, - 0xd6, 0x3d, 0x40, 0x4f, 0x22, 0x4c, 0x13, 0x97, 0x24, 0x51, 0x48, 0x13, 0x72, 0xb7, 0x3f, 0xa2, - 0x03, 0xe4, 0x40, 0x3e, 0xe1, 0x52, 0x43, 0x6b, 0x2e, 0x6d, 0xe8, 0xad, 0xaa, 0x3d, 0x57, 0x54, - 0x9b, 0x5b, 0xb4, 0x97, 0x79, 0x10, 0xae, 0xd4, 0xb3, 0x62, 0xa8, 0xee, 0xc4, 0xbd, 0x7e, 0x30, - 0x26, 0xff, 0x5f, 0xe8, 0x57, 0xa1, 0x36, 0xef, 0x53, 0x66, 0x60, 0xfd, 0xbc, 0x0c, 0x35, 0x21, - 0xf9, 0x8c, 0xd3, 0xe2, 0x31, 0x8e, 0xf1, 0x90, 0x30, 0x12, 0x27, 0x68, 0x0d, 0xca, 0x09, 0x89, - 0xc7, 0x41, 0x8f, 0x74, 0x29, 0x1e, 0x12, 0x11, 0x51, 0xc9, 0xd5, 0x95, 0xec, 0x11, 0x1e, 0x12, - 0x74, 0x03, 0x2e, 0x85, 0x11, 0x91, 0xfd, 0x93, 0x4a, 0x39, 0xa1, 0x54, 0x99, 0x4a, 0x85, 0xda, - 0x0e, 0x2c, 0x33, 0xec, 0x27, 0xc6, 0x92, 0x28, 0xcf, 0x66, 0xa6, 0x3c, 0x67, 0x39, 0xb7, 0xf7, - 0xb1, 0x9f, 0xdc, 0xa3, 0x2c, 0x9e, 0xb8, 0xc2, 0x14, 0x3d, 0x80, 0x4b, 0x09, 0xc3, 0x31, 0xeb, - 0x72, 0x3e, 0x75, 0x87, 0x01, 0x35, 0x96, 0x9b, 0xda, 0x86, 0xde, 0x32, 0x6d, 0xc9, 0x27, 0x3b, - 0xe5, 0x93, 0xbd, 0x9f, 0x12, 0xae, 0x5d, 0xe4, 0xc5, 0xfb, 0xee, 0xcf, 0x86, 0xe6, 0x96, 0x85, - 0x2d, 0x7f, 0x79, 0x18, 0xd0, 0x2c, 0x16, 0x3e, 0x32, 0xf2, 0x2f, 0x87, 0x85, 0x8f, 0xd0, 0x7d, - 0x28, 0xa7, 0x04, 0x16, 0x51, 0xad, 0x08, 0xa4, 0xd7, 0x16, 0x90, 0x76, 0x95, 0x92, 0x04, 0xfa, - 0x91, 0x03, 0xe9, 0xa9, 0x21, 0x8f, 0x69, 0x0e, 0x07, 0x1f, 0x19, 0x85, 0x97, 0xc1, 0xc1, 0x47, - 0xb2, 0x69, 0x38, 0xee, 0xf5, 0xbb, 0x1e, 0x89, 0x58, 0xdf, 0x28, 0x36, 0xb5, 0x8d, 0x3c, 0x6f, - 0x1a, 0x97, 0xed, 0x72, 0x91, 0xf9, 0x1e, 0x94, 0xa6, 0xd5, 0x45, 0xaf, 0xc2, 0xd2, 0x80, 0x4c, - 0x54, 0x6f, 0xf9, 0x11, 0xd5, 0x20, 0x3f, 0xc6, 0x87, 0xa3, 0xb4, 0x95, 0xf2, 0xb2, 0x9d, 0xbb, - 0xa3, 0x59, 0x8f, 0xe0, 0xca, 0xfd, 0x80, 0x7a, 0xa2, 0x5f, 0x49, 0xca, 0xd9, 0xf7, 0x21, 0x2f, - 0xf6, 0x89, 0x80, 0xd0, 0x5b, 0xeb, 0x17, 0x68, 0xae, 0x2b, 0x2d, 0xac, 0x1a, 0xa0, 0x0e, 0x61, - 0x4f, 0x24, 0x9f, 0x52, 0x40, 0xeb, 0x36, 0x54, 0xe7, 0xa4, 0x92, 0xa6, 0xc8, 0x84, 0xa2, 0x62, - 0x9e, 0x1c, 0xb3, 0x92, 0x3b, 0xbd, 0x5b, 0x0f, 0xa1, 0xd6, 0x21, 0xec, 0xd3, 0x94, 0x73, 0xd3, - 0xd8, 0x0c, 0x28, 0x28, 0x1d, 0x95, 0x60, 0x7a, 0x45, 0xd7, 0xa1, 0xc4, 0x27, 0xb1, 0x3b, 0x08, - 0xa8, 0xa7, 0x12, 0x2d, 0x72, 0xc1, 0xc7, 0x01, 0xf5, 0xac, 0x0f, 0xa0, 0x34, 0xc5, 0x42, 0x08, - 0x96, 0x67, 0xd8, 0x2f, 0xce, 0xe7, 0x5b, 0x4f, 0x60, 0x35, 0x13, 0x8c, 0xca, 0xe0, 0xe6, 0xcc, - 0xb0, 0xf0, 0xb1, 0x48, 0xf3, 0xc8, 0x48, 0xd1, 0x1d, 0x80, 0xa9, 0x24, 0x31, 0x72, 0x62, 0x66, - 0x8c, 0x4c, 0x59, 0xa7, 0xf0, 0xee, 0x8c, 0xae, 0xf5, 0x93, 0x06, 0x57, 0x3b, 0x84, 0xed, 0x92, - 0x88, 0x50, 0x8f, 0xd0, 0x5e, 0x70, 0xda, 0xa6, 0xbb, 0x00, 0xa7, 0x9c, 0x57, 0xbd, 0xba, 0x18, - 0xdf, 0x4b, 0x53, 0xbe, 0xa3, 0x0f, 0xa1, 0x48, 0xa8, 0x27, 0x21, 0x72, 0xff, 0x01, 0xa2, 0x40, - 0xa8, 0xc7, 0xe5, 0xd6, 0x01, 0x5c, 0x5b, 0x88, 0x4f, 0x55, 0xa7, 0x03, 0x65, 0x6f, 0x46, 0xae, - 0x56, 0xe9, 0x1b, 0x99, 0xbc, 0xa7, 0xa6, 0x93, 0x4f, 0x02, 0x3a, 0x50, 0x4b, 0x75, 0xce, 0xb0, - 0xf5, 0x4b, 0x1e, 0xca, 0x82, 0x70, 0x8a, 0x42, 0x68, 0x00, 0xc5, 0xf4, 0x3f, 0x02, 0xd5, 0x33, - 0x78, 0x99, 0x3f, 0x0f, 0x73, 0xed, 0x8c, 0xd5, 0x3d, 0xbf, 0xec, 0x2d, 0xf3, 0xdb, 0xdf, 0xff, - 0xf9, 0x21, 0x57, 0x43, 0xc8, 0x11, 0x9b, 0x35, 0x71, 0xbe, 0x4e, 0x77, 0xf6, 0x37, 0x5b, 0x1a, - 0x62, 0x50, 0x9e, 0xdd, 0xb2, 0xc8, 0xca, 0x00, 0x9e, 0xb1, 0xf6, 0xcd, 0xf5, 0x73, 0x75, 0xd4, - 0x9a, 0xbe, 0x2e, 0xdc, 0xae, 0x5a, 0x55, 0x07, 0xcb, 0xe7, 0x19, 0xbf, 0xc8, 0x07, 0x38, 0x9d, - 0x4c, 0xd4, 0xcc, 0xe0, 0x2d, 0x0c, 0xed, 0x45, 0xd2, 0x44, 0xc2, 0x5f, 0xd9, 0x2a, 0x38, 0x72, - 0x77, 0x6c, 0x6b, 0xb7, 0xb6, 0x34, 0xe4, 0x83, 0x3e, 0x33, 0x9c, 0x68, 0x6d, 0xb1, 0x9c, 0x99, - 0x71, 0x36, 0xad, 0xf3, 0x54, 0x54, 0x6e, 0x57, 0x84, 0x2f, 0x1d, 0x95, 0x9c, 0x74, 0xa4, 0x51, - 0x08, 0x95, 0xb9, 0x29, 0x42, 0xeb, 0x8b, 0x38, 0x0b, 0x03, 0x6f, 0xbe, 0x79, 0xbe, 0x92, 0x72, - 0x57, 0x15, 0xee, 0x2a, 0x48, 0x77, 0x4e, 0x67, 0x07, 0x3d, 0x13, 0x5f, 0x12, 0xb3, 0xd4, 0x44, - 0x37, 0x16, 0xd1, 0xce, 0x18, 0x2d, 0xf3, 0xe6, 0x8b, 0xd4, 0x94, 0xdb, 0x55, 0xe1, 0xf6, 0x32, - 0xaa, 0x38, 0xb3, 0x7c, 0x6d, 0x8f, 0xbf, 0xdf, 0x69, 0xa3, 0x7c, 0x6b, 0xe9, 0xb6, 0xbd, 0x75, - 0x2b, 0xa7, 0xe5, 0xe2, 0x77, 0x01, 0x1e, 0x08, 0xbc, 0xe6, 0xce, 0xe3, 0x3d, 0xf4, 0x56, 0x9f, - 0xb1, 0x28, 0xd9, 0x76, 0x9c, 0x17, 0x7c, 0x00, 0x3c, 0x3f, 0xa9, 0x6b, 0xbf, 0x9d, 0xd4, 0xb5, - 0xbf, 0x4e, 0xea, 0xda, 0xaf, 0x7f, 0xd7, 0x35, 0xb8, 0x16, 0x84, 0xf6, 0x9c, 0xa2, 0x0a, 0xef, - 0xf3, 0x15, 0xf9, 0x7b, 0xb0, 0x22, 0x46, 0xf6, 0x9d, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xec, - 0x52, 0xe1, 0x5e, 0x0f, 0x0a, 0x00, 0x00, + // 956 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, + 0x14, 0x67, 0x1d, 0x3b, 0xb6, 0xdf, 0xda, 0x2d, 0x7d, 0x76, 0xda, 0x65, 0x0b, 0xb6, 0xb3, 0xa1, + 0x55, 0x84, 0x94, 0xdd, 0x62, 0x0e, 0x94, 0x0a, 0x09, 0x9a, 0xa6, 0xb5, 0x0a, 0xb4, 0xc0, 0x36, + 0x27, 0x38, 0x58, 0x13, 0xef, 0xb0, 0x5e, 0x1c, 0xcf, 0xba, 0xbb, 0xe3, 0x10, 0x0b, 0x71, 0xe1, + 0x13, 0x20, 0x71, 0xe1, 0xc4, 0x95, 0x13, 0xdf, 0xa3, 0x47, 0x24, 0x6e, 0x1c, 0x02, 0x8a, 0xf8, + 0x20, 0x68, 0xfe, 0xac, 0x63, 0xaf, 0xa3, 0x10, 0x7a, 0xe0, 0xe4, 0x99, 0x37, 0xef, 0xfd, 0xde, + 0xbf, 0xdf, 0x7b, 0x6b, 0x30, 0x9f, 0x4f, 0x69, 0x32, 0x73, 0x27, 0x49, 0xcc, 0x63, 0xac, 0x7f, + 0x4d, 0x68, 0x48, 0x13, 0x97, 0x4c, 0xa2, 0xfe, 0x51, 0xd7, 0x36, 0xc7, 0x71, 0x40, 0x0f, 0xd5, + 0x9b, 0xdd, 0x0c, 0xe3, 0x30, 0x96, 0x47, 0x4f, 0x9c, 0xb4, 0xf4, 0xf5, 0x30, 0x8e, 0xc3, 0x43, + 0xea, 0x91, 0x49, 0xe4, 0x11, 0xc6, 0x62, 0x4e, 0x78, 0x14, 0xb3, 0x54, 0xbf, 0xb6, 0xf5, 0xab, + 0xbc, 0x1d, 0x4c, 0xbf, 0xf2, 0x78, 0x34, 0xa6, 0x29, 0x27, 0xe3, 0x89, 0x56, 0x68, 0xe5, 0x15, + 0x82, 0x69, 0x22, 0x11, 0xd4, 0xbb, 0xc3, 0xe0, 0x6a, 0x8f, 0xf2, 0xfd, 0x84, 0x0c, 0xa8, 0x4f, + 0x9f, 0x4f, 0x69, 0xca, 0xf1, 0x4b, 0xa8, 0x70, 0x71, 0xef, 0x47, 0x81, 0x65, 0x74, 0x8c, 0xed, + 0xda, 0xee, 0x87, 0x2f, 0x4e, 0xda, 0xaf, 0xfc, 0x71, 0xd2, 0xde, 0x09, 0x23, 0x3e, 0x9c, 0x1e, + 0xb8, 0x83, 0x78, 0xec, 0xa9, 0x44, 0x84, 0x62, 0xc4, 0x42, 0x7d, 0xf3, 0x54, 0x3a, 0x12, 0xed, + 0xf1, 0xde, 0xe9, 0x49, 0xbb, 0xac, 0x8f, 0x7e, 0x59, 0x22, 0x3e, 0x0e, 0x9c, 0x87, 0x80, 0xcf, + 0x26, 0x84, 0xa5, 0x3e, 0x4d, 0x27, 0x31, 0x4b, 0xe9, 0x83, 0xe1, 0x94, 0x8d, 0xd0, 0x83, 0x52, + 0x2a, 0xa4, 0x96, 0xd1, 0x59, 0xdb, 0x36, 0xbb, 0x0d, 0x77, 0xa9, 0x4c, 0xae, 0xb0, 0xd8, 0x2d, + 0x8a, 0x20, 0x7c, 0xa5, 0xe7, 0x24, 0xd0, 0xb8, 0x9f, 0x0c, 0x86, 0xd1, 0x11, 0xfd, 0xff, 0x42, + 0xbf, 0x0e, 0xcd, 0x65, 0x9f, 0x2a, 0x03, 0xe7, 0x97, 0x22, 0x34, 0xa5, 0xe4, 0x73, 0xd1, 0xe8, + 0xcf, 0x48, 0x42, 0xc6, 0x94, 0xd3, 0x24, 0xc5, 0x4d, 0xa8, 0xa5, 0x34, 0x39, 0x8a, 0x06, 0xb4, + 0xcf, 0xc8, 0x98, 0xca, 0x88, 0xaa, 0xbe, 0xa9, 0x65, 0x4f, 0xc9, 0x98, 0xe2, 0x2d, 0xb8, 0x12, + 0x4f, 0xa8, 0xea, 0x88, 0x52, 0x2a, 0x48, 0xa5, 0xfa, 0x5c, 0x2a, 0xd5, 0xee, 0x43, 0x91, 0x93, + 0x30, 0xb5, 0xd6, 0x64, 0x79, 0x76, 0x72, 0xe5, 0x39, 0xcf, 0xb9, 0xbb, 0x4f, 0xc2, 0xf4, 0x21, + 0xe3, 0xc9, 0xcc, 0x97, 0xa6, 0xf8, 0x11, 0x5c, 0x49, 0x39, 0x49, 0x78, 0x5f, 0x30, 0xa4, 0x3f, + 0x8e, 0x98, 0x55, 0xec, 0x18, 0xdb, 0x66, 0xd7, 0x76, 0x15, 0x43, 0xdc, 0x8c, 0x21, 0xee, 0x7e, + 0x46, 0xa1, 0xdd, 0x8a, 0x28, 0xde, 0x0f, 0x7f, 0xb6, 0x0d, 0xbf, 0x26, 0x6d, 0xc5, 0xcb, 0x93, + 0x88, 0xe5, 0xb1, 0xc8, 0xb1, 0x55, 0x7a, 0x39, 0x2c, 0x72, 0x8c, 0x8f, 0xa0, 0x96, 0x51, 0x52, + 0x46, 0xb5, 0x2e, 0x91, 0x5e, 0x5b, 0x41, 0xda, 0xd3, 0x4a, 0x0a, 0xe8, 0x27, 0x01, 0x64, 0x66, + 0x86, 0x22, 0xa6, 0x25, 0x1c, 0x72, 0x6c, 0x95, 0x5f, 0x06, 0x87, 0x1c, 0xab, 0xa6, 0x91, 0x64, + 0x30, 0xec, 0x07, 0x74, 0xc2, 0x87, 0x56, 0xa5, 0x63, 0x6c, 0x97, 0x44, 0xd3, 0x84, 0x6c, 0x4f, + 0x88, 0xec, 0x77, 0xa1, 0x3a, 0xaf, 0x2e, 0xbe, 0x0a, 0x6b, 0x23, 0x3a, 0xd3, 0xbd, 0x15, 0x47, + 0x6c, 0x42, 0xe9, 0x88, 0x1c, 0x4e, 0xb3, 0x56, 0xaa, 0xcb, 0xbd, 0xc2, 0x5d, 0xc3, 0x79, 0x0a, + 0xd7, 0x1e, 0x45, 0x2c, 0x90, 0xfd, 0x4a, 0x33, 0xce, 0xbe, 0x07, 0x25, 0xb9, 0x21, 0x24, 0x84, + 0xd9, 0xdd, 0xba, 0x44, 0x73, 0x7d, 0x65, 0xe1, 0x34, 0x01, 0x7b, 0x94, 0x3f, 0x53, 0x7c, 0xca, + 0x00, 0x9d, 0xb7, 0xa1, 0xb1, 0x24, 0x55, 0x34, 0x45, 0x1b, 0x2a, 0x9a, 0x79, 0x6a, 0xcc, 0xaa, + 0xfe, 0xfc, 0xee, 0x3c, 0x81, 0x66, 0x8f, 0xf2, 0x4f, 0x33, 0xce, 0xcd, 0x63, 0xb3, 0xa0, 0xac, + 0x75, 0x74, 0x82, 0xd9, 0x15, 0x6f, 0x42, 0x55, 0x4c, 0x62, 0x7f, 0x14, 0xb1, 0x40, 0x27, 0x5a, + 0x11, 0x82, 0x8f, 0x23, 0x16, 0x38, 0xef, 0x43, 0x75, 0x8e, 0x85, 0x08, 0xc5, 0x05, 0xf6, 0xcb, + 0xf3, 0xc5, 0xd6, 0x33, 0xd8, 0xc8, 0x05, 0xa3, 0x33, 0xb8, 0xbd, 0x30, 0x2c, 0x62, 0x2c, 0xb2, + 0x3c, 0x72, 0x52, 0xbc, 0x0b, 0x30, 0x97, 0xa4, 0x56, 0x41, 0xce, 0x8c, 0x95, 0x2b, 0xeb, 0x1c, + 0xde, 0x5f, 0xd0, 0x75, 0x7e, 0x36, 0xe0, 0x7a, 0x8f, 0xf2, 0x3d, 0x3a, 0xa1, 0x2c, 0xa0, 0x6c, + 0x10, 0x9d, 0xb5, 0xe9, 0x01, 0xc0, 0x19, 0xe7, 0x75, 0xaf, 0x2e, 0xc7, 0xf7, 0xea, 0x9c, 0xef, + 0xf8, 0x01, 0x54, 0x28, 0x0b, 0x14, 0x44, 0xe1, 0x3f, 0x40, 0x94, 0x29, 0x0b, 0x84, 0xdc, 0x39, + 0x80, 0x1b, 0x2b, 0xf1, 0xe9, 0xea, 0xf4, 0xa0, 0x16, 0x2c, 0xc8, 0xf5, 0x2a, 0x7d, 0x23, 0x97, + 0xf7, 0xdc, 0x74, 0xf6, 0x49, 0xc4, 0x46, 0x7a, 0xa9, 0x2e, 0x19, 0x76, 0x7f, 0x2d, 0x41, 0x4d, + 0x12, 0x4e, 0x53, 0x08, 0x47, 0x50, 0xc9, 0xbe, 0x11, 0xd8, 0xca, 0xe1, 0xe5, 0x3e, 0x1e, 0xf6, + 0xe6, 0x39, 0xab, 0x7b, 0x79, 0xd9, 0x3b, 0xf6, 0xf7, 0xbf, 0xff, 0xfd, 0x63, 0xa1, 0x89, 0xe8, + 0xc9, 0xcd, 0x9a, 0x7a, 0xdf, 0x66, 0x3b, 0xfb, 0xbb, 0x3b, 0x06, 0x72, 0xa8, 0x2d, 0x6e, 0x59, + 0x74, 0x72, 0x80, 0xe7, 0xac, 0x7d, 0x7b, 0xeb, 0x42, 0x1d, 0xbd, 0xa6, 0x6f, 0x4a, 0xb7, 0x1b, + 0x4e, 0xc3, 0x23, 0xea, 0x79, 0xc1, 0x2f, 0x86, 0x00, 0x67, 0x93, 0x89, 0x9d, 0x1c, 0xde, 0xca, + 0xd0, 0x5e, 0x26, 0x4d, 0x94, 0xfe, 0x6a, 0x4e, 0xd9, 0x53, 0xbb, 0xe3, 0x9e, 0xf1, 0xd6, 0x1d, + 0x03, 0x43, 0x30, 0x17, 0x86, 0x13, 0x37, 0x57, 0xcb, 0x99, 0x1b, 0x67, 0xdb, 0xb9, 0x48, 0x45, + 0xe7, 0x76, 0x4d, 0xfa, 0x32, 0xb1, 0xea, 0x65, 0x23, 0x8d, 0x31, 0xd4, 0x97, 0xa6, 0x08, 0xb7, + 0x56, 0x71, 0x56, 0x06, 0xde, 0x7e, 0xf3, 0x62, 0x25, 0xed, 0xae, 0x21, 0xdd, 0xd5, 0xd1, 0xf4, + 0xce, 0x66, 0x07, 0xbf, 0x91, 0xff, 0x24, 0x16, 0xa9, 0x89, 0xb7, 0x56, 0xd1, 0xce, 0x19, 0x2d, + 0xfb, 0xf6, 0xbf, 0xa9, 0x69, 0xb7, 0x1b, 0xd2, 0xed, 0x55, 0xac, 0x7b, 0x8b, 0x7c, 0xdd, 0xdd, + 0x79, 0x71, 0xda, 0x32, 0x7e, 0x3b, 0x6d, 0x19, 0x7f, 0x9d, 0xb6, 0x0c, 0xb8, 0x11, 0xc5, 0xee, + 0xd2, 0x07, 0x5e, 0xa3, 0x7e, 0xb1, 0xae, 0x7e, 0x0f, 0xd6, 0xe5, 0xa4, 0xbd, 0xf3, 0x4f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xf6, 0xb2, 0xb8, 0xe2, 0x98, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto-gen/api_v2/sampling.pb.go b/proto-gen/api_v2/sampling.pb.go index 21515ea0b51..32d10b3eda1 100644 --- a/proto-gen/api_v2/sampling.pb.go +++ b/proto-gen/api_v2/sampling.pb.go @@ -10,8 +10,6 @@ import ( _ "github.com/gogo/googleapis/google/api" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - golang_proto "github.com/golang/protobuf/proto" - _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger/options" grpc "google.golang.org/grpc" io "io" math "math" @@ -19,7 +17,6 @@ import ( // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = golang_proto.Marshal var _ = fmt.Errorf var _ = math.Inf @@ -394,66 +391,54 @@ func (m *SamplingStrategyParameters) GetServiceName() string { func init() { proto.RegisterEnum("jaeger.api_v2.SamplingStrategyType", SamplingStrategyType_name, SamplingStrategyType_value) - golang_proto.RegisterEnum("jaeger.api_v2.SamplingStrategyType", SamplingStrategyType_name, SamplingStrategyType_value) proto.RegisterType((*ProbabilisticSamplingStrategy)(nil), "jaeger.api_v2.ProbabilisticSamplingStrategy") - golang_proto.RegisterType((*ProbabilisticSamplingStrategy)(nil), "jaeger.api_v2.ProbabilisticSamplingStrategy") proto.RegisterType((*RateLimitingSamplingStrategy)(nil), "jaeger.api_v2.RateLimitingSamplingStrategy") - golang_proto.RegisterType((*RateLimitingSamplingStrategy)(nil), "jaeger.api_v2.RateLimitingSamplingStrategy") proto.RegisterType((*OperationSamplingStrategy)(nil), "jaeger.api_v2.OperationSamplingStrategy") - golang_proto.RegisterType((*OperationSamplingStrategy)(nil), "jaeger.api_v2.OperationSamplingStrategy") proto.RegisterType((*PerOperationSamplingStrategies)(nil), "jaeger.api_v2.PerOperationSamplingStrategies") - golang_proto.RegisterType((*PerOperationSamplingStrategies)(nil), "jaeger.api_v2.PerOperationSamplingStrategies") proto.RegisterType((*SamplingStrategyResponse)(nil), "jaeger.api_v2.SamplingStrategyResponse") - golang_proto.RegisterType((*SamplingStrategyResponse)(nil), "jaeger.api_v2.SamplingStrategyResponse") proto.RegisterType((*SamplingStrategyParameters)(nil), "jaeger.api_v2.SamplingStrategyParameters") - golang_proto.RegisterType((*SamplingStrategyParameters)(nil), "jaeger.api_v2.SamplingStrategyParameters") } func init() { proto.RegisterFile("sampling.proto", fileDescriptor_79c798842d009798) } -func init() { golang_proto.RegisterFile("sampling.proto", fileDescriptor_79c798842d009798) } var fileDescriptor_79c798842d009798 = []byte{ - // 637 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcf, 0x4f, 0x13, 0x41, - 0x14, 0x76, 0x5a, 0x21, 0xe1, 0x15, 0x10, 0x46, 0xd4, 0xda, 0x40, 0xd3, 0x2c, 0x07, 0x2a, 0xc2, - 0xae, 0xae, 0xf1, 0x42, 0x0c, 0x49, 0x4b, 0x0c, 0x59, 0x52, 0xa0, 0xd9, 0xd6, 0x8b, 0x1e, 0x70, - 0xba, 0x8c, 0xc3, 0x98, 0x76, 0x67, 0x32, 0x33, 0x14, 0xb9, 0x9a, 0x78, 0xf5, 0xa0, 0x67, 0x2f, - 0xfe, 0x25, 0x1e, 0x3d, 0x9a, 0x78, 0xf3, 0x64, 0xd0, 0x3f, 0xc4, 0x74, 0xbb, 0x05, 0xba, 0xfd, - 0x75, 0xf3, 0x34, 0xbb, 0xef, 0x7d, 0xef, 0x7b, 0xdf, 0x7b, 0xf3, 0xe6, 0xc1, 0xbc, 0x26, 0x2d, - 0xd9, 0xe4, 0x21, 0xb3, 0xa5, 0x12, 0x46, 0xe0, 0xb9, 0xb7, 0x84, 0x32, 0xaa, 0x6c, 0x22, 0xf9, - 0x51, 0xdb, 0xcd, 0x2d, 0x31, 0xc1, 0x44, 0xe4, 0x71, 0x3a, 0x5f, 0x5d, 0x50, 0x6e, 0x99, 0x09, - 0xc1, 0x9a, 0xd4, 0x21, 0x92, 0x3b, 0x24, 0x0c, 0x85, 0x21, 0x86, 0x8b, 0x50, 0xc7, 0xde, 0x8d, - 0xe8, 0x08, 0x36, 0x19, 0x0d, 0x37, 0xf5, 0x19, 0x61, 0x8c, 0x2a, 0x47, 0xc8, 0x08, 0x31, 0x88, - 0xb6, 0x76, 0x60, 0xa5, 0xaa, 0x44, 0x83, 0x34, 0x78, 0x93, 0x6b, 0xc3, 0x83, 0x5a, 0xac, 0xa7, - 0x66, 0x14, 0x31, 0x94, 0x9d, 0x63, 0x0b, 0x66, 0x7b, 0x1a, 0x7d, 0x62, 0x68, 0x16, 0x15, 0x50, - 0x11, 0xf9, 0x7d, 0x36, 0xeb, 0x00, 0x96, 0x3b, 0x67, 0x85, 0xb7, 0xb8, 0xe9, 0xc4, 0x26, 0x39, - 0x6c, 0xc0, 0x2d, 0xf2, 0xae, 0xae, 0x48, 0x40, 0x75, 0x95, 0xaa, 0x1a, 0x0d, 0x44, 0x78, 0x1c, - 0x31, 0x4d, 0xf9, 0x43, 0x3c, 0xd6, 0x17, 0x04, 0xf7, 0x0f, 0x25, 0x55, 0x91, 0xd2, 0x01, 0xb6, - 0x65, 0x98, 0x11, 0x3d, 0x67, 0x44, 0x32, 0xe3, 0x5f, 0x19, 0x70, 0x03, 0xee, 0xc8, 0x61, 0x05, - 0x65, 0x53, 0x05, 0x54, 0xcc, 0xb8, 0x1b, 0x76, 0x5f, 0x87, 0xed, 0xb1, 0xc5, 0xfb, 0xc3, 0xa9, - 0xac, 0x5f, 0x29, 0xc8, 0x57, 0xa9, 0x1a, 0x25, 0x91, 0x53, 0x8d, 0xb7, 0x21, 0x77, 0x4c, 0xdf, - 0x90, 0xd3, 0xa6, 0xe9, 0x39, 0x2f, 0x33, 0x99, 0xf3, 0xb8, 0x89, 0x63, 0x10, 0x78, 0x0f, 0x0a, - 0xb1, 0xb7, 0x22, 0xce, 0xa8, 0x2a, 0x8b, 0xd3, 0xf0, 0x38, 0xd9, 0xc0, 0x54, 0xc4, 0x32, 0x11, - 0x87, 0x5f, 0xc3, 0x5d, 0x79, 0x5d, 0xed, 0xa5, 0xca, 0x6c, 0xba, 0x90, 0x2e, 0x66, 0xdc, 0x62, - 0xa2, 0x27, 0x23, 0x5b, 0xef, 0x8f, 0xe0, 0xb9, 0xa6, 0xf6, 0x85, 0x94, 0x23, 0xd4, 0xde, 0xec, - 0x53, 0x3b, 0x12, 0x67, 0x7d, 0x48, 0x43, 0x76, 0x20, 0x31, 0xd5, 0x52, 0x84, 0x9a, 0xe2, 0x5d, - 0x98, 0xd5, 0xb1, 0xad, 0x7e, 0x2e, 0xbb, 0xd3, 0x38, 0xef, 0xae, 0x26, 0x0a, 0x48, 0x86, 0x77, - 0xa0, 0x7e, 0x5f, 0xe0, 0xff, 0x18, 0x13, 0x7c, 0x04, 0x4b, 0x6a, 0xc8, 0xb3, 0xc8, 0xa6, 0xa3, - 0x14, 0x0f, 0x13, 0x29, 0xc6, 0xbd, 0x20, 0x7f, 0x28, 0x11, 0x7e, 0x05, 0x8b, 0x22, 0x79, 0x57, - 0x51, 0x9f, 0x33, 0xee, 0x66, 0xb2, 0x80, 0xb1, 0xe3, 0xea, 0x0f, 0xf2, 0x58, 0xdb, 0x90, 0x4b, - 0xca, 0xa8, 0x12, 0x45, 0x5a, 0xd4, 0x50, 0xa5, 0x71, 0x01, 0x32, 0x9a, 0xaa, 0x36, 0x0f, 0xe8, - 0x01, 0x69, 0xd1, 0xf8, 0x19, 0x5e, 0x37, 0xad, 0x3f, 0x83, 0xa5, 0x61, 0xf7, 0x80, 0x17, 0x61, - 0xae, 0xea, 0x1f, 0x96, 0x4b, 0x65, 0xaf, 0xe2, 0xd5, 0xea, 0xde, 0xce, 0xc2, 0x8d, 0x8e, 0xc9, - 0x2f, 0xd5, 0x9f, 0x1f, 0x55, 0xbc, 0x7d, 0xaf, 0xee, 0x1d, 0xec, 0x2e, 0x20, 0xf7, 0x2b, 0x82, - 0x5b, 0xbd, 0xf0, 0x7d, 0x12, 0x12, 0x46, 0x15, 0xfe, 0x88, 0xe0, 0xf6, 0x2e, 0x35, 0x03, 0x0b, - 0xe1, 0xc1, 0x84, 0xeb, 0xbf, 0x92, 0x9d, 0x5b, 0x9b, 0x00, 0xed, 0x0d, 0x9a, 0xb5, 0xfa, 0xfe, - 0xe7, 0xdf, 0xcf, 0xa9, 0x15, 0x2b, 0x1b, 0x6d, 0xd9, 0xb6, 0xeb, 0xe8, 0x04, 0x72, 0x0b, 0xad, - 0x97, 0xdb, 0x9f, 0x4a, 0x65, 0x3c, 0xe5, 0xa6, 0x1f, 0xdb, 0x8f, 0xd6, 0x53, 0x28, 0xa5, 0x9e, - 0x02, 0xec, 0x45, 0xf4, 0x85, 0x52, 0xd5, 0xc3, 0x6b, 0x27, 0xc6, 0x48, 0xbd, 0xe5, 0x38, 0x8c, - 0x9b, 0x93, 0xd3, 0x86, 0x1d, 0x88, 0x96, 0xd3, 0xcd, 0x6e, 0x14, 0x09, 0x78, 0xc8, 0xe2, 0xbf, - 0xef, 0x17, 0x79, 0xf4, 0xe3, 0x22, 0x8f, 0x7e, 0x5f, 0xe4, 0xd1, 0xb7, 0x3f, 0x79, 0x04, 0xf7, - 0xb8, 0xb0, 0xfb, 0x80, 0xb1, 0xda, 0x97, 0xd3, 0xdd, 0xb3, 0x31, 0x1d, 0xed, 0xee, 0x27, 0xff, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x78, 0x78, 0xcc, 0x43, 0x3e, 0x06, 0x00, 0x00, + // 569 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0x41, 0x6f, 0x12, 0x41, + 0x14, 0x76, 0x40, 0x9b, 0xf4, 0xd1, 0xd6, 0x76, 0xac, 0xba, 0x12, 0x4a, 0xc8, 0xf6, 0x20, 0x56, + 0x0b, 0xc9, 0x7a, 0x33, 0xa6, 0x49, 0x69, 0x0c, 0x59, 0x43, 0x29, 0x59, 0xf0, 0xa2, 0x07, 0x1c, + 0xe0, 0xb9, 0x19, 0x03, 0x3b, 0x9b, 0x99, 0x29, 0xca, 0xd5, 0xc4, 0xab, 0x17, 0xcf, 0x5e, 0xfc, + 0x35, 0x1e, 0x4d, 0xbc, 0x79, 0x32, 0xc4, 0x1f, 0x62, 0x76, 0x59, 0x5a, 0x58, 0x16, 0xb8, 0x79, + 0xda, 0xcd, 0x7b, 0xdf, 0x7c, 0xdf, 0xf7, 0xde, 0xbc, 0x79, 0xb0, 0xa3, 0xd8, 0xc0, 0xef, 0x73, + 0xcf, 0x2d, 0xf9, 0x52, 0x68, 0x41, 0xb7, 0xdf, 0x33, 0x74, 0x51, 0x96, 0x98, 0xcf, 0xdb, 0x43, + 0x2b, 0xbb, 0xef, 0x0a, 0x57, 0x84, 0x99, 0x72, 0xf0, 0x37, 0x01, 0x65, 0x73, 0xae, 0x10, 0x6e, + 0x1f, 0xcb, 0xcc, 0xe7, 0x65, 0xe6, 0x79, 0x42, 0x33, 0xcd, 0x85, 0xa7, 0x26, 0x59, 0xf3, 0x0c, + 0x0e, 0x1a, 0x52, 0x74, 0x58, 0x87, 0xf7, 0xb9, 0xd2, 0xbc, 0xdb, 0x8c, 0x14, 0x9a, 0x5a, 0x32, + 0x8d, 0xee, 0x88, 0x9a, 0xb0, 0x35, 0x55, 0x75, 0x98, 0x46, 0x83, 0x14, 0x48, 0x91, 0x38, 0x73, + 0x31, 0xb3, 0x0e, 0xb9, 0xe0, 0x5b, 0xe3, 0x03, 0xae, 0x83, 0xb3, 0x71, 0x8e, 0x12, 0xd0, 0x01, + 0xfb, 0xd8, 0x92, 0xac, 0x8b, 0xaa, 0x81, 0xb2, 0x89, 0x5d, 0xe1, 0xf5, 0x42, 0xa6, 0x5b, 0x4e, + 0x42, 0xc6, 0xfc, 0x46, 0xe0, 0xc1, 0x85, 0x8f, 0x32, 0x74, 0xba, 0xc0, 0x96, 0x83, 0x4d, 0x31, + 0x4d, 0x86, 0x24, 0x9b, 0xce, 0x75, 0x80, 0x76, 0xe0, 0xae, 0x9f, 0x54, 0x90, 0x91, 0x2a, 0x90, + 0x62, 0xc6, 0x7a, 0x52, 0x9a, 0xeb, 0x59, 0x69, 0x65, 0xf1, 0x4e, 0x32, 0x95, 0xf9, 0x3b, 0x05, + 0xf9, 0x06, 0xca, 0x65, 0x16, 0x39, 0x2a, 0x7a, 0x02, 0xd9, 0x1e, 0xbe, 0x63, 0x97, 0x7d, 0x3d, + 0x4d, 0x5e, 0x29, 0xe9, 0x51, 0xd4, 0xc4, 0x15, 0x08, 0xfa, 0x12, 0x0a, 0x51, 0xb6, 0x26, 0x3e, + 0xa0, 0xac, 0x88, 0x4b, 0xaf, 0x17, 0x6f, 0x60, 0x2a, 0x64, 0x59, 0x8b, 0xa3, 0x6f, 0xe1, 0x9e, + 0x3f, 0xeb, 0xf6, 0xca, 0xa5, 0x91, 0x2e, 0xa4, 0x8b, 0x19, 0xab, 0x18, 0xeb, 0xc9, 0xd2, 0xd6, + 0x3b, 0x4b, 0x78, 0x66, 0xdc, 0xbe, 0xf2, 0xfd, 0x25, 0x6e, 0x6f, 0xce, 0xb9, 0x5d, 0x8a, 0x33, + 0x3f, 0xa7, 0xc1, 0x58, 0x10, 0x46, 0xe5, 0x0b, 0x4f, 0x21, 0xad, 0xc2, 0x96, 0x8a, 0x62, 0xad, + 0x91, 0x3f, 0x99, 0xc6, 0x1d, 0xeb, 0x30, 0x56, 0x40, 0xfc, 0x78, 0x00, 0x75, 0xe6, 0x0e, 0xfe, + 0x8f, 0x31, 0xa1, 0x6d, 0xd8, 0x97, 0x09, 0xcf, 0xc2, 0x48, 0x87, 0x12, 0x8f, 0x63, 0x12, 0xab, + 0x5e, 0x90, 0x93, 0x48, 0x44, 0xdf, 0xc0, 0x9e, 0x88, 0xdf, 0x55, 0xd8, 0xe7, 0x8c, 0x75, 0x1c, + 0x2f, 0x60, 0xe5, 0xb8, 0x3a, 0x8b, 0x3c, 0xe6, 0x09, 0x64, 0xe3, 0x36, 0x1a, 0x4c, 0xb2, 0x01, + 0x6a, 0x94, 0x8a, 0x16, 0x20, 0xa3, 0x50, 0x0e, 0x79, 0x17, 0xeb, 0x6c, 0x80, 0xd1, 0x33, 0x9c, + 0x0d, 0x1d, 0x3d, 0x87, 0xfd, 0xa4, 0x7b, 0xa0, 0x7b, 0xb0, 0xdd, 0x70, 0x2e, 0x2a, 0xa7, 0x15, + 0xbb, 0x66, 0x37, 0x5b, 0xf6, 0xd9, 0xee, 0x8d, 0x20, 0xe4, 0x9c, 0xb6, 0x5e, 0xb4, 0x6b, 0xf6, + 0xb9, 0xdd, 0xb2, 0xeb, 0xd5, 0x5d, 0x62, 0x7d, 0x27, 0x70, 0x7b, 0x7a, 0xfc, 0x9c, 0x79, 0xcc, + 0x45, 0x49, 0xbf, 0x10, 0xb8, 0x53, 0x45, 0xbd, 0xb0, 0x10, 0x1e, 0xad, 0xb9, 0xfe, 0x6b, 0xdb, + 0xd9, 0x87, 0x6b, 0xa0, 0xd3, 0x41, 0x33, 0x0f, 0x3f, 0xfd, 0xfa, 0xfb, 0x35, 0x75, 0x60, 0x1a, + 0xe1, 0xde, 0x1c, 0x5a, 0x65, 0x15, 0x43, 0x3e, 0x23, 0x47, 0x95, 0xe3, 0x1f, 0xe3, 0x3c, 0xf9, + 0x39, 0xce, 0x93, 0x3f, 0xe3, 0x3c, 0x81, 0xfb, 0x5c, 0x44, 0xec, 0x5a, 0xb2, 0x6e, 0xb0, 0xa5, + 0x27, 0x22, 0xaf, 0x37, 0x26, 0xdf, 0xce, 0x46, 0xb8, 0x72, 0x9f, 0xfe, 0x0b, 0x00, 0x00, 0xff, + 0xff, 0xf1, 0xcc, 0x49, 0x9b, 0xc7, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto-gen/storage_v1/storage.pb.go b/proto-gen/storage_v1/storage.pb.go index 0e7412a3c4b..ce1fbf2608e 100644 --- a/proto-gen/storage_v1/storage.pb.go +++ b/proto-gen/storage_v1/storage.pb.go @@ -10,7 +10,6 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - golang_proto "github.com/golang/protobuf/proto" github_com_jaegertracing_jaeger_model "github.com/jaegertracing/jaeger/model" model "github.com/jaegertracing/jaeger/model" grpc "google.golang.org/grpc" @@ -21,7 +20,6 @@ import ( // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = golang_proto.Marshal var _ = fmt.Errorf var _ = math.Inf var _ = time.Kitchen @@ -893,114 +891,95 @@ func (m *CapabilitiesResponse) GetArchiveSpanWriter() bool { func init() { proto.RegisterType((*GetDependenciesRequest)(nil), "jaeger.storage.v1.GetDependenciesRequest") - golang_proto.RegisterType((*GetDependenciesRequest)(nil), "jaeger.storage.v1.GetDependenciesRequest") proto.RegisterType((*GetDependenciesResponse)(nil), "jaeger.storage.v1.GetDependenciesResponse") - golang_proto.RegisterType((*GetDependenciesResponse)(nil), "jaeger.storage.v1.GetDependenciesResponse") proto.RegisterType((*WriteSpanRequest)(nil), "jaeger.storage.v1.WriteSpanRequest") - golang_proto.RegisterType((*WriteSpanRequest)(nil), "jaeger.storage.v1.WriteSpanRequest") proto.RegisterType((*WriteSpanResponse)(nil), "jaeger.storage.v1.WriteSpanResponse") - golang_proto.RegisterType((*WriteSpanResponse)(nil), "jaeger.storage.v1.WriteSpanResponse") proto.RegisterType((*GetTraceRequest)(nil), "jaeger.storage.v1.GetTraceRequest") - golang_proto.RegisterType((*GetTraceRequest)(nil), "jaeger.storage.v1.GetTraceRequest") proto.RegisterType((*GetServicesRequest)(nil), "jaeger.storage.v1.GetServicesRequest") - golang_proto.RegisterType((*GetServicesRequest)(nil), "jaeger.storage.v1.GetServicesRequest") proto.RegisterType((*GetServicesResponse)(nil), "jaeger.storage.v1.GetServicesResponse") - golang_proto.RegisterType((*GetServicesResponse)(nil), "jaeger.storage.v1.GetServicesResponse") proto.RegisterType((*GetOperationsRequest)(nil), "jaeger.storage.v1.GetOperationsRequest") - golang_proto.RegisterType((*GetOperationsRequest)(nil), "jaeger.storage.v1.GetOperationsRequest") proto.RegisterType((*Operation)(nil), "jaeger.storage.v1.Operation") - golang_proto.RegisterType((*Operation)(nil), "jaeger.storage.v1.Operation") proto.RegisterType((*GetOperationsResponse)(nil), "jaeger.storage.v1.GetOperationsResponse") - golang_proto.RegisterType((*GetOperationsResponse)(nil), "jaeger.storage.v1.GetOperationsResponse") proto.RegisterType((*TraceQueryParameters)(nil), "jaeger.storage.v1.TraceQueryParameters") - golang_proto.RegisterType((*TraceQueryParameters)(nil), "jaeger.storage.v1.TraceQueryParameters") proto.RegisterMapType((map[string]string)(nil), "jaeger.storage.v1.TraceQueryParameters.TagsEntry") - golang_proto.RegisterMapType((map[string]string)(nil), "jaeger.storage.v1.TraceQueryParameters.TagsEntry") proto.RegisterType((*FindTracesRequest)(nil), "jaeger.storage.v1.FindTracesRequest") - golang_proto.RegisterType((*FindTracesRequest)(nil), "jaeger.storage.v1.FindTracesRequest") proto.RegisterType((*SpansResponseChunk)(nil), "jaeger.storage.v1.SpansResponseChunk") - golang_proto.RegisterType((*SpansResponseChunk)(nil), "jaeger.storage.v1.SpansResponseChunk") proto.RegisterType((*FindTraceIDsRequest)(nil), "jaeger.storage.v1.FindTraceIDsRequest") - golang_proto.RegisterType((*FindTraceIDsRequest)(nil), "jaeger.storage.v1.FindTraceIDsRequest") proto.RegisterType((*FindTraceIDsResponse)(nil), "jaeger.storage.v1.FindTraceIDsResponse") - golang_proto.RegisterType((*FindTraceIDsResponse)(nil), "jaeger.storage.v1.FindTraceIDsResponse") proto.RegisterType((*CapabilitiesRequest)(nil), "jaeger.storage.v1.CapabilitiesRequest") - golang_proto.RegisterType((*CapabilitiesRequest)(nil), "jaeger.storage.v1.CapabilitiesRequest") proto.RegisterType((*CapabilitiesResponse)(nil), "jaeger.storage.v1.CapabilitiesResponse") - golang_proto.RegisterType((*CapabilitiesResponse)(nil), "jaeger.storage.v1.CapabilitiesResponse") } func init() { proto.RegisterFile("storage.proto", fileDescriptor_0d2c4ccf1453ffdb) } -func init() { golang_proto.RegisterFile("storage.proto", fileDescriptor_0d2c4ccf1453ffdb) } var fileDescriptor_0d2c4ccf1453ffdb = []byte{ - // 1051 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0x47, 0x89, 0xd3, 0xd8, 0xcf, 0x4e, 0x49, 0xd6, 0x2e, 0x15, 0xa2, 0xb5, 0x83, 0x20, 0x7f, - 0x60, 0x40, 0x26, 0xe6, 0x00, 0x03, 0x65, 0xa0, 0x4e, 0x52, 0x4f, 0x80, 0x42, 0x51, 0x33, 0x74, - 0x86, 0x42, 0x3d, 0x6b, 0x6b, 0x51, 0xd4, 0x58, 0x2b, 0x55, 0x7f, 0x3c, 0xf6, 0x81, 0x1b, 0x1f, - 0x80, 0x23, 0x27, 0xae, 0x7c, 0x0d, 0x8e, 0x3d, 0x72, 0xe6, 0x10, 0x98, 0x70, 0xe4, 0x4b, 0x30, - 0xda, 0x5d, 0xc9, 0x92, 0xac, 0x49, 0xd2, 0x4c, 0x6e, 0xda, 0xb7, 0xbf, 0xf7, 0x7b, 0x6f, 0xdf, - 0x5f, 0xc1, 0x8a, 0x1f, 0x38, 0x1e, 0x36, 0x89, 0xe6, 0x7a, 0x4e, 0xe0, 0xa0, 0xb5, 0xa7, 0x98, - 0x98, 0xc4, 0xd3, 0x62, 0xe9, 0x78, 0x47, 0x69, 0x98, 0x8e, 0xe9, 0xb0, 0xdb, 0x76, 0xf4, 0xc5, - 0x81, 0x4a, 0xcb, 0x74, 0x1c, 0x73, 0x44, 0xda, 0xec, 0x34, 0x08, 0x7f, 0x6c, 0x07, 0x96, 0x4d, - 0xfc, 0x00, 0xdb, 0xae, 0x00, 0x34, 0xf3, 0x00, 0x23, 0xf4, 0x70, 0x60, 0x39, 0x54, 0xdc, 0x57, - 0x6d, 0xc7, 0x20, 0x23, 0x7e, 0x50, 0x7f, 0x93, 0xe0, 0x95, 0x1e, 0x09, 0xf6, 0x88, 0x4b, 0xa8, - 0x41, 0xe8, 0xd0, 0x22, 0xbe, 0x4e, 0x9e, 0x85, 0xc4, 0x0f, 0xd0, 0x2e, 0x80, 0x1f, 0x60, 0x2f, - 0xe8, 0x47, 0x06, 0x64, 0x69, 0x5d, 0xda, 0xae, 0x76, 0x14, 0x8d, 0x93, 0x6b, 0x31, 0xb9, 0x76, - 0x18, 0x5b, 0xef, 0x96, 0x9f, 0x9f, 0xb4, 0x5e, 0xfa, 0xe5, 0xef, 0x96, 0xa4, 0x57, 0x98, 0x5e, - 0x74, 0x83, 0x3e, 0x85, 0x32, 0xa1, 0x06, 0xa7, 0x58, 0x78, 0x01, 0x8a, 0x65, 0x42, 0x8d, 0x48, - 0xae, 0x0e, 0xe0, 0xe6, 0x9c, 0x7f, 0xbe, 0xeb, 0x50, 0x9f, 0xa0, 0x1e, 0xd4, 0x8c, 0x94, 0x5c, - 0x96, 0xd6, 0x17, 0xb7, 0xab, 0x9d, 0xdb, 0x9a, 0x88, 0x24, 0x76, 0xad, 0xfe, 0xb8, 0xa3, 0x25, - 0xaa, 0xd3, 0x2f, 0x2d, 0x7a, 0xdc, 0x2d, 0x45, 0x26, 0xf4, 0x8c, 0xa2, 0xfa, 0x31, 0xac, 0x3e, - 0xf2, 0xac, 0x80, 0x3c, 0x74, 0x31, 0x8d, 0x5f, 0xbf, 0x05, 0x25, 0xdf, 0xc5, 0x54, 0xbc, 0xbb, - 0x9e, 0x23, 0x65, 0x48, 0x06, 0x50, 0xeb, 0xb0, 0x96, 0x52, 0xe6, 0xae, 0xa9, 0x14, 0x5e, 0xee, - 0x91, 0xe0, 0xd0, 0xc3, 0x43, 0x12, 0x13, 0x3e, 0x86, 0x72, 0x10, 0x9d, 0xfb, 0x96, 0xc1, 0x48, - 0x6b, 0xdd, 0xcf, 0x22, 0x57, 0xfe, 0x3a, 0x69, 0xbd, 0x6b, 0x5a, 0xc1, 0x51, 0x38, 0xd0, 0x86, - 0x8e, 0xdd, 0xe6, 0x66, 0x22, 0xa0, 0x45, 0x4d, 0x71, 0x6a, 0xf3, 0x84, 0x31, 0xb6, 0x83, 0xbd, - 0xd3, 0x93, 0xd6, 0xb2, 0xf8, 0xd4, 0x97, 0x19, 0xe3, 0x81, 0xa1, 0x36, 0x00, 0xf5, 0x48, 0xf0, - 0x90, 0x78, 0x63, 0x6b, 0x98, 0x64, 0x50, 0xdd, 0x81, 0x7a, 0x46, 0x2a, 0xe2, 0xa6, 0x40, 0xd9, - 0x17, 0x32, 0x16, 0xb3, 0x8a, 0x9e, 0x9c, 0xd5, 0xfb, 0xd0, 0xe8, 0x91, 0xe0, 0x6b, 0x97, 0xf0, - 0x92, 0x49, 0x8a, 0x41, 0x86, 0x65, 0x81, 0x61, 0xce, 0x57, 0xf4, 0xf8, 0x88, 0x5e, 0x83, 0x4a, - 0x14, 0x87, 0xfe, 0xb1, 0x45, 0x0d, 0x96, 0xe2, 0x88, 0xce, 0xc5, 0xf4, 0x0b, 0x8b, 0x1a, 0xea, - 0x1d, 0xa8, 0x24, 0x5c, 0x08, 0x41, 0x89, 0x62, 0x3b, 0x26, 0x60, 0xdf, 0x67, 0x6b, 0xff, 0x04, - 0x37, 0x72, 0xce, 0x88, 0x17, 0x6c, 0xc2, 0x75, 0x27, 0x96, 0x7e, 0x85, 0xed, 0xe4, 0x1d, 0x39, - 0x29, 0xba, 0x03, 0x90, 0x48, 0x7c, 0x79, 0x81, 0xd5, 0xc7, 0x2d, 0x6d, 0xae, 0xd3, 0xb4, 0xc4, - 0x84, 0x9e, 0xc2, 0xab, 0xbf, 0x97, 0xa0, 0xc1, 0x22, 0xfd, 0x4d, 0x48, 0xbc, 0xe9, 0x03, 0xec, - 0x61, 0x9b, 0x04, 0xc4, 0xf3, 0xd1, 0xeb, 0x50, 0x13, 0xaf, 0xef, 0xa7, 0x1e, 0x54, 0x15, 0xb2, - 0xc8, 0x34, 0xda, 0x48, 0x79, 0xc8, 0x41, 0xfc, 0x71, 0x2b, 0x19, 0x0f, 0xd1, 0x3e, 0x94, 0x02, - 0x6c, 0xfa, 0xf2, 0x22, 0x73, 0x6d, 0xa7, 0xc0, 0xb5, 0x22, 0x07, 0xb4, 0x43, 0x6c, 0xfa, 0xfb, - 0x34, 0xf0, 0xa6, 0x3a, 0x53, 0x47, 0x9f, 0xc3, 0xf5, 0x59, 0xab, 0xf6, 0x6d, 0x8b, 0xca, 0xa5, - 0x17, 0xe8, 0xb5, 0x5a, 0xd2, 0xae, 0xf7, 0x2d, 0x9a, 0xe7, 0xc2, 0x13, 0x79, 0xe9, 0x72, 0x5c, - 0x78, 0x82, 0xee, 0x41, 0x2d, 0x1e, 0x3e, 0xcc, 0xab, 0x6b, 0x8c, 0xe9, 0xd5, 0x39, 0xa6, 0x3d, - 0x01, 0xe2, 0x44, 0xbf, 0x46, 0x44, 0xd5, 0x58, 0x31, 0xf2, 0x29, 0xc3, 0x83, 0x27, 0xf2, 0xf2, - 0x65, 0x78, 0xf0, 0x04, 0xdd, 0x06, 0xa0, 0xa1, 0xdd, 0x67, 0x5d, 0xe3, 0xcb, 0xe5, 0x75, 0x69, - 0x7b, 0x49, 0xaf, 0xd0, 0xd0, 0x66, 0x41, 0xf6, 0x95, 0x0f, 0xa0, 0x92, 0x44, 0x16, 0xad, 0xc2, - 0xe2, 0x31, 0x99, 0x8a, 0xdc, 0x46, 0x9f, 0xa8, 0x01, 0x4b, 0x63, 0x3c, 0x0a, 0xe3, 0x54, 0xf2, - 0xc3, 0x47, 0x0b, 0x1f, 0x4a, 0xaa, 0x0e, 0x6b, 0xf7, 0x2c, 0x6a, 0x70, 0x9a, 0xb8, 0x65, 0x3e, - 0x81, 0xa5, 0x67, 0x51, 0xde, 0xc4, 0x08, 0xd9, 0xba, 0x60, 0x72, 0x75, 0xae, 0xa5, 0xee, 0x03, - 0x8a, 0x46, 0x4a, 0x52, 0xf4, 0xbb, 0x47, 0x21, 0x3d, 0x46, 0x6d, 0x58, 0x8a, 0xda, 0x23, 0x1e, - 0x76, 0x45, 0x73, 0x49, 0x8c, 0x38, 0x8e, 0x53, 0x0f, 0xa1, 0x9e, 0xb8, 0x76, 0xb0, 0x77, 0x55, - 0xce, 0x8d, 0xa1, 0x91, 0x65, 0x15, 0x8d, 0xf9, 0x04, 0x2a, 0xf1, 0x90, 0xe3, 0x2e, 0xd6, 0xba, - 0x77, 0x2f, 0x3b, 0xe5, 0xca, 0x09, 0x7b, 0x59, 0x8c, 0x39, 0x5f, 0xbd, 0x01, 0xf5, 0x5d, 0xec, - 0xe2, 0x81, 0x35, 0xb2, 0x82, 0xd9, 0xaa, 0x52, 0x3d, 0x68, 0x64, 0xc5, 0xc2, 0x9d, 0x77, 0x60, - 0x0d, 0x7b, 0xc3, 0x23, 0x6b, 0x2c, 0xa6, 0x33, 0x36, 0x88, 0xc7, 0x5e, 0x5c, 0xd6, 0xe7, 0x2f, - 0x72, 0x68, 0x36, 0xd4, 0x3d, 0x96, 0xeb, 0x2c, 0x9a, 0x5f, 0x74, 0x9e, 0xc2, 0xea, 0xec, 0xf4, - 0x60, 0x14, 0x9a, 0x16, 0x45, 0xdf, 0x42, 0x25, 0xd9, 0x05, 0xe8, 0x8d, 0x82, 0x98, 0xe6, 0xd7, - 0x8c, 0xf2, 0xe6, 0xd9, 0x20, 0xfe, 0x8e, 0xce, 0x7f, 0x8b, 0xdc, 0x18, 0x77, 0x54, 0x18, 0x7b, - 0x04, 0xe5, 0x78, 0xc7, 0x20, 0xb5, 0x80, 0x26, 0xb7, 0x80, 0x94, 0x8d, 0x02, 0xcc, 0x7c, 0x85, - 0xbd, 0x27, 0xa1, 0xef, 0xa1, 0x9a, 0x5a, 0x1b, 0x68, 0xa3, 0x98, 0x3b, 0xb7, 0x6c, 0x94, 0xcd, - 0xf3, 0x60, 0x22, 0x27, 0x03, 0x58, 0xc9, 0x0c, 0x75, 0xb4, 0x55, 0xac, 0x38, 0xb7, 0x83, 0x94, - 0xed, 0xf3, 0x81, 0xc2, 0xc6, 0x63, 0x80, 0x59, 0x3f, 0xa2, 0xa2, 0x18, 0xcf, 0xb5, 0xeb, 0xc5, - 0xc3, 0xd3, 0x87, 0x5a, 0xba, 0xf6, 0xd1, 0xe6, 0x59, 0xf4, 0xb3, 0x96, 0x53, 0xb6, 0xce, 0xc5, - 0x89, 0x6c, 0x4f, 0xe0, 0xe6, 0xdd, 0x7c, 0xb9, 0x89, 0x9c, 0xff, 0x20, 0xfe, 0x54, 0x52, 0xf7, - 0x57, 0x59, 0x67, 0xd3, 0x8c, 0xe5, 0x4c, 0xb5, 0x3d, 0x61, 0x7f, 0x34, 0xe2, 0xf6, 0xea, 0x8b, - 0xae, 0xf3, 0xb3, 0x04, 0x72, 0xf6, 0x2f, 0x2f, 0x65, 0xfc, 0x88, 0x19, 0x4f, 0x5f, 0xa3, 0xb7, - 0x8a, 0x8d, 0x17, 0xfc, 0xc8, 0x2a, 0x6f, 0x5f, 0x04, 0x2a, 0x22, 0x10, 0x02, 0xe2, 0x36, 0xd3, - 0xf3, 0x24, 0x4a, 0x79, 0xe6, 0x5c, 0x94, 0xf2, 0x82, 0xb9, 0x54, 0x98, 0xf2, 0xa2, 0x41, 0xd5, - 0xbd, 0xf5, 0xfc, 0xb4, 0x29, 0xfd, 0x79, 0xda, 0x94, 0xfe, 0x39, 0x6d, 0x4a, 0x7f, 0xfc, 0xdb, - 0x94, 0xbe, 0x03, 0xa1, 0xd2, 0x1f, 0xef, 0x0c, 0xae, 0xb1, 0x05, 0xf7, 0xfe, 0xff, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x84, 0x36, 0xed, 0x70, 0x33, 0x0c, 0x00, 0x00, + // 1045 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x73, 0xdb, 0xc4, + 0x1b, 0xff, 0x2b, 0xb1, 0x6b, 0xfb, 0xb1, 0xd3, 0x7f, 0xb2, 0x76, 0xa9, 0x10, 0x34, 0x0e, 0x82, + 0xbc, 0xc0, 0x80, 0x4c, 0xcc, 0x01, 0x06, 0xca, 0x40, 0x9d, 0xa4, 0x9e, 0x00, 0x85, 0xa2, 0x66, + 0xe8, 0x0c, 0x85, 0x7a, 0xd6, 0xd6, 0xa2, 0xa8, 0xb1, 0x56, 0xaa, 0x5e, 0x3c, 0xf6, 0x81, 0x1b, + 0x1f, 0x80, 0x23, 0x27, 0xae, 0x7c, 0x95, 0x1e, 0x39, 0x73, 0x08, 0x4c, 0xae, 0x7c, 0x09, 0x46, + 0xbb, 0x2b, 0x59, 0x92, 0x35, 0x49, 0x9a, 0xc9, 0x4d, 0xfb, 0xec, 0x6f, 0x7f, 0xcf, 0xfb, 0xf3, + 0x08, 0x56, 0xfc, 0xc0, 0xf1, 0xb0, 0x49, 0x34, 0xd7, 0x73, 0x02, 0x07, 0xad, 0x3d, 0xc3, 0xc4, + 0x24, 0x9e, 0x16, 0x4b, 0x27, 0xbb, 0x4a, 0xcb, 0x74, 0x4c, 0x87, 0xdd, 0x76, 0xa2, 0x2f, 0x0e, + 0x54, 0xda, 0xa6, 0xe3, 0x98, 0x63, 0xd2, 0x61, 0xa7, 0x61, 0xf8, 0x53, 0x27, 0xb0, 0x6c, 0xe2, + 0x07, 0xd8, 0x76, 0x05, 0x60, 0x3d, 0x0f, 0x30, 0x42, 0x0f, 0x07, 0x96, 0x43, 0xc5, 0x7d, 0xdd, + 0x76, 0x0c, 0x32, 0xe6, 0x07, 0xf5, 0x77, 0x09, 0x5e, 0xe9, 0x93, 0x60, 0x9f, 0xb8, 0x84, 0x1a, + 0x84, 0x8e, 0x2c, 0xe2, 0xeb, 0xe4, 0x79, 0x48, 0xfc, 0x00, 0xed, 0x01, 0xf8, 0x01, 0xf6, 0x82, + 0x41, 0xa4, 0x40, 0x96, 0x36, 0xa4, 0x9d, 0x7a, 0x57, 0xd1, 0x38, 0xb9, 0x16, 0x93, 0x6b, 0x47, + 0xb1, 0xf6, 0x5e, 0xf5, 0xc5, 0x69, 0xfb, 0x7f, 0xbf, 0xfe, 0xdd, 0x96, 0xf4, 0x1a, 0x7b, 0x17, + 0xdd, 0xa0, 0xcf, 0xa0, 0x4a, 0xa8, 0xc1, 0x29, 0x96, 0x5e, 0x82, 0xa2, 0x42, 0xa8, 0x11, 0xc9, + 0xd5, 0x21, 0xdc, 0x5e, 0xb0, 0xcf, 0x77, 0x1d, 0xea, 0x13, 0xd4, 0x87, 0x86, 0x91, 0x92, 0xcb, + 0xd2, 0xc6, 0xf2, 0x4e, 0xbd, 0x7b, 0x47, 0x13, 0x91, 0xc4, 0xae, 0x35, 0x98, 0x74, 0xb5, 0xe4, + 0xe9, 0xec, 0x2b, 0x8b, 0x9e, 0xf4, 0x4a, 0x91, 0x0a, 0x3d, 0xf3, 0x50, 0xfd, 0x04, 0x56, 0x1f, + 0x7b, 0x56, 0x40, 0x1e, 0xb9, 0x98, 0xc6, 0xde, 0x6f, 0x43, 0xc9, 0x77, 0x31, 0x15, 0x7e, 0x37, + 0x73, 0xa4, 0x0c, 0xc9, 0x00, 0x6a, 0x13, 0xd6, 0x52, 0x8f, 0xb9, 0x69, 0x2a, 0x85, 0xff, 0xf7, + 0x49, 0x70, 0xe4, 0xe1, 0x11, 0x89, 0x09, 0x9f, 0x40, 0x35, 0x88, 0xce, 0x03, 0xcb, 0x60, 0xa4, + 0x8d, 0xde, 0xe7, 0x91, 0x29, 0x7f, 0x9d, 0xb6, 0xdf, 0x33, 0xad, 0xe0, 0x38, 0x1c, 0x6a, 0x23, + 0xc7, 0xee, 0x70, 0x35, 0x11, 0xd0, 0xa2, 0xa6, 0x38, 0x75, 0x78, 0xc2, 0x18, 0xdb, 0xe1, 0xfe, + 0xd9, 0x69, 0xbb, 0x22, 0x3e, 0xf5, 0x0a, 0x63, 0x3c, 0x34, 0xd4, 0x16, 0xa0, 0x3e, 0x09, 0x1e, + 0x11, 0x6f, 0x62, 0x8d, 0x92, 0x0c, 0xaa, 0xbb, 0xd0, 0xcc, 0x48, 0x45, 0xdc, 0x14, 0xa8, 0xfa, + 0x42, 0xc6, 0x62, 0x56, 0xd3, 0x93, 0xb3, 0xfa, 0x00, 0x5a, 0x7d, 0x12, 0x7c, 0xe3, 0x12, 0x5e, + 0x32, 0x49, 0x31, 0xc8, 0x50, 0x11, 0x18, 0x66, 0x7c, 0x4d, 0x8f, 0x8f, 0xe8, 0x35, 0xa8, 0x45, + 0x71, 0x18, 0x9c, 0x58, 0xd4, 0x60, 0x29, 0x8e, 0xe8, 0x5c, 0x4c, 0xbf, 0xb4, 0xa8, 0xa1, 0xde, + 0x85, 0x5a, 0xc2, 0x85, 0x10, 0x94, 0x28, 0xb6, 0x63, 0x02, 0xf6, 0x7d, 0xfe, 0xeb, 0x9f, 0xe1, + 0x56, 0xce, 0x18, 0xe1, 0xc1, 0x16, 0xdc, 0x74, 0x62, 0xe9, 0xd7, 0xd8, 0x4e, 0xfc, 0xc8, 0x49, + 0xd1, 0x5d, 0x80, 0x44, 0xe2, 0xcb, 0x4b, 0xac, 0x3e, 0x5e, 0xd7, 0x16, 0x3a, 0x4d, 0x4b, 0x54, + 0xe8, 0x29, 0xbc, 0xfa, 0x47, 0x09, 0x5a, 0x2c, 0xd2, 0xdf, 0x86, 0xc4, 0x9b, 0x3d, 0xc4, 0x1e, + 0xb6, 0x49, 0x40, 0x3c, 0x1f, 0xbd, 0x01, 0x0d, 0xe1, 0xfd, 0x20, 0xe5, 0x50, 0x5d, 0xc8, 0x22, + 0xd5, 0x68, 0x33, 0x65, 0x21, 0x07, 0x71, 0xe7, 0x56, 0x32, 0x16, 0xa2, 0x03, 0x28, 0x05, 0xd8, + 0xf4, 0xe5, 0x65, 0x66, 0xda, 0x6e, 0x81, 0x69, 0x45, 0x06, 0x68, 0x47, 0xd8, 0xf4, 0x0f, 0x68, + 0xe0, 0xcd, 0x74, 0xf6, 0x1c, 0x7d, 0x01, 0x37, 0xe7, 0xad, 0x3a, 0xb0, 0x2d, 0x2a, 0x97, 0x5e, + 0xa2, 0xd7, 0x1a, 0x49, 0xbb, 0x3e, 0xb0, 0x68, 0x9e, 0x0b, 0x4f, 0xe5, 0xf2, 0xd5, 0xb8, 0xf0, + 0x14, 0xdd, 0x87, 0x46, 0x3c, 0x7c, 0x98, 0x55, 0x37, 0x18, 0xd3, 0xab, 0x0b, 0x4c, 0xfb, 0x02, + 0xc4, 0x89, 0x7e, 0x8b, 0x88, 0xea, 0xf1, 0xc3, 0xc8, 0xa6, 0x0c, 0x0f, 0x9e, 0xca, 0x95, 0xab, + 0xf0, 0xe0, 0x29, 0xba, 0x03, 0x40, 0x43, 0x7b, 0xc0, 0xba, 0xc6, 0x97, 0xab, 0x1b, 0xd2, 0x4e, + 0x59, 0xaf, 0xd1, 0xd0, 0x66, 0x41, 0xf6, 0x95, 0x0f, 0xa1, 0x96, 0x44, 0x16, 0xad, 0xc2, 0xf2, + 0x09, 0x99, 0x89, 0xdc, 0x46, 0x9f, 0xa8, 0x05, 0xe5, 0x09, 0x1e, 0x87, 0x71, 0x2a, 0xf9, 0xe1, + 0xe3, 0xa5, 0x8f, 0x24, 0x55, 0x87, 0xb5, 0xfb, 0x16, 0x35, 0x38, 0x4d, 0xdc, 0x32, 0x9f, 0x42, + 0xf9, 0x79, 0x94, 0x37, 0x31, 0x42, 0xb6, 0x2f, 0x99, 0x5c, 0x9d, 0xbf, 0x52, 0x0f, 0x00, 0x45, + 0x23, 0x25, 0x29, 0xfa, 0xbd, 0xe3, 0x90, 0x9e, 0xa0, 0x0e, 0x94, 0xa3, 0xf6, 0x88, 0x87, 0x5d, + 0xd1, 0x5c, 0x12, 0x23, 0x8e, 0xe3, 0xd4, 0x23, 0x68, 0x26, 0xa6, 0x1d, 0xee, 0x5f, 0x97, 0x71, + 0x13, 0x68, 0x65, 0x59, 0x45, 0x63, 0x3e, 0x85, 0x5a, 0x3c, 0xe4, 0xb8, 0x89, 0x8d, 0xde, 0xbd, + 0xab, 0x4e, 0xb9, 0x6a, 0xc2, 0x5e, 0x15, 0x63, 0xce, 0x57, 0x6f, 0x41, 0x73, 0x0f, 0xbb, 0x78, + 0x68, 0x8d, 0xad, 0x60, 0xbe, 0xaa, 0x54, 0x0f, 0x5a, 0x59, 0xb1, 0x30, 0xe7, 0x5d, 0x58, 0xc3, + 0xde, 0xe8, 0xd8, 0x9a, 0x88, 0xe9, 0x8c, 0x0d, 0xe2, 0x31, 0x8f, 0xab, 0xfa, 0xe2, 0x45, 0x0e, + 0xcd, 0x86, 0xba, 0xc7, 0x72, 0x9d, 0x45, 0xf3, 0x8b, 0xee, 0x33, 0x58, 0x9d, 0x9f, 0x1e, 0x8e, + 0x43, 0xd3, 0xa2, 0xe8, 0x3b, 0xa8, 0x25, 0xbb, 0x00, 0xbd, 0x59, 0x10, 0xd3, 0xfc, 0x9a, 0x51, + 0xde, 0x3a, 0x1f, 0xc4, 0xfd, 0xe8, 0xfe, 0xbb, 0xcc, 0x95, 0x71, 0x43, 0x85, 0xb2, 0xc7, 0x50, + 0x8d, 0x77, 0x0c, 0x52, 0x0b, 0x68, 0x72, 0x0b, 0x48, 0xd9, 0x2c, 0xc0, 0x2c, 0x56, 0xd8, 0xfb, + 0x12, 0xfa, 0x01, 0xea, 0xa9, 0xb5, 0x81, 0x36, 0x8b, 0xb9, 0x73, 0xcb, 0x46, 0xd9, 0xba, 0x08, + 0x26, 0x72, 0x32, 0x84, 0x95, 0xcc, 0x50, 0x47, 0xdb, 0xc5, 0x0f, 0x17, 0x76, 0x90, 0xb2, 0x73, + 0x31, 0x50, 0xe8, 0x78, 0x02, 0x30, 0xef, 0x47, 0x54, 0x14, 0xe3, 0x85, 0x76, 0xbd, 0x7c, 0x78, + 0x06, 0xd0, 0x48, 0xd7, 0x3e, 0xda, 0x3a, 0x8f, 0x7e, 0xde, 0x72, 0xca, 0xf6, 0x85, 0x38, 0x91, + 0xed, 0x29, 0xdc, 0xbe, 0x97, 0x2f, 0x37, 0x91, 0xf3, 0x1f, 0xc5, 0x9f, 0x4a, 0xea, 0xfe, 0x3a, + 0xeb, 0x6c, 0x96, 0xd1, 0x9c, 0xa9, 0xb6, 0xa7, 0xec, 0x8f, 0x46, 0xdc, 0x5e, 0x7f, 0xd1, 0x75, + 0x7f, 0x91, 0x40, 0xce, 0xfe, 0xe5, 0xa5, 0x94, 0x1f, 0x33, 0xe5, 0xe9, 0x6b, 0xf4, 0x76, 0xb1, + 0xf2, 0x82, 0x1f, 0x59, 0xe5, 0x9d, 0xcb, 0x40, 0x45, 0x04, 0x42, 0x40, 0x5c, 0x67, 0x7a, 0x9e, + 0x44, 0x29, 0xcf, 0x9c, 0x8b, 0x52, 0x5e, 0x30, 0x97, 0x0a, 0x53, 0x5e, 0x34, 0xa8, 0x7a, 0xf2, + 0x8b, 0xb3, 0x75, 0xe9, 0xcf, 0xb3, 0x75, 0xe9, 0x9f, 0xb3, 0x75, 0xe9, 0x7b, 0x10, 0xf0, 0xc1, + 0x64, 0x77, 0x78, 0x83, 0x2d, 0xb7, 0x0f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x66, 0x94, + 0xe3, 0x2f, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/tools.go b/tools.go index f949bce3e8e..9af160a3f93 100644 --- a/tools.go +++ b/tools.go @@ -20,7 +20,6 @@ package jaeger import ( _ "honnef.co/go/tools/cmd/staticcheck" - _ "github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger" _ "github.com/mjibson/esc" _ "github.com/securego/gosec/cmd/gosec" _ "github.com/vektra/mockery/cmd/mockery"