fix(ebpf): python backport fixes #3268
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tead of libc.so.6
Closed
korniltsev
commented
May 6, 2024
| @@ -58,7 +59,7 @@ func GetProcInfo(s *bufio.Scanner) (ProcInfo, error) { | |||
| strings.Contains(m.Pathname, "/lib/ld-musl-aarch64.so.1") { | |||
| res.Musl = append(res.Musl, m) | |||
| } | |||
| if strings.HasSuffix(m.Pathname, "/libc.so.6") || strings.HasSuffix(m.Pathname, "/libc-2") { | |||
| if strings.HasSuffix(m.Pathname, "/libc.so.6") || strings.HasPrefix(filepath.Base(m.Pathname), "libc-2.") { | |||
There was a problem hiding this comment.
this is the main change for "libc not found" error fix
korniltsev
commented
May 6, 2024
| @@ -93,7 +93,7 @@ func (f *MMapedElfFile) GNUBuildID() (BuildID, error) { | |||
| return BuildID{}, fmt.Errorf(".note.gnu.build-id is not a GNU build-id : %s", hex.EncodeToString(data)) | |||
| } | |||
| rawBuildID := data[16:] | |||
| if len(rawBuildID) != 20 && len(rawBuildID) != 8 { // 8 is xxhash, for example in Container-Optimized OS | |||
| if len(rawBuildID) < 8 { | |||
There was a problem hiding this comment.
this is the change for fixing ".note.gnu.build-id has wrong size" when gnu build id is 8 bytes long
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is applying some fixes from https://github.com/grafana/pyroscope/pull/3184/files#diff-a5a0a7f930ad6111157723f6f1c134d7644f6a9f403390b950c8d9a18ad13cfe