From ddda4f6998547390bd3a75a01304c7868f98f4f6 Mon Sep 17 00:00:00 2001
From: "Gerasimos (Makis) Maropoulos" <kataras2006@hotmail.com>
Date: Mon, 22 Jan 2024 15:35:09 +0200
Subject: [PATCH] minor improvement of the context.HandlerName

---
 context/handler.go | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/context/handler.go b/context/handler.go
index 77566699..9ffeede9 100644
--- a/context/handler.go
+++ b/context/handler.go
@@ -64,8 +64,9 @@ func SetHandlerName(original string, replacement string) {
 	// e.g. `iris/cache/client.(*Handler).ServeHTTP-fm`
 	regex, _ := regexp.Compile(original)
 	handlerNames[&NameExpr{
-		literal: original,
-		regex:   regex,
+		literal:           original,
+		normalizedLiteral: normalizeExpression(original),
+		regex:             regex,
 	}] = replacement
 
 	handlerNamesMu.Unlock()
@@ -73,8 +74,9 @@ func SetHandlerName(original string, replacement string) {
 
 // NameExpr regex or literal comparison through `MatchString`.
 type NameExpr struct {
-	regex   *regexp.Regexp
-	literal string
+	regex             *regexp.Regexp
+	literal           string
+	normalizedLiteral string
 }
 
 // MatchString reports whether "s" is literal of "literal"
@@ -91,6 +93,23 @@ func (expr *NameExpr) MatchString(s string) bool {
 	return false
 }
 
+// MatchFilename reports whether "filename" contains the "literal".
+func (expr *NameExpr) MatchFilename(filename string) bool {
+	if filename == "" {
+		return false
+	}
+
+	return strings.Contains(filename, expr.normalizedLiteral)
+}
+
+// The regular expression to match the versioning and the domain part
+var trimFileModuleNameRegex = regexp.MustCompile(`^[\w.]+/(kataras|iris-contrib)/|/v\d+|\.\*`)
+
+func normalizeExpression(str string) string {
+	// Replace all occurrences of the regular expression with the replacement string.
+	return strings.ToLower(trimFileModuleNameRegex.ReplaceAllString(str, ""))
+}
+
 // A Handler responds to an HTTP request.
 // It writes reply headers and data to the Context.ResponseWriter() and then return.
 // Returning signals that the request is finished;
@@ -125,11 +144,14 @@ func valueOf(v interface{}) reflect.Value {
 // See `SetHandlerName` too.
 func HandlerName(h interface{}) string {
 	pc := valueOf(h).Pointer()
-	name := runtime.FuncForPC(pc).Name()
+	fn := runtime.FuncForPC(pc)
+	name := fn.Name()
+	filename, _ := fn.FileLine(fn.Entry())
+	filenameLower := strings.ToLower(filename)
 
 	handlerNamesMu.RLock()
 	for expr, newName := range handlerNames {
-		if expr.MatchString(name) {
+		if expr.MatchString(name) || expr.MatchFilename(filenameLower) {
 			name = newName
 			break
 		}