Skip to content

merge queue: merged #22395: [9.6] (backport #22390) fix flaky test TestApprovedMetrics - #22406

Closed
mergify[bot] wants to merge 2 commits into
9.6from
mergify/merge-queue/ef0914796a
Closed

mergify[bot] wants to merge 2 commits into
9.6from
mergify/merge-queue/ef0914796a

Conversation

@mergify

@mergify mergify Bot commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Note

This is a merge queue draft opened by Mergify. Its pull request has merged, and nobody needs to act on it.
Mergify opened it for batch receptive-aligot-6jr5kx of the default queue, to test #22395 before it merged into 9.6.

🎉 What landed

Mergify merged its pull request into 9.6, then closed this draft:

This draft's code was built in this order:

  1. 9.6 at 85dce78
  2. #22395, the pull request of this batch
Metadata for CI tooling, read by mergify ci
---
all_scopes: false
checking_base_sha: 85dce7829f22366352b32ae0abd75a99025e871d
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 22395
    scopes: []
scopes: []
...
Required conditions of queue rule default for merge
Required conditions to stay in the queue

aelnahas and others added 2 commits November 6, 2026 13:41
* fix flaky test TestApprovedMetrics

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

fixes: #21608

* remove additional tick in metricset.json

(cherry picked from commit 906852a)
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Just comment with:

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

@infra-vault-gh-plugin-prod

Copy link
Copy Markdown

💚 Build Succeeded

@mergify mergify Bot changed the title merge queue: checking #22395 on 9.6 (85dce78) merge queue: merged #22395: [9.6] (backport #22390) fix flaky test TestApprovedMetrics Nov 6, 2026
@mergify mergify Bot closed this Nov 6, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/ef0914796a branch November 6, 2026 16:41
@github-actions

github-actions Bot commented Nov 6, 2026

Copy link
Copy Markdown
Contributor

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant