Do not include pkg prefix on default name

luthersystems · Feb 8, 2024 · 667114c · 667114c
1 parent cd88b94
commit 667114c
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/lisp/x/profiler/funlabeler.go b/lisp/x/profiler/funlabeler.go
@@ -22,26 +22,6 @@ func WithFunLabeler(funLabeler FunLabeler) Option {
 	}
 }
 
-// defaultFunName constructs a pretty canonical name using the function name.
-// The first return is the package name, and the second is the canonical name.
-func defaultFunName(runtime *lisp.Runtime, fun *lisp.LVal) (string, string) {
-	if fun.Type != lisp.LFun {
-		return "", ""
-	}
-	funData := fun.FunData()
-	if funData == nil {
-		return "", ""
-	}
-	name := ""
-	if env := fun.Env(); env != nil {
-		name = env.GetFunName(fun)
-	}
-	if name == "" {
-		name = getFunNameFromFID(runtime, funData.FID)
-	}
-	return funData.Package, name
-}
-
 // ELPSDocLabel is a magic string used to extract function labels.
 const ELPSDocLabel = `@trace\s*{([^}]+)}`
 

diff --git a/lisp/x/profiler/profiler.go b/lisp/x/profiler/profiler.go
@@ -41,8 +41,29 @@ func (p *profiler) Start(fun *lisp.LVal) func() {
 	return func() {}
 }
 
+// defaultFunName constructs a pretty canonical name using the function name.
+// The first return is the package name, and the second is the canonical name.
+func defaultFunName(runtime *lisp.Runtime, fun *lisp.LVal) (string, string) {
+	if fun.Type != lisp.LFun {
+		return "", ""
+	}
+	funData := fun.FunData()
+	if funData == nil {
+		return "", ""
+	}
+	name := ""
+	if env := fun.Env(); env != nil {
+		name = env.GetFunName(fun)
+	}
+	if name == "" {
+		name = getFunNameFromFID(runtime, funData.FID)
+	}
+	return funData.Package, name
+}
+
 // prettyFunName returns a pretty name and original name for a fun. If there is
-// no pretty name, then the pretty name is the original name.
+// no pretty name, then the pretty name is the original name. The pretty name
+// includes the package prefix, while the original name does not.
 func (p *profiler) prettyFunName(fun *lisp.LVal) (string, string) {
 	origPkg, origLabel := defaultFunName(p.runtime, fun)
 	if origLabel == "" {
@@ -57,7 +78,6 @@ func (p *profiler) prettyFunName(fun *lisp.LVal) (string, string) {
 	}
 	if origPkg != "" {
 		prettyLabel = fmt.Sprintf("%s:%s", origPkg, prettyLabel)
-		origLabel = fmt.Sprintf("%s:%s", origPkg, origLabel)
 	}
 
 	return prettyLabel, origLabel