diff --git a/Makefile b/Makefile index 92e1322..cda0326 100644 --- a/Makefile +++ b/Makefile @@ -31,12 +31,12 @@ build.debug: ## === Tools === -EXAMPLES=basic errors nullable union time +EXAMPLES=basic errors monitor nullable union time define examples .PHONY: example.$(1) example.$(1): cd example/${1} && go run ../../cmd/gotsrpc/gotsrpc.go gotsrpc.yml - cd example/${1}/client && tsc --build + cd example/${1}/client && ../../node_modules/.bin/tsc --build .PHONY: example.$(1).run example.$(1).run: example.${1} diff --git a/example/basic/go.sum b/example/basic/go.sum index 20aa6ef..2f7a6de 100644 --- a/example/basic/go.sum +++ b/example/basic/go.sum @@ -106,6 +106,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -187,8 +188,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/example/basic/service/gotsrpc_gen.go b/example/basic/service/gotsrpc_gen.go index 1d521b0..fc4c25f 100644 --- a/example/basic/service/gotsrpc_gen.go +++ b/example/basic/service/gotsrpc_gen.go @@ -92,1045 +92,1402 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/basic/service" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/basic/service" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyBool: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v bool ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() boolRet := p.service.Bool(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{boolRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{boolRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyBoolPtr: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v bool ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() boolPtrRet := p.service.BoolPtr(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{boolPtrRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{boolPtrRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyBoolSlice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []bool ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() boolSliceRet := p.service.BoolSlice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{boolSliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{boolSliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v float32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32Ret := p.service.Float32(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[float32]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32MapRet := p.service.Float32Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []float32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32SliceRet := p.service.Float32Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Float32Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32TypeRet := p.service.Float32Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[Float32TypeMapKey]Float32TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32TypeMapRet := p.service.Float32TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat32TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Float32TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float32TypeMapTypedRet := p.service.Float32TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float32TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float32TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v float64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64Ret := p.service.Float64(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[float64]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64MapRet := p.service.Float64Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []float64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64SliceRet := p.service.Float64Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Float64Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64TypeRet := p.service.Float64Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[Float64TypeMapKey]Float64TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64TypeMapRet := p.service.Float64TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyFloat64TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Float64TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() float64TypeMapTypedRet := p.service.Float64TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{float64TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{float64TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v int ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intRet := p.service.Int(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v int32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32Ret := p.service.Int32(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[int32]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32MapRet := p.service.Int32Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []int32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32SliceRet := p.service.Int32Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Int32Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32TypeRet := p.service.Int32Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[Int32TypeMapKey]Int32TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32TypeMapRet := p.service.Int32TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt32TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Int32TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int32TypeMapTypedRet := p.service.Int32TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int32TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int32TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v int64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64Ret := p.service.Int64(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[int64]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64MapRet := p.service.Int64Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []int64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64SliceRet := p.service.Int64Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Int64Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64TypeRet := p.service.Int64Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[Int64TypeMapKey]Int64TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64TypeMapRet := p.service.Int64TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInt64TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Int64TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() int64TypeMapTypedRet := p.service.Int64TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{int64TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{int64TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyIntMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[int]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intMapRet := p.service.IntMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyIntSlice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []int ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intSliceRet := p.service.IntSlice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intSliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intSliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyIntType: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v IntType ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intTypeRet := p.service.IntType(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intTypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intTypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyIntTypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[IntTypeMapKey]IntTypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intTypeMapRet := p.service.IntTypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intTypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intTypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyIntTypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v IntTypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() intTypeMapTypedRet := p.service.IntTypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{intTypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{intTypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInterface: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() interfaceRet := p.service.Interface(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{interfaceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{interfaceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInterfaceSlice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() interfaceSliceRet := p.service.InterfaceSlice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{interfaceSliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{interfaceSliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyString: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v string ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringRet := p.service.String(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStringMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[string]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringMapRet := p.service.StringMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStringSlice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []string ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringSliceRet := p.service.StringSlice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringSliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringSliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStringType: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v StringType ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringTypeRet := p.service.StringType(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringTypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringTypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStringTypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[StringTypeMapKey]StringTypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringTypeMapRet := p.service.StringTypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringTypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringTypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStringTypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v StringTypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() stringTypeMapTypedRet := p.service.StringTypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{stringTypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{stringTypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyStruct: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v Struct ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() structRet := p.service.Struct(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{structRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{structRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v uint ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntRet := p.service.UInt(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v uint32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32Ret := p.service.UInt32(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[uint32]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32MapRet := p.service.UInt32Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []uint32 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32SliceRet := p.service.UInt32Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UInt32Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32TypeRet := p.service.UInt32Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[UInt32TypeMapKey]UInt32TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32TypeMapRet := p.service.UInt32TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt32TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UInt32TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt32TypeMapTypedRet := p.service.UInt32TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt32TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt32TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v uint64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64Ret := p.service.UInt64(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64Ret} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64Ret}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64Map: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[uint64]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64MapRet := p.service.UInt64Map(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64MapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64MapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64Slice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []uint64 ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64SliceRet := p.service.UInt64Slice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64SliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64SliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64Type: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UInt64Type ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64TypeRet := p.service.UInt64Type(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64TypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64TypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64TypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[UInt64TypeMapKey]UInt64TypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64TypeMapRet := p.service.UInt64TypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64TypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64TypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUInt64TypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UInt64TypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uInt64TypeMapTypedRet := p.service.UInt64TypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uInt64TypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uInt64TypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUIntMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[uint]interface{} ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntMapRet := p.service.UIntMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUIntSlice: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v []uint ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntSliceRet := p.service.UIntSlice(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntSliceRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntSliceRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUIntType: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UIntType ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntTypeRet := p.service.UIntType(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntTypeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntTypeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUIntTypeMap: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v map[UIntTypeMapKey]UIntTypeMapValue ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntTypeMapRet := p.service.UIntTypeMap(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntTypeMapRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntTypeMapRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUIntTypeMapTyped: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v UIntTypeMapTyped ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() uIntTypeMapTypedRet := p.service.UIntTypeMapTyped(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{uIntTypeMapTypedRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{uIntTypeMapTypedRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/example/errors/client/src/service-client.ts b/example/errors/client/src/service-client.ts index 45a40f6..9c1a14f 100644 --- a/example/errors/client/src/service-client.ts +++ b/example/errors/client/src/service-client.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_errors_service_frontend from './service-vo'; // ./client/src/service-client.ts to ./client/src/service-vo.ts export class ServiceClient { diff --git a/example/errors/client/src/service-vo.ts b/example/errors/client/src/service-vo.ts index c8fd6bc..7d8988a 100644 --- a/example/errors/client/src/service-vo.ts +++ b/example/errors/client/src/service-vo.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_errors_service_frontend from './service-vo'; // ./client/src/service-vo.ts to ./client/src/service-vo.ts // github.com/foomo/gotsrpc/v2/example/errors/service/frontend.ErrMulti export type ErrMulti = (typeof github_com_foomo_gotsrpc_v2_example_errors_service_frontend.ErrMultiA) & (typeof github_com_foomo_gotsrpc_v2_example_errors_service_frontend.ErrMultiB) diff --git a/example/errors/go.sum b/example/errors/go.sum index 598d962..580eb9f 100644 --- a/example/errors/go.sum +++ b/example/errors/go.sum @@ -106,6 +106,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -193,8 +194,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/example/errors/service/backend/gotsrpc_gen.go b/example/errors/service/backend/gotsrpc_gen.go index 4680b9c..1c1fd5b 100644 --- a/example/errors/service/backend/gotsrpc_gen.go +++ b/example/errors/service/backend/gotsrpc_gen.go @@ -42,135 +42,202 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/errors/service/backend" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/errors/service/backend" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyCustomError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} customErrorE := p.service.CustomError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{customErrorE}, callStats, r, w) + rets = []interface{}{customErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} errorE := p.service.Error(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{errorE}, callStats, r, w) + rets = []interface{}{errorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyMultiScalar: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} multiScalarE := p.service.MultiScalar(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{multiScalarE}, callStats, r, w) + rets = []interface{}{multiScalarE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyScalar: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} scalarE := p.service.Scalar(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{scalarE}, callStats, r, w) + rets = []interface{}{scalarE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyScalarError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} scalarErrorE := p.service.ScalarError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{scalarErrorE}, callStats, r, w) + rets = []interface{}{scalarErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyTypedCustomError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} typedCustomErrorE := p.service.TypedCustomError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{typedCustomErrorE}, callStats, r, w) + rets = []interface{}{typedCustomErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyTypedError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} typedErrorE := p.service.TypedError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{typedErrorE}, callStats, r, w) + rets = []interface{}{typedErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyTypedScalarError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} typedScalarErrorE := p.service.TypedScalarError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{typedScalarErrorE}, callStats, r, w) + rets = []interface{}{typedScalarErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyTypedWrappedError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} typedWrappedErrorE := p.service.TypedWrappedError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{typedWrappedErrorE}, callStats, r, w) + rets = []interface{}{typedWrappedErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyWrappedError: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} wrappedErrorE := p.service.WrappedError(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{wrappedErrorE}, callStats, r, w) + rets = []interface{}{wrappedErrorE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/example/errors/service/frontend/gotsrpc_gen.go b/example/errors/service/frontend/gotsrpc_gen.go index 963d60b..a141d48 100644 --- a/example/errors/service/frontend/gotsrpc_gen.go +++ b/example/errors/service/frontend/gotsrpc_gen.go @@ -38,47 +38,58 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/errors/service/frontend" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/errors/service/frontend" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyMultiple: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} multipleE := p.service.Multiple(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{multipleE}, callStats, r, w) + rets = []interface{}{multipleE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxySimple: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} simpleE := p.service.Simple(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{simpleE}, callStats, r, w) + rets = []interface{}{simpleE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/example/monitor/client/index.html b/example/monitor/client/index.html new file mode 100644 index 0000000..aa0d62c --- /dev/null +++ b/example/monitor/client/index.html @@ -0,0 +1,19 @@ + + + + + + + Basic + + + +

A service test

+ + 
open the console!
+ + + \ No newline at end of file diff --git a/example/monitor/client/src/app.ts b/example/monitor/client/src/app.ts new file mode 100644 index 0000000..e26ba8b --- /dev/null +++ b/example/monitor/client/src/app.ts @@ -0,0 +1,11 @@ +import {ServiceClient} from "./service-client.js"; +import transport from "./transport.js"; + + +export const init = () => { + const client = new ServiceClient(transport("/service")); + + client.hello("Hello world").then((res) => { + console.log(res); + }); +}; diff --git a/example/monitor/client/src/service-client.ts b/example/monitor/client/src/service-client.ts new file mode 100644 index 0000000..395cd10 --- /dev/null +++ b/example/monitor/client/src/service-client.ts @@ -0,0 +1,12 @@ +/* eslint:disable */ +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. + +export class ServiceClient { + public static defaultEndpoint = "/service"; + constructor( + public transport:(method: string, data?: any[]) => Promise + ) {} + async hello(v:string):Promise { + return (await this.transport<{0:string}>("Hello", [v]))[0] + } +} \ No newline at end of file diff --git a/example/monitor/client/src/transport.ts b/example/monitor/client/src/transport.ts new file mode 100644 index 0000000..79683ce --- /dev/null +++ b/example/monitor/client/src/transport.ts @@ -0,0 +1,18 @@ +const transport = endpoint => async (method: string, args: any = []) => { + return new Promise(async (resolve, reject) => { + fetch( + `${endpoint}/${encodeURIComponent(method)}`, + { + method: 'POST', + body: JSON.stringify(args), + } + ) + .then((response) => { + return response.json() as Promise; + }) + .then((val) => resolve(val)) + .catch((err) => reject(err)) + }) +}; + +export default transport diff --git a/example/monitor/client/tsconfig.json b/example/monitor/client/tsconfig.json new file mode 100644 index 0000000..82acc28 --- /dev/null +++ b/example/monitor/client/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "./dist", + "rootDir": "./src" + } +} \ No newline at end of file diff --git a/example/monitor/go.mod b/example/monitor/go.mod new file mode 100644 index 0000000..0774e50 --- /dev/null +++ b/example/monitor/go.mod @@ -0,0 +1,11 @@ +module github.com/foomo/gotsrpc/v2/example/monitor + +go 1.16 + +require ( + github.com/foomo/gotsrpc/v2 v2.0.10 + github.com/pkg/errors v0.9.1 + github.com/valyala/gorpc v0.0.0-20160519171614-908281bef774 +) + +replace github.com/foomo/gotsrpc/v2 => ../../ diff --git a/example/monitor/go.sum b/example/monitor/go.sum new file mode 100644 index 0000000..2f7a6de --- /dev/null +++ b/example/monitor/go.sum @@ -0,0 +1,489 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= +github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= +github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +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.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= +github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= +github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/valyala/gorpc v0.0.0-20160519171614-908281bef774 h1:SUHFQHAaySqF0YHCmmm0EIFooFZpDPpi5KTom7YJ07c= +github.com/valyala/gorpc v0.0.0-20160519171614-908281bef774/go.mod h1:8uNqM1i7pr0jO7gdvbNCgsSa8Ki2vMh7JCQxO9BlF90= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38= +golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/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-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8= +golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +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-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +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= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +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.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.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +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.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/example/monitor/gotsrpc.yml b/example/monitor/gotsrpc.yml new file mode 100644 index 0000000..ea4fbcd --- /dev/null +++ b/example/monitor/gotsrpc.yml @@ -0,0 +1,14 @@ +module: + name: github.com/foomo/gotsrpc/v2/example/monitor + path: ./ + +targets: + monitor: + services: + /service: Service + package: github.com/foomo/gotsrpc/v2/example/monitor/service + out: ./client/src/service-client.ts + gorpc: + - Service + tsrpc: + - Service diff --git a/example/monitor/main.go b/example/monitor/main.go new file mode 100644 index 0000000..5b45502 --- /dev/null +++ b/example/monitor/main.go @@ -0,0 +1,58 @@ +package main + +import ( + "context" + "fmt" + "net/http" + "os/exec" + "strings" + "time" + + "github.com/foomo/gotsrpc/v2" + "github.com/foomo/gotsrpc/v2/example/monitor/service" +) + +func init() { + // set custom monitor handler + gotsrpc.Monitor = func(w http.ResponseWriter, r *http.Request, args, rets []interface{}, stats *gotsrpc.CallStats) { + // you might want to use channels or routines here as to not block the actual call + go func(stats *gotsrpc.CallStats) { + fmt.Printf( + "Monitor: %s.%s [%dμs|%dμs|%dμs]\n", + stats.Service, stats.Func, stats.Unmarshalling.Microseconds(), stats.Execution.Microseconds(), stats.Marshalling.Microseconds(), + ) + }(stats) + } +} + +func main() { + fs := http.FileServer(http.Dir("./client")) + ws := service.NewDefaultServiceGoTSRPCProxy(&service.Handler{}) + + mux := http.NewServeMux() + mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { + switch { + case strings.HasPrefix(r.URL.Path, "/service/"): + ws.ServeHTTP(w, r) + default: + fs.ServeHTTP(w, r) + } + }) + + go func() { + time.Sleep(time.Second) + _ = exec.Command("open", "http://127.0.0.1:3000").Run() + call() + }() + + panic(http.ListenAndServe("localhost:3000", mux)) +} + +func call() { + c := service.NewDefaultServiceGoTSRPCClient("http://127.0.0.1:3000") + + { + res, _ := c.Hello(context.Background(), "Hello World") + fmt.Println(res) + } +} diff --git a/example/monitor/service/gorpc_gen.go b/example/monitor/service/gorpc_gen.go new file mode 100644 index 0000000..693fb60 --- /dev/null +++ b/example/monitor/service/gorpc_gen.go @@ -0,0 +1,93 @@ +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. + +package service + +import ( + tls "crypto/tls" + gob "encoding/gob" + fmt "fmt" + reflect "reflect" + strings "strings" + time "time" + + gotsrpc "github.com/foomo/gotsrpc/v2" + gorpc "github.com/valyala/gorpc" +) + +type ( + ServiceGoRPCProxy struct { + server *gorpc.Server + service Service + callStatsHandler gotsrpc.GoRPCCallStatsHandlerFun + } + + ServiceHelloRequest struct { + V string + } + ServiceHelloResponse struct { + RetHello_0 string + } +) + +func init() { + gob.Register(ServiceHelloRequest{}) + gob.Register(ServiceHelloResponse{}) +} + +func NewServiceGoRPCProxy(addr string, service Service, tlsConfig *tls.Config) *ServiceGoRPCProxy { + proxy := &ServiceGoRPCProxy{ + service: service, + } + + if tlsConfig != nil { + proxy.server = gorpc.NewTLSServer(addr, proxy.handler, tlsConfig) + } else { + proxy.server = gorpc.NewTCPServer(addr, proxy.handler) + } + + return proxy +} + +func (p *ServiceGoRPCProxy) Start() error { + return p.server.Start() +} + +func (p *ServiceGoRPCProxy) Serve() error { + return p.server.Serve() +} + +func (p *ServiceGoRPCProxy) Stop() { + p.server.Stop() +} + +func (p *ServiceGoRPCProxy) SetCallStatsHandler(handler gotsrpc.GoRPCCallStatsHandlerFun) { + p.callStatsHandler = handler +} + +func (p *ServiceGoRPCProxy) handler(clientAddr string, request interface{}) (response interface{}) { + start := time.Now() + + reqType := reflect.TypeOf(request).String() + funcNameParts := strings.Split(reqType, ".") + funcName := funcNameParts[len(funcNameParts)-1] + + switch funcName { + case "ServiceHelloRequest": + req := request.(ServiceHelloRequest) + retHello_0 := p.service.Hello(req.V) + response = ServiceHelloResponse{RetHello_0: retHello_0} + default: + fmt.Println("Unkown request type", reflect.TypeOf(request).String()) + } + + if p.callStatsHandler != nil { + p.callStatsHandler(&gotsrpc.CallStats{ + Func: funcName, + Package: "github.com/foomo/gotsrpc/v2/example/monitor/service", + Service: "Service", + Execution: time.Since(start), + }) + } + + return +} diff --git a/example/monitor/service/gorpcclient_gen.go b/example/monitor/service/gorpcclient_gen.go new file mode 100644 index 0000000..cffca75 --- /dev/null +++ b/example/monitor/service/gorpcclient_gen.go @@ -0,0 +1,42 @@ +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. + +package service + +import ( + tls "crypto/tls" + + gorpc "github.com/valyala/gorpc" +) + +type ServiceGoRPCClient struct { + Client *gorpc.Client +} + +func NewServiceGoRPCClient(addr string, tlsConfig *tls.Config) *ServiceGoRPCClient { + client := &ServiceGoRPCClient{} + if tlsConfig == nil { + client.Client = gorpc.NewTCPClient(addr) + } else { + client.Client = gorpc.NewTLSClient(addr, tlsConfig) + } + return client +} + +func (tsc *ServiceGoRPCClient) Start() { + tsc.Client.Start() +} + +func (tsc *ServiceGoRPCClient) Stop() { + tsc.Client.Stop() +} + +func (tsc *ServiceGoRPCClient) Hello(v string) (retHello_0 string, clientErr error) { + req := ServiceHelloRequest{V: v} + rpcCallRes, rpcCallErr := tsc.Client.Call(req) + if rpcCallErr != nil { + clientErr = rpcCallErr + return + } + response := rpcCallRes.(ServiceHelloResponse) + return response.RetHello_0, nil +} diff --git a/example/monitor/service/gotsrpc_gen.go b/example/monitor/service/gotsrpc_gen.go new file mode 100644 index 0000000..c3fe739 --- /dev/null +++ b/example/monitor/service/gotsrpc_gen.go @@ -0,0 +1,77 @@ +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. + +package service + +import ( + io "io" + ioutil "io/ioutil" + http "net/http" + time "time" + + gotsrpc "github.com/foomo/gotsrpc/v2" +) + +const ( + ServiceGoTSRPCProxyHello = "Hello" +) + +type ServiceGoTSRPCProxy struct { + EndPoint string + service Service +} + +func NewDefaultServiceGoTSRPCProxy(service Service) *ServiceGoTSRPCProxy { + return NewServiceGoTSRPCProxy(service, "/service") +} + +func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCProxy { + return &ServiceGoTSRPCProxy{ + EndPoint: endpoint, + service: service, + } +} + +// ServeHTTP exposes your service +func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { + gotsrpc.ErrorMethodNotAllowed(w) + return + } + defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body + + funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/monitor/service" + callStats.Service = "Service" + switch funcName { + case ServiceGoTSRPCProxyHello: + var ( + args []interface{} + rets []interface{} + ) + var ( + arg_v string + ) + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { + gotsrpc.ErrorCouldNotLoadArgs(w) + return + } + executionStart := time.Now() + helloRet := p.service.Hello(arg_v) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{helloRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } + gotsrpc.Monitor(w, r, args, rets, callStats) + return + default: + gotsrpc.ClearStats(r) + gotsrpc.ErrorFuncNotFound(w) + } +} diff --git a/example/monitor/service/gotsrpcclient_gen.go b/example/monitor/service/gotsrpcclient_gen.go new file mode 100644 index 0000000..82562f6 --- /dev/null +++ b/example/monitor/service/gotsrpcclient_gen.go @@ -0,0 +1,46 @@ +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. + +package service + +import ( + go_context "context" + go_net_http "net/http" + + gotsrpc "github.com/foomo/gotsrpc/v2" + pkg_errors "github.com/pkg/errors" +) + +type ServiceGoTSRPCClient interface { + Hello(ctx go_context.Context, v string) (retHello_0 string, clientErr error) +} + +type HTTPServiceGoTSRPCClient struct { + URL string + EndPoint string + Client gotsrpc.Client +} + +func NewDefaultServiceGoTSRPCClient(url string) *HTTPServiceGoTSRPCClient { + return NewServiceGoTSRPCClient(url, "/service") +} + +func NewServiceGoTSRPCClient(url string, endpoint string) *HTTPServiceGoTSRPCClient { + return NewServiceGoTSRPCClientWithClient(url, endpoint, nil) +} + +func NewServiceGoTSRPCClientWithClient(url string, endpoint string, client *go_net_http.Client) *HTTPServiceGoTSRPCClient { + return &HTTPServiceGoTSRPCClient{ + URL: url, + EndPoint: endpoint, + Client: gotsrpc.NewClientWithHttpClient(client), + } +} +func (tsc *HTTPServiceGoTSRPCClient) Hello(ctx go_context.Context, v string) (retHello_0 string, clientErr error) { + args := []interface{}{v} + reply := []interface{}{&retHello_0} + clientErr = tsc.Client.Call(ctx, tsc.URL, tsc.EndPoint, "Hello", args, reply) + if clientErr != nil { + clientErr = pkg_errors.WithMessage(clientErr, "failed to call service.ServiceGoTSRPCProxy Hello") + } + return +} diff --git a/example/monitor/service/handler.go b/example/monitor/service/handler.go new file mode 100644 index 0000000..cc3dac1 --- /dev/null +++ b/example/monitor/service/handler.go @@ -0,0 +1,12 @@ +package service + +import ( + "fmt" +) + +type Handler struct{} + +func (h *Handler) Hello(v string) string { + fmt.Println(v) + return v +} diff --git a/example/monitor/service/service.go b/example/monitor/service/service.go new file mode 100644 index 0000000..733d190 --- /dev/null +++ b/example/monitor/service/service.go @@ -0,0 +1,5 @@ +package service + +type Service interface { + Hello(v string) string +} diff --git a/example/nullable/client/src/service-client.ts b/example/nullable/client/src/service-client.ts index 85c8be2..ae5f65c 100644 --- a/example/nullable/client/src/service-client.ts +++ b/example/nullable/client/src/service-client.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_nullable_service from './service-vo'; // ./client/src/service-client.ts to ./client/src/service-vo.ts export class ServiceClient { diff --git a/example/nullable/client/src/service-vo.ts b/example/nullable/client/src/service-vo.ts index 85939ed..35504d5 100644 --- a/example/nullable/client/src/service-vo.ts +++ b/example/nullable/client/src/service-vo.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_nullable_service from './service-vo'; // ./client/src/service-vo.ts to ./client/src/service-vo.ts // github.com/foomo/gotsrpc/v2/example/nullable/service.ACustomType export enum ACustomType { diff --git a/example/nullable/go.sum b/example/nullable/go.sum index 20aa6ef..2f7a6de 100644 --- a/example/nullable/go.sum +++ b/example/nullable/go.sum @@ -106,6 +106,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -187,8 +188,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/example/nullable/service/gotsrpc_gen.go b/example/nullable/service/gotsrpc_gen.go index dc78782..8627392 100644 --- a/example/nullable/service/gotsrpc_gen.go +++ b/example/nullable/service/gotsrpc_gen.go @@ -40,188 +40,233 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/nullable/service" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/nullable/service" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyVariantA: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 Base ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantAR1 := p.service.VariantA(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantAR1}, callStats, r, w) + rets = []interface{}{variantAR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantB: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 BCustomType ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantBR1 := p.service.VariantB(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantBR1}, callStats, r, w) + rets = []interface{}{variantBR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantC: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 BCustomTypes ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantCR1 := p.service.VariantC(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantCR1}, callStats, r, w) + rets = []interface{}{variantCR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantD: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 BCustomTypesMap ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantDR1 := p.service.VariantD(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantDR1}, callStats, r, w) + rets = []interface{}{variantDR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantE: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 *Base ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantER1 := p.service.VariantE(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantER1}, callStats, r, w) + rets = []interface{}{variantER1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantF: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 []*Base ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantFR1 := p.service.VariantF(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantFR1}, callStats, r, w) + rets = []interface{}{variantFR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantG: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 map[string]*Base ) - args := []interface{}{&arg_i1} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantGR1 := p.service.VariantG(&rw, r, arg_i1) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantGR1}, callStats, r, w) + rets = []interface{}{variantGR1} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyVariantH: + var ( + args []interface{} + rets []interface{} + ) var ( arg_i1 Base arg_i2 *Base arg_i3 []*Base arg_i4 map[string]Base ) - args := []interface{}{&arg_i1, &arg_i2, &arg_i3, &arg_i4} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_i1, &arg_i2, &arg_i3, &arg_i4} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} variantHR1, variantHR2, variantHR3, variantHR4 := p.service.VariantH(&rw, r, arg_i1, arg_i2, arg_i3, arg_i4) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{variantHR1, variantHR2, variantHR3, variantHR4}, callStats, r, w) + rets = []interface{}{variantHR1, variantHR2, variantHR3, variantHR4} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/example/time/go.sum b/example/time/go.sum index 20aa6ef..2f7a6de 100644 --- a/example/time/go.sum +++ b/example/time/go.sum @@ -106,6 +106,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -187,8 +188,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/example/time/service/gotsrpc_gen.go b/example/time/service/gotsrpc_gen.go index 5a14ac3..227e507 100644 --- a/example/time/service/gotsrpc_gen.go +++ b/example/time/service/gotsrpc_gen.go @@ -34,59 +34,68 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/time/service" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/time/service" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyTime: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v time.Time ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() timeRet := p.service.Time(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{timeRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{timeRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyTimeStruct: + var ( + args []interface{} + rets []interface{} + ) var ( arg_v TimeStruct ) - args := []interface{}{&arg_v} - err := gotsrpc.LoadArgs(&args, callStats, r) - if err != nil { + args = []interface{}{&arg_v} + if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil { gotsrpc.ErrorCouldNotLoadArgs(w) return } executionStart := time.Now() timeStructRet := p.service.TimeStruct(arg_v) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) + callStats.Execution = time.Since(executionStart) + rets = []interface{}{timeStructRet} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return } - gotsrpc.Reply([]interface{}{timeStructRet}, callStats, r, w) + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/example/union/client/src/service-client.ts b/example/union/client/src/service-client.ts index 909ba49..d027f76 100644 --- a/example/union/client/src/service-client.ts +++ b/example/union/client/src/service-client.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_union_service from './service-vo'; // ./client/src/service-client.ts to ./client/src/service-vo.ts export class ServiceClient { diff --git a/example/union/client/src/service-vo.ts b/example/union/client/src/service-vo.ts index 5a0ba07..fd268f7 100644 --- a/example/union/client/src/service-vo.ts +++ b/example/union/client/src/service-vo.ts @@ -1,5 +1,5 @@ /* eslint:disable */ -// hello commonjs - we need some imports - sorted in alphabetical order, by go package +// Code generated by gotsrpc https://github.com/foomo/gotsrpc/v2 - DO NOT EDIT. import * as github_com_foomo_gotsrpc_v2_example_union_service from './service-vo'; // ./client/src/service-vo.ts to ./client/src/service-vo.ts // github.com/foomo/gotsrpc/v2/example/union/service.InlineStruct export interface InlineStruct extends github_com_foomo_gotsrpc_v2_example_union_service.InlineStructA , github_com_foomo_gotsrpc_v2_example_union_service.InlineStructB { diff --git a/example/union/go.sum b/example/union/go.sum index d134e29..3bc1ca9 100644 --- a/example/union/go.sum +++ b/example/union/go.sum @@ -106,6 +106,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -187,8 +188,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/example/union/service/gotsrpc_gen.go b/example/union/service/gotsrpc_gen.go index 60bc496..76e9c8e 100644 --- a/example/union/service/gotsrpc_gen.go +++ b/example/union/service/gotsrpc_gen.go @@ -41,69 +41,94 @@ func NewServiceGoTSRPCProxy(service Service, endpoint string) *ServiceGoTSRPCPro // ServeHTTP exposes your service func (p *ServiceGoTSRPCProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } defer io.Copy(ioutil.Discard, r.Body) // Drain Request Body funcName := gotsrpc.GetCalledFunc(r, p.EndPoint) - callStats := gotsrpc.GetStatsForRequest(r) - if callStats != nil { - callStats.Func = funcName - callStats.Package = "github.com/foomo/gotsrpc/v2/example/union/service" - callStats.Service = "Service" - } + callStats, _ := gotsrpc.GetStatsForRequest(r) + callStats.Func = funcName + callStats.Package = "github.com/foomo/gotsrpc/v2/example/union/service" + callStats.Service = "Service" switch funcName { case ServiceGoTSRPCProxyInlineStruct: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} inlineStructE := p.service.InlineStruct(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{inlineStructE}, callStats, r, w) + rets = []interface{}{inlineStructE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyInlineStructPtr: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} inlineStructPtrE := p.service.InlineStructPtr(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{inlineStructPtrE}, callStats, r, w) + rets = []interface{}{inlineStructPtrE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUnionString: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} unionStringE := p.service.UnionString(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{unionStringE}, callStats, r, w) + rets = []interface{}{unionStringE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return case ServiceGoTSRPCProxyUnionStruct: + var ( + args []interface{} + rets []interface{} + ) executionStart := time.Now() rw := gotsrpc.ResponseWriter{ResponseWriter: w} unionStructE := p.service.UnionStruct(&rw, r) - if callStats != nil { - callStats.Execution = time.Now().Sub(executionStart) - } + callStats.Execution = time.Since(executionStart) if rw.Status() == http.StatusOK { - gotsrpc.Reply([]interface{}{unionStructE}, callStats, r, w) + rets = []interface{}{unionStructE} + if err := gotsrpc.Reply(rets, callStats, r, w); err != nil { + gotsrpc.ErrorCouldNotReply(w) + return + } } + gotsrpc.Monitor(w, r, args, rets, callStats) return default: gotsrpc.ClearStats(r) - http.Error(w, "404 - not found "+r.URL.Path, http.StatusNotFound) + gotsrpc.ErrorFuncNotFound(w) } } diff --git a/go.go b/go.go index ced379e..9aa9c74 100644 --- a/go.go +++ b/go.go @@ -252,10 +252,9 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac // ServeHTTP exposes your service func (p *` + proxyName + `) ServeHTTP(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodPost { - if r.Method == http.MethodOptions { - return - } + if r.Method == http.MethodOptions { + return + } else if r.Method != http.MethodPost { gotsrpc.ErrorMethodNotAllowed(w) return } @@ -263,12 +262,10 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac `) g.l("funcName := gotsrpc.GetCalledFunc(r, p.EndPoint)") - g.l("callStats := gotsrpc.GetStatsForRequest(r)") - g.l("if callStats != nil {").ind(1) + g.l("callStats, _ := gotsrpc.GetStatsForRequest(r)") g.l("callStats.Func = funcName") g.l("callStats.Package = \"" + fullPackageName + "\"") g.l("callStats.Service = \"" + service.Name + "\"") - g.ind(-1).l("}") g.l(`switch funcName {`) @@ -279,11 +276,11 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac // a case for each method g.l("case " + proxyName + method.Name + ":") g.ind(1) - callArgs := []string{} + var callArgs []string isSessionRequest := false if len(method.Args) > 0 { - args := []string{} - argsDecls := []string{} + var args []string + var argsDecls []string skipArgI := 0 @@ -292,23 +289,24 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac isSessionRequest = len(method.Args)-len(nonHTTPRelatedArgs) == 2 for _, arg := range nonHTTPRelatedArgs { - argName := "arg_" + arg.Name //strconv.Itoa(argI) - - //argsDecls = append(argsDecls, argName+" := "+arg.Value.emptyLiteral(aliases)) + argName := "arg_" + arg.Name argsDecls = append(argsDecls, argName+" "+arg.Value.goType(aliases, packageName)) args = append(args, "&"+argName) callArgs = append(callArgs, argName) skipArgI++ } + g.l("var (").ind(1) + g.l("args []interface{}") + g.l("rets []interface{}") + g.ind(-1).l(")") if len(args) > 0 { g.l("var (") for _, argDecl := range argsDecls { g.l(argDecl) } g.l(")") - g.l("args := []interface{}{" + strings.Join(args, ", ") + "}") - g.l("err := gotsrpc.LoadArgs(&args, callStats, r)") - g.l("if err != nil {") + g.l("args = []interface{}{" + strings.Join(args, ", ") + "}") + g.l("if err := gotsrpc.LoadArgs(&args, callStats, r); err != nil {") g.ind(1) g.l("gotsrpc.ErrorCouldNotLoadArgs(w)") g.l("return") @@ -337,22 +335,27 @@ func renderTSRPCServiceProxies(services ServiceList, fullPackageName string, pac } g.app("p.service." + method.Name + "(" + strings.Join(callArgs, ", ") + ")") g.nl() - g.l("if callStats != nil {") - g.ind(1).l("callStats.Execution = time.Now().Sub(executionStart)").ind(-1) - g.l("}") + g.l("callStats.Execution = time.Since(executionStart)") if isSessionRequest { g.l("if rw.Status() == http.StatusOK {").ind(1) } - g.l("gotsrpc.Reply([]interface{}{" + strings.Join(returnValueNames, ", ") + "}, callStats, r, w)") + g.l("rets = []interface{}{" + strings.Join(returnValueNames, ", ") + "}") + g.l("if err := gotsrpc.Reply(rets, callStats, r, w); err != nil {") + g.ind(1) + g.l("gotsrpc.ErrorCouldNotReply(w)") + g.l("return") + g.ind(-1) + g.l("}") if isSessionRequest { g.ind(-1).l("}") } + g.l("gotsrpc.Monitor(w, r, args, rets, callStats)") g.l("return") g.ind(-1) } g.l("default:") g.ind(1).l("gotsrpc.ClearStats(r)") - g.ind(1).l("http.Error(w, \"404 - not found \" + r.URL.Path, http.StatusNotFound)") + g.ind(1).l("gotsrpc.ErrorFuncNotFound(w)") g.ind(-2).l("}") // close switch g.ind(-1).l("}") // close ServeHttp } diff --git a/go.mod b/go.mod index 96406e9..3fca7ca 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,14 @@ module github.com/foomo/gotsrpc/v2 go 1.15 require ( + github.com/google/go-cmp v0.5.7 // indirect github.com/iancoleman/strcase v0.2.0 github.com/kr/text v0.2.0 // indirect github.com/mitchellh/mapstructure v1.4.3 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.12.1 - github.com/stretchr/testify v1.7.0 + github.com/stretchr/testify v1.7.1 github.com/ugorji/go/codec v1.2.7 golang.org/x/mod v0.5.1 golang.org/x/tools v0.1.9 diff --git a/go.sum b/go.sum index d04d6f6..9053376 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= +github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= @@ -196,8 +197,8 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= diff --git a/gotsrpc.go b/gotsrpc.go index e5a6722..82a720b 100644 --- a/gotsrpc.go +++ b/gotsrpc.go @@ -31,6 +31,10 @@ func ErrorFuncNotFound(w http.ResponseWriter) { http.Error(w, "method not found", http.StatusNotFound) } +func ErrorCouldNotReply(w http.ResponseWriter) { + http.Error(w, "could not reply", http.StatusInternalServerError) +} + func ErrorCouldNotLoadArgs(w http.ResponseWriter) { http.Error(w, "could not load args", http.StatusBadRequest) } @@ -44,10 +48,11 @@ func LoadArgs(args interface{}, callStats *CallStats, r *http.Request) error { handle := getHandlerForContentType(r.Header.Get("Content-Type")).handle if errDecode := codec.NewDecoder(r.Body, handle).Decode(args); errDecode != nil { + _, _ = fmt.Fprintln(os.Stderr, errDecode.Error()) return errors.Wrap(errDecode, "could not decode arguments") } if callStats != nil { - callStats.Unmarshalling = time.Now().Sub(start) + callStats.Unmarshalling = time.Since(start) callStats.RequestSize = int(r.ContentLength) } return nil @@ -65,12 +70,12 @@ func RequestWithStatsContext(r *http.Request) *http.Request { return r.WithContext(context.WithValue(r.Context(), contextStatsKey, stats)) } -func GetStatsForRequest(r *http.Request) *CallStats { - value := r.Context().Value(contextStatsKey) - if value == nil { - return nil +func GetStatsForRequest(r *http.Request) (*CallStats, bool) { + if value := r.Context().Value(contextStatsKey); value != nil { + return value.(*CallStats), true + } else { + return &CallStats{}, false } - return value.(*CallStats) } func ClearStats(r *http.Request) { @@ -78,7 +83,7 @@ func ClearStats(r *http.Request) { } // Reply despite the fact, that this is a public method - do not call it, it will be called by generated code -func Reply(response []interface{}, stats *CallStats, r *http.Request, w http.ResponseWriter) { +func Reply(response []interface{}, stats *CallStats, r *http.Request, w http.ResponseWriter) error { writer := newResponseWriterWithLength(w) serializationStart := time.Now() @@ -89,21 +94,20 @@ func Reply(response []interface{}, stats *CallStats, r *http.Request, w http.Res if clientHandle.beforeEncodeReply != nil { if err := clientHandle.beforeEncodeReply(&response); err != nil { _, _ = fmt.Fprintln(os.Stderr, err.Error()) - http.Error(w, "could not encode data to accepted format", http.StatusInternalServerError) - return + return errors.Wrap(err, "error during before encoder reply") } } if err := codec.NewEncoder(writer, clientHandle.handle).Encode(response); err != nil { _, _ = fmt.Fprintln(os.Stderr, err.Error()) - http.Error(w, "could not encode data to accepted format", http.StatusInternalServerError) - return + return errors.Wrap(err, "could not encode data to accepted format") } if stats != nil { stats.ResponseSize = writer.length stats.Marshalling = time.Since(serializationStart) } + return nil } func parserExcludeFiles(info os.FileInfo) bool { diff --git a/instrumentation.go b/instrumentation.go index ce4e48c..c0b67b7 100644 --- a/instrumentation.go +++ b/instrumentation.go @@ -6,8 +6,7 @@ func InstrumentedService(middleware http.HandlerFunc, handleStats GoRPCCallStats return func(w http.ResponseWriter, r *http.Request) { *r = *RequestWithStatsContext(r) middleware(w, r) - stats := GetStatsForRequest(r) - if stats != nil { + if stats, ok := GetStatsForRequest(r); ok { handleStats(stats) } } diff --git a/monitor.go b/monitor.go new file mode 100644 index 0000000..2636ff0 --- /dev/null +++ b/monitor.go @@ -0,0 +1,13 @@ +package gotsrpc + +import ( + "net/http" +) + +type MonitorFn func(w http.ResponseWriter, r *http.Request, args, rets []interface{}, stats *CallStats) + +var Monitor MonitorFn = NoopMonitor + +func NoopMonitor(w http.ResponseWriter, r *http.Request, args, rets []interface{}, stats *CallStats) { + // doing nothing +} diff --git a/stats.go b/stats.go index de4e2ef..0779b45 100644 --- a/stats.go +++ b/stats.go @@ -8,5 +8,5 @@ type CallStats struct { Marshalling time.Duration Unmarshalling time.Duration RequestSize int - ResponseSize int + ResponseSize int }