Skip to content

vcs/source: strip Go major version segment from symbol file paths #5075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
simonswine wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

vcs/source: strip Go major version segment from symbol file paths #5075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28cfc0e
vcs/source: strip Go major version segment from symbol file paths
simonswine Apr 17, 2026
0714f30
vcs/source: only strip major version segments v2 and above
simonswine Apr 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions pkg/frontend/vcs/source/find_go.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"fmt"
"path"
"path/filepath"
"strconv"
"strings"
"time"

Expand Down Expand Up @@ -201,6 +202,18 @@ func (ff FileFinder) tryFindGoFile(ctx context.Context, maxAttempts int) (*vcsv1
path = path[len(repoPath)+pos:]
}

// strip Go module major version segment (e.g. "v2/"), if present.
// GitHub repo paths don't include the major version directory, but Go
// symbol paths do (e.g. "github.com/grafana/pyroscope/v2/pkg/foo.go").
path = strings.TrimLeft(path, "/")
if i := strings.IndexByte(path, '/'); i > 0 {
if seg := path[:i]; len(seg) > 1 && seg[0] == 'v' && isDigits(seg[1:]) {
if majorVer, _ := strconv.Atoi(seg[1:]); majorVer >= 2 {
path = path[i+1:]
}
}
Comment thread
cursor[bot] marked this conversation as resolved.
Comment on lines +210 to +214
Copy link
Copy Markdown
Contributor

@marcsanmi marcsanmi Apr 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Are isDigits and Atoi redundant? e.g

if seg := path[:i]; len(seg) > 1 && seg[0] == 'v' {
    if majorVer, err := strconv.Atoi(seg[1:]); err == nil && majorVer >= 2 {
        path = path[i+1:]
    }
}

}

// now try to find file in repo
path = strings.TrimLeft(path, "/")
attempts := 0
Expand Down Expand Up @@ -231,3 +244,12 @@ func (ff FileFinder) tryFindGoFile(ctx context.Context, maxAttempts int) (*vcsv1
return newFileResponse(content.Content, content.URL)
}
}

func isDigits(s string) bool {
for _, c := range s {
if c < '0' || c > '9' {
return false
}
}
return len(s) > 0
}
30 changes: 30 additions & 0 deletions pkg/frontend/vcs/source/find_go_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,36 @@ func Test_tryFindGoFile(t *testing.T) {
expectedSearchedPaths: []string{"main.go"},
expectedError: nil,
},
{
name: "path with relative repository prefix and major version",
searchedPath: "github.com/grafana/pyroscope/v2/main.go",
rootPath: "",
repo: pyroscopeRepo,
clientMock: newMockVCSClient().addFiles(newFile("main.go")),
attempts: 1,
expectedSearchedPaths: []string{"main.go"},
expectedError: nil,
},
{
name: "path with absolute repository prefix and major version",
searchedPath: "/Users/pyroscope/git/github.com/grafana/pyroscope/v2/main.go",
rootPath: "",
repo: pyroscopeRepo,
clientMock: newMockVCSClient().addFiles(newFile("main.go")),
attempts: 1,
expectedSearchedPaths: []string{"main.go"},
expectedError: nil,
},
{
name: "path with v1 directory not stripped (legitimate v1/ dir)",
searchedPath: "github.com/grafana/pyroscope/v1/main.go",
rootPath: "",
repo: pyroscopeRepo,
clientMock: newMockVCSClient().addFiles(newFile("v1/main.go")),
attempts: 2,
expectedSearchedPaths: []string{"v1/main.go"},
expectedError: nil,
},
{
name: "not found, attempts exceeded",
searchedPath: "/var/service1/src/main.go",
Expand Down
Loading