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 @@ -349,7 +349,18 @@ func (b *Beat) createBeater(bt beat.Creator) (beat.Beater, error) {
349
349
reg = monitoring .Default .NewRegistry ("libbeat" )
350
350
}
351
351
352
+ << << << < HEAD
352
353
err = metricreport .SetupMetrics (logp .NewLogger ("metrics" ), b .Info .Beat , version .GetDefaultVersion ())
354
+ == == == =
355
+ err = metricreport .SetupMetricsOptions (metricreport.MetricOptions {
356
+ Name : b .Info .Beat ,
357
+ Version : version .GetDefaultVersion (),
358
+ EphemeralID : metricreport .EphemeralID ().String (), //nolint:staticcheck //keep behavior for now
359
+ Logger : b .Info .Logger .Named ("metrics" ),
360
+ SystemMetrics : monitoring .Default .GetOrCreateRegistry ("system" ),
361
+ ProcessMetrics : monitoring .Default .GetOrCreateRegistry ("beat" ),
362
+ })
363
+ >> >> >> > 2 d5086e12 ([libbeat ] use SetupMetricsOptions instead of SetupMetrics (#46313 ))
353
364
if err != nil {
354
365
return nil , err
355
366
}
You can’t perform that action at this time.
0 commit comments