Skip to content

iserver-test: Add temporary fix for Fleet policy issue#17682

Merged
ericywl merged 2 commits intomainfrom
iservertest-temp-fix
Jul 17, 2025
Merged

iserver-test: Add temporary fix for Fleet policy issue#17682
ericywl merged 2 commits intomainfrom
iservertest-temp-fix

Conversation

@ericywl
Copy link
Copy Markdown
Contributor

@ericywl ericywl commented Jul 16, 2025

Motivation/summary

The Fleet policy issue is causing our tests to fail before ingestion, so we can't fully test the APM server in some versions. This PR adds a bandaid fix to the issue,

How to test these changes

Run workflow: https://github.com/elastic/apm-server/actions/runs/16317358259.

@ericywl ericywl self-assigned this Jul 16, 2025
@ericywl ericywl requested a review from a team as a code owner July 16, 2025 10:44
@ericywl ericywl added the backport-skip Skip notification from the automated backport with mergify label Jul 16, 2025
@github-actions
Copy link
Copy Markdown
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

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

}

func (g *Generator) waitForAPMToBePublishReady(ctx context.Context, maxWaitDuration time.Duration) error {
// RunBlockingWait runs the underlying generator in blocking mode and waits for all in-flight
Copy link
Copy Markdown
Contributor Author

@ericywl ericywl Jul 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[For reviewers] Moved this whole function up, and added the workaround for the Fleet policy issue in there.

Copy link
Copy Markdown
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, but please create and link a follow up to revert this extra policy update. It's good to get the tests fixed and avoid missing other issues, but it is shadowing actual problems we are observing.

@ericywl
Copy link
Copy Markdown
Contributor Author

ericywl commented Jul 17, 2025

This fixed the Fleet policy issue but there are still some issues with 9.2.0-SNAPSHOT where aggregated metrics count did not increase after ingestion. Will merge this first and take a look into it.

@ericywl ericywl enabled auto-merge (squash) July 17, 2025 03:05
@ericywl ericywl merged commit 490f419 into main Jul 17, 2025
18 of 19 checks passed
@ericywl ericywl deleted the iservertest-temp-fix branch July 17, 2025 03:12
v1v added a commit to v1v/apm-server that referenced this pull request Jul 21, 2025
…ture/use-plain-command

* 'main' of https://github.com/elastic/apm-server: (76 commits)
  changelog: Add 9.0.4 release notes (elastic#17586)
  Remove 9.1 from 9.2 lazy rollover exception (elastic#17754)
  Fix wrong usage of inputs (elastic#17751)
  iserver-test: Add 9.2 test and some improvements (elastic#17709)
  refactor: replace pkg/errors with stdlib (elastic#17697)
  docs: update release manager docs (elastic#17450)
  build(deps): bump github.com/spf13/pflag from 1.0.6 to 1.0.7 in the spf13 group (elastic#17729)
  build(deps): bump github.com/elastic/apm-data from 1.19.2 to 1.19.3 (elastic#17731)
  chore: Remove stale comment about reloader multierror (elastic#17711)
  [updatecli] Update to elastic/beats@58f44bb27b80 (elastic#17660)
  chore: deps(updatecli/policy): bump "ghcr.io/updatecli/policies/autod... (elastic#17704)
  Add temporary fix for Fleet policy issue (elastic#17682)
  chore: update test plan template (elastic#17497)
  refactor: remove unused apm tracer (elastic#17658)
  Add previously missing ignored logs (elastic#17655)
  ci: update mergify windows check (elastic#17657)
  build(deps): bump github.com/elastic/go-docappender/v2 from 2.10.0 to 2.11.0 (elastic#17570)
  build(deps): bump the dependencies group in /systemtest with 4 updates (elastic#17654)
  build(deps): bump go.opentelemetry.io/collector/pdata from 1.35.0 to 1.36.0 in the otel group (elastic#17653)
  build(deps): bump ubi9/ubi-micro in /packaging/docker (elastic#17651)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport-skip Skip notification from the automated backport with mergify

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants