change log format to export the entire pkg name (kubewharf#95)

luomingmeng · Oct 11, 2024 · 3cd02f0 · 3cd02f0
1 parent 9a1dc54
commit 3cd02f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/pkg/util/general/log.go b/pkg/util/general/log.go
@@ -25,6 +25,7 @@ import (
 )
 
 const callDepth = 3
+const pkgPrefix = "github.com/kubewharf/"
 
 // loggingWithDepth returns the logging-prefix for caller.
 // it will help to avoid hardcode function names in logging
@@ -35,12 +36,8 @@ func loggingWithDepth() string {
 		return ""
 	}
 
-	funcPaths := strings.Split(runtime.FuncForPC(pc).Name(), "/")
-	if len(funcPaths) == 0 {
-		return ""
-	}
-
-	funcNames := strings.Split(funcPaths[len(funcPaths)-1], ".")
+	funcPaths := strings.TrimPrefix(runtime.FuncForPC(pc).Name(), pkgPrefix)
+	funcNames := strings.Split(funcPaths, ".")
 	switch len(funcNames) {
 	case 0, 1:
 	case 2:

diff --git a/pkg/util/general/log_test.go b/pkg/util/general/log_test.go
@@ -35,7 +35,7 @@ func TestLoggingPrefix(t *testing.T) {
 	require.Equal(t, "[testing/tRunner] extra 1 test", withoutStruct)
 
 	withStruct := test{}.log("extra %v %v", 1, "test")
-	require.Equal(t, "[general/TestLoggingPrefix] extra 1 test", withStruct)
+	require.Equal(t, "[katalyst-core/pkg/util/general/TestLoggingPrefix] extra 1 test", withStruct)
 
 	InfoS("test-InfoS", "param-key", "param-InfoS")
 	Infof("test-Infof %v", "extra-Infof")