Correct work with stack tracer

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
networkservicemesh · Aug 4, 2021 · 0fde629 · 0fde629
1 parent fe8d8e6
commit 0fde629
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 63 deletions.
diff --git a/pkg/networkservice/core/trace/client.go b/pkg/networkservice/core/trace/client.go
@@ -60,10 +60,8 @@ func (t *beginTraceClient) Request(ctx context.Context, request *networkservice.
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 
@@ -83,10 +81,8 @@ func (t *beginTraceClient) Close(ctx context.Context, conn *networkservice.Conne
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 

diff --git a/pkg/networkservice/core/trace/server.go b/pkg/networkservice/core/trace/server.go
@@ -58,10 +58,8 @@ func (t *beginTraceServer) Request(ctx context.Context, request *networkservice.
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 
@@ -81,10 +79,8 @@ func (t *beginTraceServer) Close(ctx context.Context, conn *networkservice.Conne
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	logResponse(ctx, conn)

diff --git a/pkg/registry/core/trace/ns_registry.go b/pkg/registry/core/trace/ns_registry.go
@@ -51,10 +51,8 @@ func (t *traceNetworkServiceRegistryFindClient) Recv() (*registry.NetworkService
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -73,10 +71,8 @@ func (t *traceNetworkServiceRegistryClient) Register(ctx context.Context, in *re
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -95,10 +91,8 @@ func (t *traceNetworkServiceRegistryClient) Find(ctx context.Context, in *regist
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -119,10 +113,8 @@ func (t *traceNetworkServiceRegistryClient) Unregister(ctx context.Context, in *
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -150,10 +142,8 @@ func (t *traceNetworkServiceRegistryServer) Register(ctx context.Context, in *re
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -176,10 +166,8 @@ func (t *traceNetworkServiceRegistryServer) Find(in *registry.NetworkServiceQuer
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return err
 	}
 	return nil
@@ -198,10 +186,8 @@ func (t *traceNetworkServiceRegistryServer) Unregister(ctx context.Context, in *
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -229,10 +215,8 @@ func (t *traceNetworkServiceRegistryFindServer) Send(ns *registry.NetworkService
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return err
 	}
 	return err

diff --git a/pkg/registry/core/trace/nse_registry.go b/pkg/registry/core/trace/nse_registry.go
@@ -50,10 +50,8 @@ func (t *traceNetworkServiceEndpointRegistryFindClient) Recv() (*registry.Networ
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -72,10 +70,8 @@ func (t *traceNetworkServiceEndpointRegistryClient) Register(ctx context.Context
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -94,10 +90,8 @@ func (t *traceNetworkServiceEndpointRegistryClient) Find(ctx context.Context, in
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -118,10 +112,8 @@ func (t *traceNetworkServiceEndpointRegistryClient) Unregister(ctx context.Conte
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -149,10 +141,8 @@ func (t *traceNetworkServiceEndpointRegistryServer) Register(ctx context.Context
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -175,10 +165,8 @@ func (t *traceNetworkServiceEndpointRegistryServer) Find(in *registry.NetworkSer
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return err
 	}
 	return nil
@@ -197,10 +185,8 @@ func (t *traceNetworkServiceEndpointRegistryServer) Unregister(ctx context.Conte
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return nil, err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return nil, err
 	}
 	log.FromContext(ctx).Object("response", rv)
@@ -228,10 +214,8 @@ func (t *traceNetworkServiceEndpointRegistryFindServer) Send(nse *registry.Netwo
 	if err != nil {
 		if _, ok := err.(stackTracer); !ok {
 			err = errors.Wrapf(err, "Error returned from %s", operation)
-			log.FromContext(ctx).Errorf("%+v", err)
-			return err
 		}
-		log.FromContext(ctx).Errorf("%v", err)
+		log.FromContext(ctx).Errorf("%+v", err)
 		return err
 	}
 	return err

diff --git a/pkg/tools/log/spanlogger/spanlogger.go b/pkg/tools/log/spanlogger/spanlogger.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"runtime/debug"
 	"strings"
 	"sync"
 
@@ -61,11 +60,11 @@ func (s *spanLogger) Warnf(format string, v ...interface{}) {
 }
 
 func (s *spanLogger) Error(v ...interface{}) {
-	s.WithField("stacktrace", limitString(string(debug.Stack()))).(*spanLogger).log("error", v...)
+	s.log("error", v...)
 }
 
 func (s *spanLogger) Errorf(format string, v ...interface{}) {
-	s.WithField("stacktrace", limitString(string(debug.Stack()))).(*spanLogger).logf("error", format, v...)
+	s.logf("error", format, v...)
 }
 
 func (s *spanLogger) Fatal(v ...interface{}) {