Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 17, 2025

Conversation

ericywl
Copy link
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
Copy link
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!)

@@ -54,14 +56,64 @@ func New(url, apikey string, kbc *kibana.Client, logger *zap.Logger) *Generator
}
}

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