add span name

Author: codeandcode0x

example/http/httpClient.go

@@ -20,7 +20,7 @@ func httpClient() {
 	httpClient := &http.Client{}
 	r, _ := http.NewRequest("GET", httpTogRPCSrcUrl, nil)
 	// set tracing
-	_, cancel := tracing.AddHttpTracing("HttpClent", r.Header, map[string]string{"version": "v1"})
+	_, cancel := tracing.AddHttpTracing("HttpClent", "rpc/tracing GET", r.Header, map[string]string{"version": "v1"})
 	defer cancel()
 	// send reqeust
 	response, _ := httpClient.Do(r)

example/http/httpServer.go

@@ -20,7 +20,7 @@ func main() {
 // http to gRPC
 func httpServer() {
 	http.HandleFunc("/rpc/tracing", func(w http.ResponseWriter, r *http.Request) {
-		pctx, cancel := tracing.AddHttpTracing("HttpServer", r.Header, map[string]string{"version": "v1"})
+		pctx, cancel := tracing.AddHttpTracing("HttpServer", "/rpc/tracing GET", r.Header, map[string]string{"version": "v1"})
 		defer cancel()
 		// rpc tracing
 		result := RpcClient(pctx)

reporter_jobs.go

@@ -28,12 +28,12 @@ import (
 )
 
 //generate trace jobs (goroutine), use context and chan to control jobs and release goroutine .
-func GenerateTracingJobs(pch chan<- context.Context, parent context.Context, svc string, header http.Header, tags map[string]string, traceType string) {
+func GenerateTracingJobs(pch chan<- context.Context, parent context.Context, svc, spanName string, header http.Header, tags map[string]string, traceType string) {
 	// setting context
 	ctx, cancel := context.WithCancel(parent)
 	// setting chan
 	ch := make(chan context.Context, 0)
-	go doTask(ch, ctx, svc, header, tags, traceType)
+	go doTask(ch, ctx, svc, spanName, header, tags, traceType)
 	// receive signal
 	pctx := <-ch
 	pch <- pctx
@@ -51,7 +51,7 @@ func GenerateTracingJobs(pch chan<- context.Context, parent context.Context, svc
 
 // do trace reporter
 func doTask(ch chan context.Context, parent context.Context,
-	svc string, header http.Header, tags map[string]string, traceType string) {
+	svc, spanName string, header http.Header, tags map[string]string, traceType string) {
 	//定义 tracer, closer
 	var tracer opentracing.Tracer
 	var closer io.Closer
@@ -60,7 +60,7 @@ func doTask(ch chan context.Context, parent context.Context,
 	switch traceType {
 	case "jaeger":
 		tracer, closer = tracing.InitJaeger(svc)
-		ctx = tracing.AddTracer(svc, parent, header, tracer, tags)
+		ctx = tracing.AddTracer(svc, spanName, parent, header, tracer, tags)
 		break
 	case "zipkin":
 		log.Println("create zipkin tracing job")

tracer/jaeger.go

@@ -75,7 +75,7 @@ func WriteSubSpan(span opentracing.Span, subSpanName string) {
 }
 
 // TracerWrapper tracer wrapper
-func AddTracer(svcName string,
+func AddTracer(svcName, spanName string,
 	ctx context.Context,
 	header http.Header,
 	tracer opentracing.Tracer,
@@ -87,10 +87,10 @@ func AddTracer(svcName string,
 	spanCtx, _ := opentracing.GlobalTracer().Extract(opentracing.HTTPHeaders,
 		opentracing.HTTPHeadersCarrier(header))
 	if spanCtx != nil {
-		sp = opentracing.GlobalTracer().StartSpan(svcName, opentracing.ChildOf(spanCtx))
+		sp = opentracing.GlobalTracer().StartSpan(spanName, opentracing.ChildOf(spanCtx))
 	} else {
 		//如果 header 中没有携带 context, 则新建 span
-		sp = tracer.StartSpan(svcName)
+		sp = tracer.StartSpan(spanName)
 	}
 	//写入 tag 或者 日志
 	for k, v := range tags {

wrapper.go

@@ -18,7 +18,7 @@ const (
 )
 
 //Add http tracing , tags is k-v map which can set in span log, param map can set trace type .
-func AddHttpTracing(svcName string, header http.Header, tags map[string]string, param ...map[string]string) (context.Context, context.CancelFunc) {
+func AddHttpTracing(svcName, spanName string, header http.Header, tags map[string]string, param ...map[string]string) (context.Context, context.CancelFunc) {
 	// 定义 trace type
 	var traceType string
 	//启动 trace 任务
@@ -33,7 +33,7 @@ func AddHttpTracing(svcName string, header http.Header, tags map[string]string,
 		}
 	}
 	//创建任务
-	go GenerateTracingJobs(ch, ctx, svcName, header, tags, traceType)
+	go GenerateTracingJobs(ch, ctx, svcName, spanName, header, tags, traceType)
 	//返回通道
 	return <-ch, cancel
 }