From 92a3c2194e9d12f54b520e254d529b813f88fb57 Mon Sep 17 00:00:00 2001
From: Carson Ip <carson.ip@elastic.co>
Date: Tue, 11 Jul 2023 21:42:33 +0100
Subject: [PATCH] Use apm-server limits

---
 x-pack/apm-server/aggregation/lsm.go | 17 +++++++++--------
 x-pack/apm-server/main.go            |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/x-pack/apm-server/aggregation/lsm.go b/x-pack/apm-server/aggregation/lsm.go
index f791cc07fc7..a7afd046707 100644
--- a/x-pack/apm-server/aggregation/lsm.go
+++ b/x-pack/apm-server/aggregation/lsm.go
@@ -25,6 +25,7 @@ type Aggregator struct {
 // NewAggregator returns a new instance of aggregator.
 func NewAggregator(
 	ctx context.Context,
+	maxSvcs int, maxTxGroups int,
 	nextProcessor modelpb.BatchProcessor,
 	logger *logp.Logger,
 ) (*Aggregator, error) {
@@ -37,14 +38,14 @@ func NewAggregator(
 	baseaggregator, err := aggregators.New(
 		aggregators.WithDataDir(dir),
 		aggregators.WithLimits(aggregators.Limits{
-			MaxSpanGroups:                         1000,
-			MaxSpanGroupsPerService:               100,
-			MaxTransactionGroups:                  1000,
-			MaxTransactionGroupsPerService:        100,
-			MaxServiceTransactionGroups:           1000,
-			MaxServiceTransactionGroupsPerService: 100,
-			MaxServiceInstanceGroupsPerService:    100,
-			MaxServices:                           1000,
+			MaxSpanGroups:                         10000,
+			MaxSpanGroupsPerService:               1000,
+			MaxTransactionGroups:                  maxTxGroups,
+			MaxTransactionGroupsPerService:        maxTxGroups / 10,
+			MaxServiceTransactionGroups:           maxSvcs,
+			MaxServiceTransactionGroupsPerService: maxSvcs / 10,
+			MaxServiceInstanceGroupsPerService:    maxSvcs / 10,
+			MaxServices:                           maxSvcs,
 		}),
 		aggregators.WithProcessor(wrapNextProcessor(nextProcessor)),
 		aggregators.WithAggregationIntervals([]time.Duration{time.Minute, 10 * time.Minute, time.Hour}),
diff --git a/x-pack/apm-server/main.go b/x-pack/apm-server/main.go
index 9c2242570ac..07848396bc3 100644
--- a/x-pack/apm-server/main.go
+++ b/x-pack/apm-server/main.go
@@ -101,7 +101,7 @@ func newProcessors(args beater.ServerParams) ([]namedProcessor, error) {
 	processors := make([]namedProcessor, 0)
 
 	name := "LSM aggregator"
-	agg, err := aggregation.NewAggregator(context.TODO(), args.BatchProcessor, args.Logger)
+	agg, err := aggregation.NewAggregator(context.TODO(), args.Config.Aggregation.Transactions.MaxServices, args.Config.Aggregation.Transactions.MaxTransactionGroups, args.BatchProcessor, args.Logger)
 	if err != nil {
 		return nil, errors.Wrapf(err, "error creating %s", name)
 	}