diff --git a/v3/internal/connect_reply.go b/v3/internal/connect_reply.go index 342c140d5..caea20ccf 100644 --- a/v3/internal/connect_reply.go +++ b/v3/internal/connect_reply.go @@ -137,11 +137,11 @@ func (r *ConnectReply) ConfigurablePeriod() time.Duration { func uintPtr(x uint) *uint { return &x } // DefaultEventHarvestConfig provides faster event harvest defaults. -func DefaultEventHarvestConfig(maxTxnEvents, maxLogEvents int) EventHarvestConfig { +func DefaultEventHarvestConfig(maxTxnEvents, maxLogEvents, maxCustomEvents int) EventHarvestConfig { cfg := EventHarvestConfig{} cfg.ReportPeriodMs = DefaultConfigurableEventHarvestMs cfg.Limits.TxnEvents = uintPtr(uint(maxTxnEvents)) - cfg.Limits.CustomEvents = uintPtr(uint(MaxCustomEvents)) + cfg.Limits.CustomEvents = uintPtr(uint(maxCustomEvents)) cfg.Limits.LogEvents = uintPtr(uint(maxLogEvents)) cfg.Limits.ErrorEvents = uintPtr(uint(MaxErrorEvents)) return cfg @@ -149,8 +149,8 @@ func DefaultEventHarvestConfig(maxTxnEvents, maxLogEvents int) EventHarvestConfi // DefaultEventHarvestConfigWithDT is an extended version of DefaultEventHarvestConfig, // with the addition that it takes into account distributed tracer span event harvest limits. -func DefaultEventHarvestConfigWithDT(maxTxnEvents, maxLogEvents, spanEventLimit int, dtEnabled bool) EventHarvestConfig { - cfg := DefaultEventHarvestConfig(maxTxnEvents, maxLogEvents) +func DefaultEventHarvestConfigWithDT(maxTxnEvents, maxLogEvents, maxCustomEvents, spanEventLimit int, dtEnabled bool) EventHarvestConfig { + cfg := DefaultEventHarvestConfig(maxTxnEvents, maxLogEvents, maxCustomEvents) if dtEnabled { cfg.Limits.SpanEvents = uintPtr(uint(spanEventLimit)) } diff --git a/v3/internal/connect_reply_test.go b/v3/internal/connect_reply_test.go index eb9711354..d21366baf 100644 --- a/v3/internal/connect_reply_test.go +++ b/v3/internal/connect_reply_test.go @@ -173,7 +173,7 @@ func TestNegativeHarvestLimits(t *testing.T) { } func TestDefaultEventHarvestConfigJSON(t *testing.T) { - js, err := json.Marshal(DefaultEventHarvestConfig(MaxTxnEvents, MaxLogEvents)) + js, err := json.Marshal(DefaultEventHarvestConfig(MaxTxnEvents, MaxLogEvents, MaxCustomEvents)) if err != nil { t.Error(err) }