Skip to content

[9.0](backport #46313) improve: use SetupMetricsOptions instead of SetupMetrics #46901

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

Open
wants to merge 1 commit into
base: 9.0
Choose a base branch
from
+11 −0
Open

[9.0](backport #46313) improve: use SetupMetricsOptions instead of SetupMetrics #46901

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
11 changes: 11 additions & 0 deletions libbeat/cmd/instance/beat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,18 @@
reg = monitoring.Default.NewRegistry("libbeat")
}

<<<<<<< HEAD

Check failure on line 352 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

syntax error: unexpected <<, expected }

Check failure on line 352 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

syntax error: unexpected <<, expected }

Check failure on line 352 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

syntax error: unexpected <<, expected }
err = metricreport.SetupMetrics(logp.NewLogger("metrics"), b.Info.Beat, version.GetDefaultVersion())
=======
err = metricreport.SetupMetricsOptions(metricreport.MetricOptions{
Name: b.Info.Beat,
Version: version.GetDefaultVersion(),
EphemeralID: metricreport.EphemeralID().String(), //nolint:staticcheck //keep behavior for now
Logger: b.Info.Logger.Named("metrics"),
SystemMetrics: monitoring.Default.GetOrCreateRegistry("system"),
ProcessMetrics: monitoring.Default.GetOrCreateRegistry("beat"),
})
>>>>>>> 2d5086e12 ([libbeat] use SetupMetricsOptions instead of SetupMetrics (#46313))

Check failure on line 363 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

invalid character U+0023 '#'

Check failure on line 363 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

invalid character U+0023 '#'

Check failure on line 363 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

invalid character U+0023 '#'
if err != nil {
return nil, err
}
Expand All @@ -371,7 +382,7 @@
}

var publisher *pipeline.Pipeline
monitors := pipeline.Monitors{

Check failure on line 385 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

syntax error: non-declaration statement outside function body) (typecheck)

Check failure on line 385 in libbeat/cmd/instance/beat.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest) 

syntax error: non-declaration statement outside function body) (typecheck)
Metrics: reg,
Telemetry: b.Info.Monitoring.StateRegistry,
Logger: logp.L().Named("publisher"),
Expand Down
Loading