Skip to content

Commit

Permalink
Minor refactor for aggregation processor init (#15177) (#15186)
Browse files Browse the repository at this point in the history
(cherry picked from commit 5b59aab)

Co-authored-by: Vishal Raj <[email protected]>
  • Loading branch information
mergify[bot] and lahsivjar authored Jan 8, 2025
1 parent f802f9b commit 4c86d40
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
10 changes: 3 additions & 7 deletions x-pack/apm-server/aggregation.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@ import (
"github.com/elastic/apm-server/x-pack/apm-server/aggregation"
)

func newAggregationProcessors(args beater.ServerParams) ([]namedProcessor, error) {
var processors []namedProcessor

func newAggregationProcessor(args beater.ServerParams) (namedProcessor, error) {
name := "LSM aggregator"
agg, err := aggregation.New(
args.Config.Aggregation.MaxServices,
Expand All @@ -24,9 +22,7 @@ func newAggregationProcessors(args beater.ServerParams) ([]namedProcessor, error
args.Logger,
)
if err != nil {
return nil, errors.Wrapf(err, "error creating %s", name)
return namedProcessor{}, errors.Wrapf(err, "error creating %s", name)
}
processors = append(processors, namedProcessor{name: name, processor: agg})

return processors, nil
return namedProcessor{name: name, processor: agg}, nil
}
4 changes: 2 additions & 2 deletions x-pack/apm-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ type processor interface {
func newProcessors(args beater.ServerParams) ([]namedProcessor, error) {
var processors []namedProcessor

aggregationProcessors, err := newAggregationProcessors(args)
aggregationProcessor, err := newAggregationProcessor(args)
if err != nil {
return nil, err
}
processors = append(processors, aggregationProcessors...)
processors = append(processors, aggregationProcessor)

if args.Config.Sampling.Tail.Enabled {
const name = "tail sampler"
Expand Down

0 comments on commit 4c86d40

Please sign in to comment.