更新追踪埋点

services/httpaccess/actions.go

@@ -64,11 +64,11 @@ func RegisterDevice(args DeviceRegisterArgs, r render.Render) {
 	rpcargs.SpanCarrier = make(map[string]string)
 	device := &models.Device{}
 	ext.SpanKindRPCClient.Set(span)
-	span.Tracer().Inject(
-		span.Context(),
-		opentracing.TextMap,
-		opentracing.TextMapCarrier(rpcargs.SpanCarrier),
-	)
+	// span.Tracer().Inject(
+	// 	span.Context(),
+	// 	opentracing.TextMap,
+	// 	opentracing.TextMapCarrier(rpcargs.SpanCarrier),
+	// )
 	err := server.RPCCallByName(ctx, "registry", "Registry.RegisterDevice", rpcargs, device)
 	if err != nil {
 		r.JSON(http.StatusOK, renderError(ErrSystemFault, err))
@@ -101,11 +101,11 @@ func AuthDevice(args DeviceAuthArgs, r render.Render) {
 	defer span.Finish()
 
 	ext.SpanKindRPCClient.Set(span)
-	span.Tracer().Inject(
-		span.Context(),
-		opentracing.TextMap,
-		opentracing.TextMapCarrier(arg.SpanCarrier),
-	)
+	// span.Tracer().Inject(
+	// 	span.Context(),
+	// 	opentracing.TextMap,
+	// 	opentracing.TextMapCarrier(arg.SpanCarrier),
+	// )
 	err := server.RPCCallByName(ctx, "registry", "Registry.FindDeviceById", arg, device)
 	if err != nil {
 		r.JSON(http.StatusOK, renderError(ErrDeviceNotFound, err))

services/registry/registry.go

@@ -7,9 +7,6 @@ import (
 	"sparrow/pkg/generator"
 	"sparrow/pkg/models"
 	"sparrow/pkg/rpcs"
-
-	opentracing "github.com/opentracing/opentracing-go"
-	"github.com/opentracing/opentracing-go/ext"
 )
 
 const (
@@ -267,10 +264,7 @@ func (r *Registry) FindApplication(id int32, reply *models.Application) error {
 // if the device has already been registered,
 // the registration will success return the registered device before.
 func (r *Registry) RegisterDevice(args *rpcs.ArgsDeviceRegister, reply *models.Device) error {
-	spanCtx, _ := opentracing.GlobalTracer().Extract(opentracing.TextMap, opentracing.TextMapCarrier(args.SpanCarrier))
-	span := opentracing.StartSpan("RegisterDevice", ext.RPCServerOption(spanCtx))
-	defer span.Finish()
-	span.SetTag("args", args)
+
 	db, err := getDB()
 	if err != nil {
 		return err
@@ -327,9 +321,6 @@ func (r *Registry) RegisterDevice(args *rpcs.ArgsDeviceRegister, reply *models.D
 			return err
 		}
 	}
-	span.LogKV("device_identifier", reply.DeviceIdentifier)
-	span.LogKV("device_key", reply.DeviceKey)
-	span.LogKV("device_secret", reply.DeviceSecret)
 	return nil
 }
 
@@ -362,10 +353,7 @@ func (r *Registry) FindDeviceByIdentifier(identifier string, reply *models.Devic
 
 // FindDeviceById will find the device with given id
 func (r *Registry) FindDeviceById(args *rpcs.ArgsDeviceAuth, reply *models.Device) error {
-	spanCtx, _ := opentracing.GlobalTracer().Extract(opentracing.TextMap, opentracing.TextMapCarrier(args.SpanCarrier))
-	span := opentracing.StartSpan("FindDeviceById", ext.RPCServerOption(spanCtx))
-	defer span.Finish()
-	span.SetTag("args", args)
+
 	db, err := getDB()
 	if err != nil {
 		return err
@@ -377,7 +365,6 @@ func (r *Registry) FindDeviceById(args *rpcs.ArgsDeviceAuth, reply *models.Devic
 	if err != nil {
 		return err
 	}
-	span.LogKV("device", reply)
 	return nil
 }