Skip to content

Fix Add OTel Receiver After Config Apply & Fix Reload Monitoring Old Log #1057

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
merged 43 commits into from
Apr 29, 2025
Merged

Fix Add OTel Receiver After Config Apply & Fix Reload Monitoring Old Log #1057

Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
f4e1d98
Moved Config parser to data source, stop instance watcher during conf…
aphralG Apr 23, 2025
975834b
Moved Config parser to data source, stop instance watcher during conf…
aphralG Apr 23, 2025
d54b145
change resource plugin to parse config
aphralG Apr 24, 2025
37c27b1
clean up
aphralG Apr 24, 2025
23feefa
move logger creation
aphralG Apr 24, 2025
f743035
added comments for context
aphralG Apr 24, 2025
2458c87
added comments for context
aphralG Apr 24, 2025
5e9d5e1
fix unit tests
aphralG Apr 24, 2025
d6532c3
try fix tests
aphralG Apr 24, 2025
65a1159
try fix tests
aphralG Apr 24, 2025
6698df9
fix test maybe
aphralG Apr 24, 2025
6ef74bc
fix tests
aphralG Apr 24, 2025
c219493
fix tests
aphralG Apr 24, 2025
2425def
fix tests
aphralG Apr 24, 2025
3d27ae0
fix tests
aphralG Apr 24, 2025
7537a1b
fix tests
aphralG Apr 24, 2025
606588b
fix tests
aphralG Apr 24, 2025
30b424f
fix tests
aphralG Apr 25, 2025
94f5438
fix tests
aphralG Apr 25, 2025
63eb2d1
fix tests
aphralG Apr 25, 2025
b50260e
fix tests
aphralG Apr 25, 2025
e6e65ce
fix tests
aphralG Apr 25, 2025
ba6f453
fix tests
aphralG Apr 25, 2025
b77f4e9
fix tests
aphralG Apr 25, 2025
18d3821
add plus file
aphralG Apr 25, 2025
725e59d
add plus conf file
aphralG Apr 25, 2025
78cd6d5
Merge branch 'v3' into dynamically-add-otel-receiver-after-config-apply
aphralG Apr 25, 2025
a7d896e
add plus conf file
aphralG Apr 25, 2025
a6e00f7
add plus conf file
aphralG Apr 25, 2025
1ecca95
add plus conf file
aphralG Apr 25, 2025
467b4b1
add plus conf file
aphralG Apr 25, 2025
59d5450
add plus conf file
aphralG Apr 25, 2025
9a8b38b
undo change
aphralG Apr 25, 2025
aa6c683
undo change
aphralG Apr 25, 2025
757168f
PR feedback
aphralG Apr 29, 2025
a58ddf8
Merge branch 'v3' into dynamically-add-otel-receiver-after-config-apply
aphralG Apr 29, 2025
3d6db7a
clean up
aphralG Apr 29, 2025
a662ad7
Pr feedback
aphralG Apr 29, 2025
7a94c34
pr feedback
aphralG Apr 29, 2025
dedec6b
merge v3
aphralG Apr 29, 2025
0cca25c
fix tests
aphralG Apr 29, 2025
262d353
fix tests
aphralG Apr 29, 2025
e4dc0d2
fix tests
aphralG Apr 29, 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
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
@aphralG
aphralG committed Apr 24, 2025
commit 2425deff71fc6f0f9cb76567a936a69b3ac48428
2 changes: 1 addition & 1 deletion internal/watcher/watcher_plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ func (w *Watcher) handleConfigApplySuccess(ctx context.Context, msg *bus.Message
return
}
w.instanceWatcherService.ReparseConfig(ctx, instanceID, successMessage.ConfigContext)

w.watcherMutex.Lock()
w.instancesWithConfigApplyInProgress = slices.DeleteFunc(
w.instancesWithConfigApplyInProgress,
Expand Down
Loading