Merge branch 'main' into explicit-seconds

Author: beniwohli

CHANGELOG.asciidoc

@@ -43,6 +43,7 @@ endif::[]
 
 * Fix Sanic integration to properly respect the `capture_body` config {pull}1485[#1485]
 * Lambda fixes to align with the cross-agent spec {pull}1489[#1489]
+* Change default for `stack_trace_limit` from 500 to 50 {pull}1492[#1492]
 
 
 [[release-notes-6.x]]

docs/configuration.asciidoc

@@ -656,7 +656,7 @@ Setting an upper limit will prevent edge cases from overloading the agent and th
 [options="header"]
 |============
 | Environment | Django/Flask | Default
-| `ELASTIC_APM_STACK_TRACE_LIMIT` | `STACK_TRACE_LIMIT` | `500`
+| `ELASTIC_APM_STACK_TRACE_LIMIT` | `STACK_TRACE_LIMIT` | `50`
 |============
 
 This limits the number of frames captured for each stack trace.

elasticapm/conf/__init__.py

@@ -604,7 +604,7 @@ class Config(_ConfigBase):
  "TRANSACTION_SAMPLE_RATE", type=float, validators=[PrecisionValidator(4, 0.0001)], default=1.0
  )
  transaction_max_spans = _ConfigValue("TRANSACTION_MAX_SPANS", type=int, default=500)
- stack_trace_limit = _ConfigValue("STACK_TRACE_LIMIT", type=int, default=500)
+ stack_trace_limit = _ConfigValue("STACK_TRACE_LIMIT", type=int, default=50)
  span_frames_min_duration = _DurationConfigValue(
  "SPAN_FRAMES_MIN_DURATION", default=timedelta(seconds=0.005), unitless_factor=0.001
  )