internal/report: make openSourceFile cognizant of Go modules #612
Conversation
Codecov Report
@@ Coverage Diff @@
## master #612 +/- ##
==========================================
+ Coverage 66.94% 66.97% +0.02%
==========================================
Files 78 78
Lines 14378 14388 +10
==========================================
+ Hits 9626 9636 +10
Misses 3892 3892
Partials 860 860
Continue to review full report at Codecov.
|
odeke-em
force-pushed
the
make-openSourceFile-cognizant-of-gomodules
branch
2 times, most recently
from
d11e9de
to
d6a7932
Compare
This change adds $GOPATH/pkg/mod as a possible base to search from given that Go modules have been the norm since Go1.11 and we are currently at Go1.16/1.17, hence support for Go modules. Fixes google#611
odeke-em
force-pushed
the
make-openSourceFile-cognizant-of-gomodules
branch
from
d6a7932
to
075f40d
Compare
|
@odeke-em Is it possible to add a test that fails before the the change and passes after? |
| @@ -917,8 +918,19 @@ func openSourceFile(path, searchPath, trim string) (*os.File, error) { | |||
| f, err := os.Open(path) | |||
| return f, err | |||
| } | |||
| possibleBases := filepath.SplitList(searchPath) | |||
| if gopath := os.Getenv("GOPATH"); gopath != "" { | |||
There was a problem hiding this comment.
An alternative would be to somehow make sure that the SourcePath field in options is set correctly earlier?
And if it is the case that all/most Go users are using "go tool pprof" then perhaps we can just arrange for the Go invocation code to pass the right source path settings? Or are you worried about "pprof" invocations that are not via "go tool pprof"?
| possibleBases = append(possibleBases, | ||
| filepath.Join(gopath, "pkg", "mod"), | ||
| filepath.Join(runtime.GOROOT(), "src")) | ||
| } |
There was a problem hiding this comment.
Perhaps nitpicking slightly, but this is not entirely correct; the only way to reliably find these out would be to run go env -json GOMODCACHE GOROOT.
Using just os.Getenv("GOPATH") will not see if the user set up their own GOMODCACHE, nor will it work with env vars set with go env -w.
This change adds $GOPATH/pkg/mod as a possible base to search
from given that Go modules have been the norm since Go1.11 and
we are currently at Go1.16/1.17, hence support for Go modules.
Fixes #611