fix zipkin servicename

pull/219/head
Tony 5 years ago
parent 77b3a80d94
commit 908e196df4
  1. 6
      pkg/net/trace/span.go
  2. 5
      pkg/net/trace/zipkin/zipkin.go

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

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

Loading…
Cancel
Save