github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-02-03 00:38:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor (#920)

Browse Source
This commit is contained in:
Kevin Wan 2021-08-17 10:24:12 +08:00 committed by GitHub
parent 7c842f22d0
commit 9c1ee50497
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/trace/constants.go
View File

@ -2,5 +2,6 @@ package trace
const ( const (
TraceIdKey = "X-Trace-ID" TraceIdKey = "X-Trace-ID"
spanIdKey = "X-Span-ID" spanIdKey = "X-Span-ID"
) )

2
rest/handler/tracinghandler.go
View File

@ -21,7 +21,7 @@ func TracingHandler(next http.Handler) http.Handler {
defer span.Finish() defer span.Finish()
r = r.WithContext(ctx) r = r.WithContext(ctx)
// Conveniently track error messages // conveniently tracking error messages
w.Header().Set(trace.TraceIdKey, span.TraceId()) w.Header().Set(trace.TraceIdKey, span.TraceId())
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
}) })

4
rest/handler/tracinghandler_test.go
View File

@ -1,13 +1,13 @@
package handler package handler
import ( import (
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/core/trace"
"net/http" "net/http"
"net/http/httptest" "net/http/httptest"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/tal-tech/go-zero/core/stringx"
"github.com/tal-tech/go-zero/core/trace"
"github.com/tal-tech/go-zero/core/trace/tracespec" "github.com/tal-tech/go-zero/core/trace/tracespec"
) )

6
tools/goctl/rpc/generator/gencall.go
View File

@ -109,7 +109,8 @@ func (g *DefaultGenerator) GenCall(ctx DirContext, proto parser.Proto, cfg *conf
} }
func getMessageName(msg proto.Message) string { func getMessageName(msg proto.Message) string {
var list = []string{msg.Name} list := []string{msg.Name}
for { for {
parent := msg.Parent parent := msg.Parent
if parent == nil { if parent == nil {
@ -125,11 +126,13 @@ func getMessageName(msg proto.Message) string {
list = append(tmp, list...) list = append(tmp, list...)
msg = *parentMsg msg = *parentMsg
} }
return strings.Join(list, "_") return strings.Join(list, "_")
} }
func (g *DefaultGenerator) genFunction(goPackage string, service parser.Service) ([]string, error) { func (g *DefaultGenerator) genFunction(goPackage string, service parser.Service) ([]string, error) {
functions := make([]string, 0) functions := make([]string, 0)
for _, rpc := range service.RPC { for _, rpc := range service.RPC {
text, err := util.LoadTemplate(category, callFunctionTemplateFile, callFunctionTemplate) text, err := util.LoadTemplate(category, callFunctionTemplateFile, callFunctionTemplate)
if err != nil { if err != nil {
@ -157,6 +160,7 @@ func (g *DefaultGenerator) genFunction(goPackage string, service parser.Service)
functions = append(functions, buffer.String()) functions = append(functions, buffer.String())
} }
return functions, nil return functions, nil
} }