Skip to content

fix watcher #919

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
DmitryRomanov wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

fix watcher #919

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
352c506
fix watcher
DmitryRomanov Nov 26, 2025
4392e05
fix watcher test
DmitryRomanov Nov 28, 2025
13f9213
Revert "fix watcher test"
DmitryRomanov Jun 22, 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
2 changes: 1 addition & 1 deletion plugin/input/file/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (w *watcher) notify(e notify.Event, path string) {
return
}

w.logger.Infof("notify %s %s", e, path)
w.logger.Debugf("notify %s %s", e, path)

for _, pattern := range w.paths.Exclude {
match, err := doublestar.PathMatch(pattern, path)
Expand Down
23 changes: 14 additions & 9 deletions plugin/input/file/watcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"os"
"path/filepath"
"strings"
"sync"
"testing"
"time"

Expand Down Expand Up @@ -32,7 +33,9 @@ func TestWatcher(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
dir := t.TempDir()
shouldCreate := atomic.Int64{}
var wg sync.WaitGroup
notifyFn := func(_ notify.Event, _ string, _ os.FileInfo) {
defer wg.Done()
shouldCreate.Inc()
}
ctl := metric.NewCtl("test", prometheus.NewRegistry(), time.Minute, 0)
Expand Down Expand Up @@ -62,13 +65,14 @@ func TestWatcher(t *testing.T) {
require.NoError(t, err)
err = f1.Close()
require.NoError(t, err)
wg.Add(1)

f2, err := os.Create(filepath.Join(dir, "watch2.log"))
require.NoError(t, err)
err = f2.Close()
require.NoError(t, err)

time.Sleep(10 * time.Millisecond)
wg.Add(1)
wg.Wait()

f1, err = os.OpenFile(f1Name, os.O_WRONLY, 0o600)
require.NoError(t, err)
Expand All @@ -77,13 +81,11 @@ func TestWatcher(t *testing.T) {
err = f1.Close()
require.NoError(t, err)

time.Sleep(10 * time.Millisecond)

err = os.Remove(f1Name)
require.NoError(t, err)
wg.Add(1)

time.Sleep(10 * time.Millisecond)

wg.Wait()
require.Equal(t, int64(2), shouldCreate.Load())
})
}
Expand Down Expand Up @@ -193,7 +195,10 @@ func TestWatcherPaths(t *testing.T) {

time.Sleep(10 * time.Millisecond)
before := shouldCreate.Load()
w.notify(notify.Create, filename)

resolvedFilename, err := resolvePathLinks(filename)
require.NoError(t, err)
w.notify(notify.Create, resolvedFilename)
after := shouldCreate.Load()

isNotified := after-before != 0
Expand All @@ -216,9 +221,9 @@ func TestCommonPathPrefix(t *testing.T) {

func TestResolvePathLinks(t *testing.T) {
a := assert.New(t)
originalDir := t.TempDir()
originalDir, _ := resolvePathLinks(t.TempDir())

dirWithLink := t.TempDir()
dirWithLink, _ := resolvePathLinks(t.TempDir())
dirLink := filepath.Join(dirWithLink, "symlink")
err := os.Symlink(originalDir, dirLink)
if err != nil {
Expand Down
Loading