Merge pull request #219 from bilibili/fix-zipkin-servicename

Fix zipkin servicename

pkg/net/trace/span.go

@@ -27,7 +27,11 @@ type Span struct {
 	childs        int
 }
 
-func (s *Span) Name() string {
+func (s *Span) ServiceName() string {
+	return s.dapper.serviceName
+}
+
+func (s *Span) OperationName() string {
 	return s.operationName
 }
 

pkg/net/trace/zipkin/zipkin.go

@@ -37,11 +37,12 @@ func (r *report) WriteSpan(raw *trace.Span) (err error) {
 			ID:       spanID,
 			ParentID: &parentID,
 		},
-		Name:      raw.Name(),
+		Name:      raw.OperationName(),
 		Timestamp: raw.StartTime(),
 		Duration:  raw.Duration(),
 		Tags:      make(map[string]string, len(tags)+len(logs)),
 	}
+	span.LocalEndpoint = &model.Endpoint{ServiceName: raw.ServiceName()}
 	for _, tag := range tags {
 		switch tag.Key {
 		case trace.TagSpanKind:
@@ -55,8 +56,6 @@ func (r *report) WriteSpan(raw *trace.Span) (err error) {
 			case "consumer":
 				span.Kind = model.Consumer
 			}
-		case trace.TagPeerService:
-			span.LocalEndpoint = &model.Endpoint{ServiceName: tag.Value.(string)}
 		default:
 			v, ok := tag.Value.(string)
 			if ok {

tool/kratos/template.go

@@ -547,7 +547,7 @@ type Kratos struct {
 go 1.12
 
 require (
-	github.com/bilibili/kratos v0.1.0
+	github.com/bilibili/kratos v0.2.0
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/protobuf v1.3.1
 	golang.org/x/net v0.0.0-20190420063019-afa5a82059c6