[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, which focuses metric approval checks on agent metrics.

No open issues 🎉

What changed in this PR

Backports #22390 to the 9.6 branch to address flaky TestApprovedMetrics results reported in #21608. The test now excludes server-aggregated metrics so approval checks focus on agent metrics.

Changes:

• Exclude metrics containing metricset.interval, rather than only transaction metrics.
• Remove a stray trailing backtick from the metricset fixture.

File	Description
testdata/​intake-v2/​metricsets.ndjson	Remove a stray backtick to keep the final fixture record valid JSON.
systemtest/​metrics_test.go	Filter out server aggregates using metricset.interval and update the explanatory comment.

_{Review effort: Balanced}

[infra-vault-gh-plugin-prod]

💚 Build Succeeded

• Buildkite Build
• Commit: 3edd8be

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/42227598061

[mergify]

✅ Merged into 9.6 as 60e43ca at 16:41 UTC

8 min in the queue, 7 min of it CI.

So far

• ✅ Entered the queue Fri 6 Nov, 16:33 · rule default · triggered by rule squash and merge backport PRs after CI passes
• ✅ Passed · draft merge queue: merged #22395: [9.6] (backport #22390) fix flaky test TestApprovedMetrics #22406
• ✅ Merged 16:41 · 60e43ca · 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 repository ruleset rule 9.*, 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 repository ruleset rule 9.*:
  • check-success = lint
  • check-neutral = lint
  • check-skipped = lint
• any of · required by GitHub repository ruleset rule 9.*:
  • check-success = buildkite/docs-build-pr
  • check-neutral = buildkite/docs-build-pr
  • check-skipped = buildkite/docs-build-pr
• any of · required by GitHub repository ruleset rule 9.*:
  • check-success = CLA
  • check-neutral = CLA
  • check-skipped = CLA

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