[mergify]

Motivation/summary

commit attempts a fix on TestApprovedMetrics by filtering out server aggregates to focus on agent metrics.

Checklist

• Not a user facing change

For functional changes, consider:

• Is it observable through the addition of either logging or metrics?
• Is its use being published in telemetry to enable product improvement?
• Have system tests been added to avoid regression?

How to test these changes

Related issues

fixes: #21608

---

This is an automatic backport of pull request #22390 done by [Mergify](https://mergify.com).

[github-actions]

🤖 GitHub comments

Just comment with:

• run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

[Copilot]

🟢 Approval recommended

No active review issues are reported for the backport that excludes server-generated aggregates from the metrics approval check.

No open issues 🎉

What changed in this PR

This backport addresses flaky TestApprovedMetrics failures reported in #21608 by excluding server-generated aggregates from the agent-metrics approval check.

Changes:

• Filter out metrics with metricset.interval, rather than excluding only transaction metrics.
• Remove a stray trailing backtick from the metricset intake fixture.

File	Description
testdata/​intake-v2/​metricsets.ndjson	Remove a trailing backtick to restore valid NDJSON.
systemtest/​metrics_test.go	Exclude all server-aggregated metrics from the approval check.

_{Review effort: Balanced}

[infra-vault-gh-plugin-prod]

💚 Build Succeeded

• Buildkite Build
• Commit: f918f98

cc @aelnahas

[github-actions]

Dependency review finished without posting an analysis comment.

If you expected a review, push a new commit to this pull request (or close and reopen it) to try again.

Workflow run: https://github.com/elastic/apm-server/actions/runs/42227651614

[mergify]

✅ Merged into 8.19 as 62b62f4 at 16:44 UTC

12 min in the queue, 10 min of it CI.

So far

• ✅ Entered the queue Fri 6 Nov, 16:32 · rule default · triggered by rule squash and merge backport PRs after CI passes
• ✅ Passed · draft merge queue: merged #22398: [8.19] (backport #22390) fix flaky test TestApprovedMetrics #22403
• ✅ Merged 16:44 · 62b62f4 · squash

9 merge conditions met

• check-success=CLA
• check-success=lint
• check-success=system-test
• check-success=test (macos-latest)
• github-review-approved · required by GitHub branch protection, GitHub repository ruleset rule [org] Require a PR for Renovate and GitHub repository ruleset rule [org] Require a PR
• any of:
  • check-success=test (windows-2025)
  • check-success=test (windows-latest)
• any of · required by GitHub branch protection:
  • check-success = CLA
  • check-neutral = CLA
  • check-skipped = CLA
• any of · required by GitHub branch protection:
  • check-success = lint
  • check-neutral = lint
  • check-skipped = lint
• any of · required by GitHub branch protection:
  • check-success = buildkite/docs-build-pr
  • check-neutral = buildkite/docs-build-pr
  • check-skipped = buildkite/docs-build-pr

_{Times in UTC · dashboard · how the merge queue works}