Skip to content

logs: find the log file when the open() fd is already gone (freopen), bump logparser to v1.4.2 #379

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
def merged 1 commit into from
Sep 30, 2026
Merged

logs: find the log file when the open() fd is already gone (freopen), bump logparser to v1.4.2 #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 28 additions & 4 deletions containers/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,8 @@ func (c *Container) onFileOpen(pid uint32, fd uint64, mnt uint64, log bool) {
return
}
}
mntId, logPath := resolveFd(pid, fd)
info := proc.GetFdInfo(pid, fd)
mntId, logPath := resolveFd(info)
func() {
if mntId == "" {
return
Expand All @@ -567,7 +568,14 @@ func (c *Container) onFileOpen(pid uint32, fd uint64, mnt uint64, log bool) {
c.lock.Unlock()
}
}()
if logPath != "" {
var logPaths []string
switch {
case logPath != "":
logPaths = []string{logPath}
case log && (info == nil || !strings.HasPrefix(info.Dest, "/var/log/")):
logPaths = findLogFiles(pid)
}
for _, logPath := range logPaths {
c.lock.Lock()
c.runLogParser(logPath)
c.lock.Unlock()
Expand Down Expand Up @@ -1493,8 +1501,7 @@ func (c *Container) attachTlsUprobes(tracer *ebpftracer.Tracer, pid uint32, canB
return true
}

func resolveFd(pid uint32, fd uint64) (mntId string, logPath string) {
info := proc.GetFdInfo(pid, fd)
func resolveFd(info *proc.FdInfo) (mntId string, logPath string) {
if info == nil {
return
}
Expand All @@ -1518,3 +1525,20 @@ func resolveFd(pid uint32, fd uint64) (mntId string, logPath string) {
}
return
}

func findLogFiles(pid uint32) []string {
fds, err := proc.ReadFds(pid)
if err != nil {
return nil
}
var res []string
for _, fd := range fds {
if !strings.HasPrefix(fd.Dest, "/var/log/") {
continue
}
if _, logPath := resolveFd(proc.GetFdInfo(pid, fd.Fd)); logPath != "" {
res = append(res, logPath)
}
}
return res
}
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require (
github.com/containerd/cgroups v1.1.0
github.com/containerd/containerd v1.7.29
github.com/coreos/go-systemd/v22 v22.7.0
github.com/coroot/logparser v1.4.0
github.com/coroot/logparser v1.4.2
github.com/florianl/go-conntrack v0.3.0
github.com/go-kit/log v0.2.1
github.com/gobwas/glob v0.2.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ github.com/coreos/go-systemd/v22 v22.7.0 h1:LAEzFkke61DFROc7zNLX/WA2i5J8gYqe0rSj
github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7Ybq9o0BQhMwD0w=
github.com/coroot/dotnetdiag v1.2.2 h1:PVP/By8o+xhPjfVolJYcjHLbFQInM7pkaD6/otPLc8Q=
github.com/coroot/dotnetdiag v1.2.2/go.mod h1:veXCMlFzm1yNl7wwJb/ZLxO4WbzhDBoy1VG1XtkH2ls=
github.com/coroot/logparser v1.4.0 h1:/b+XnAh7kuKR1mVSekPCSPpKloWx6wJveHa0HDcXueY=
github.com/coroot/logparser v1.4.0/go.mod h1:5mgr/LIFAEuhxLgnFTtEXVWKthT1l2ZTsPHF6oOGc/E=
github.com/coroot/logparser v1.4.2 h1:0UxS7R2jLGc0l4seLkA42IKDGivwLFBPC7yzqc9LQv8=
github.com/coroot/logparser v1.4.2/go.mod h1:5mgr/LIFAEuhxLgnFTtEXVWKthT1l2ZTsPHF6oOGc/E=
github.com/coroot/pyroscope/ebpf v0.0.0-20260804213318-758a0e72af3a h1:whKF1ZhIGcaAn9ZV5hbBSkrw7C5OBgWasZ0bYktOW+U=
github.com/coroot/pyroscope/ebpf v0.0.0-20260804213318-758a0e72af3a/go.mod h1:IepHM9FJ0n3n3k+ZV23Y7vNAfvWI7LDuLqWPO4rB6sQ=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
Expand Down
Loading