Skip to content

go: use path.Join() over fmt.Sprintf() #432

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

Merged
florianl merged 3 commits into from
Apr 7, 2025
Merged

go: use path.Join() over fmt.Sprintf() #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
84e3a51
go: use path.Join() over fmt.Sprintf()
florianl Apr 7, 2025
d84ac91
Update interpreter/apmint/socket.go
florianl Apr 7, 2025
a1227e7
fixup: drop /s
florianl Apr 7, 2025
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
3 changes: 2 additions & 1 deletion interpreter/apmint/socket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"fmt"
"io/fs"
"os"
"path"
"path/filepath"
"strconv"
"strings"
Expand Down Expand Up @@ -46,7 +47,7 @@ func openAPMAgentSocket(pid libpf.PID, socketPath string) (*apmAgentSocket, erro
}

// Prepend root system to ensure that this also works with containerized apps.
socketPath = fmt.Sprintf("/proc/%d/root/%s", pid, socketPath)
socketPath = path.Join("/proc", strconv.Itoa(int(pid)), "root", socketPath)

// Read effective UID/GID of the APM agent process.
euid, egid, err := readProcessOwner(pid)
Expand Down
5 changes: 3 additions & 2 deletions process/process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"fmt"
"io"
"os"
"path"
"strconv"
"strings"
"sync"
Expand Down Expand Up @@ -330,9 +331,9 @@ func (sp *systemProcess) OpenELF(file string) (*pfelf.File, error) {
}

// Fall back to opening the file using the process specific root
return pfelf.Open(fmt.Sprintf("/proc/%v/root/%s", sp.pid, file))
return pfelf.Open(path.Join("/proc", strconv.Itoa(int(sp.pid)), "root", file))
}

func (sp *systemProcess) ExtractAsFile(file string) (string, error) {
return fmt.Sprintf("/proc/%v/root/%s", sp.pid, file), nil
return path.Join("/proc", strconv.Itoa(int(sp.pid)), "root", file), nil
}