Skip to content

[winlogbeat] Only init metrics if needed #40703

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
marc-gr merged 1 commit into from
Sep 6, 2024
Merged

[winlogbeat] Only init metrics if needed #40703

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
4 changes: 3 additions & 1 deletion winlogbeat/eventlog/wineventlog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,9 @@ func (l *winEventLog) Open(state checkpoint.EventLogState) error {
var err error
// we need to defer metrics initialization since when the event log
// is used from winlog input it would register it twice due to CheckConfig calls
l.metrics = newInputMetrics(l.channelName, l.id)
if l.metrics == nil {
l.metrics = newInputMetrics(l.channelName, l.id)
}
Copy link
Contributor

@intxgo intxgo Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it mean that l.Open is called twice without l.Close? If so, there seems to be more issues

https://learn.microsoft.com/en-us/windows/win32/api/winevt/nf-winevt-evtsubscribe#return-value

so perhaps

-return l.openChannel(bookmark)
+ if l.subscription {
+    win.Close(l.subscription)
+}
+return l.openChannel(bookmark)

Copy link
Contributor Author

@marc-gr marc-gr Sep 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It only gets called more than once in case it fails to open, so no need to call close in that case.

if len(state.Bookmark) > 0 {
bookmark, err = win.CreateBookmarkFromXML(state.Bookmark)
} else if state.RecordNumber > 0 && l.channelName != "" {
Expand Down
4 changes: 3 additions & 1 deletion winlogbeat/eventlog/wineventlog_experimental.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ func (l *winEventLogExp) Open(state checkpoint.EventLogState) error {
l.lastRead = state
// we need to defer metrics initialization since when the event log
// is used from winlog input it would register it twice due to CheckConfig calls
l.metrics = newInputMetrics(l.channelName, l.id)
if l.metrics == nil {
l.metrics = newInputMetrics(l.channelName, l.id)
}

var err error
l.iterator, err = win.NewEventIterator(
Expand Down