File tree Expand file tree Collapse file tree 1 file changed +11
-0
lines changed Expand file tree Collapse file tree 1 file changed +11
-0
lines changed Original file line number Diff line number Diff line change @@ -344,7 +344,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) {
344
344
345
345
reg := b .Monitoring .StatsRegistry ().GetOrCreateRegistry ("libbeat" )
346
346
347
+ << << << < HEAD
347
348
err = metricreport .SetupMetrics (b .Info .Logger .Named ("metrics" ), b .Info .Beat , version .GetDefaultVersion ())
349
+ == == == =
350
+ err = metricreport .SetupMetricsOptions (metricreport.MetricOptions {
351
+ Name : b .Info .Beat ,
352
+ Version : version .GetDefaultVersion (),
353
+ EphemeralID : metricreport .EphemeralID ().String (), //nolint:staticcheck //keep behavior for now
354
+ Logger : b .Info .Logger .Named ("metrics" ),
355
+ SystemMetrics : monitoring .Default .GetOrCreateRegistry ("system" ),
356
+ ProcessMetrics : monitoring .Default .GetOrCreateRegistry ("beat" ),
357
+ })
358
+ >> >> >> > 2 d5086e12 ([libbeat ] use SetupMetricsOptions instead of SetupMetrics (#46313 ))
348
359
if err != nil {
349
360
return nil , err
350
361
}
You can’t perform that action at this time.
0 commit comments