Merge branch 'main' into llvm-symbolizer-startline

google · Sep 29, 2024 · 27c179c · 27c179c
2 parents 6ad3ca5 + f3f46ee
commit 27c179c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/internal/symbolz/symbolz.go b/internal/symbolz/symbolz.go
@@ -93,7 +93,7 @@ func symbolz(source string) string {
 		if strings.Contains(url.Path, "/debug/pprof/") || hasGperftoolsSuffix(url.Path) {
 			url.Path = path.Clean(url.Path + "/../symbol")
 		} else {
-			url.Path = "/symbolz"
+			url.Path = path.Clean(url.Path + "/../symbolz")
 		}
 		url.RawQuery = ""
 		return url.String()

diff --git a/internal/symbolz/symbolz_test.go b/internal/symbolz/symbolz_test.go
@@ -31,6 +31,7 @@ func TestSymbolzURL(t *testing.T) {
 		"http://host:8000/profilez?seconds=5":                                     "http://host:8000/symbolz",
 		"http://host:8000/profilez?seconds=5&format=proto":                        "http://host:8000/symbolz",
 		"http://host:8000/heapz?format=legacy":                                    "http://host:8000/symbolz",
+		"http://host:8000/some/deeper/path/profilez?seconds=5":                    "http://host:8000/some/deeper/path/symbolz",
 		"http://host:8000/debug/pprof/profile":                                    "http://host:8000/debug/pprof/symbol",
 		"http://host:8000/debug/pprof/profile?seconds=10":                         "http://host:8000/debug/pprof/symbol",
 		"http://host:8000/debug/pprof/heap":                                       "http://host:8000/debug/pprof/symbol",