Skip to content
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

Move output dir logic to suite #29580

Merged
merged 12 commits into from
Oct 9, 2024
Merged

Conversation

clarkb7
Copy link
Contributor

@clarkb7 clarkb7 commented Sep 25, 2024

What does this PR do?

Moves E2E output dir logic from the profile to the suite, fixing an issue that created more directories than intended.

previous calls

outputDir, err := runner.GetTestOutputDir(runner.GetProfile(), s.T())

new calls

outputDir, err := s.GetTestOutputDir()

Motivation

profile.GetOutputDir() was supposed to create a timestamped directory once and save it, but it was a value receiver method so the directory was never being saved, leading to a new timestamped directory being created on each call to GetTestOutputDir().

Describe how to test/QA your changes

N/A, test change
can check that new-e2e-windows-service-test only creates 2 timestamped dirs (one for each suite), where previously it made many more.

Possible Drawbacks / Trade-offs

Removes "tests" related things from runner/profile, but jobs/runs that execute multiple suites, or the same suite multiple times, will still create multiple timestamped directories. This does help avoid directory collisions for parameterized test suites, though ideally the test author would also make the test name unique by using t.Run("<params>", ...).

Moved symlink logic from localProfile.GetOutputDir() to behind a os.Getenv("CI") condition, but would like a better/standardized way of determining "ci profile" vs "local profile" from outside the profile.

Keeping profile.GetOutputDir() method rather than only using profile.ParamStore() because local and CI profiles have different behavior for the default root dir

  • ci uses $CI_PROJECT_DIR
  • local uses ~/e2e-output

Moved the runner.GetProfile() into the call itself, since that's what the suite does elsewhere.

The usage in agent_client.go doesn't have access to the suite so it can't benefit from the root output dir caching done by the suite, but it does have access to the e2e.Context interface (which is the suite under the hood). Maybe we can add output dir methods to the e2e.Context interface.

Additional Notes

overall logic/path format, <root>/<timestamp>/<test name>, is unchanged, but improvements can be made in follow ups, like maybe dropping the timestamp in the CI, or including part of the test name in the timestamp part as a hint when multiple suites are run and create multiple timestamp dirs.

@clarkb7 clarkb7 added changelog/no-changelog team/windows-agent qa/no-code-change Skip QA week as there is no code change in Agent code labels Sep 25, 2024
@clarkb7 clarkb7 requested review from a team as code owners September 25, 2024 23:16
@agent-platform-auto-pr
Copy link
Contributor

agent-platform-auto-pr bot commented Sep 25, 2024

[Fast Unit Tests Report]

On pipeline 46027273 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

@pr-commenter
Copy link

pr-commenter bot commented Sep 25, 2024

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

inv create-vm --pipeline-id=46027273 --os-family=ubuntu

Note: This applies to commit 124d8700

@pr-commenter
Copy link

pr-commenter bot commented Sep 26, 2024

Regression Detector

Regression Detector Results

Run ID: 39626e13-063b-4f72-a02a-17190d1dc670 Metrics dashboard Target profiles

Baseline: 2abc3be
Comparison: 124d870

Performance changes are noted in the perf column of each table:

  • ✅ = significantly better comparison variant performance
  • ❌ = significantly worse comparison variant performance
  • ➖ = no significant change in performance

No significant changes in experiment optimization goals

Confidence level: 90.00%
Effect size tolerance: |Δ mean %| ≥ 5.00%

There were no significant changes in experiment optimization goals at this confidence level and effect size tolerance.

Fine details of change detection per experiment

perf experiment goal Δ mean % Δ mean % CI trials links
pycheck_lots_of_tags % cpu utilization +2.31 [-0.18, +4.81] 1 Logs
tcp_syslog_to_blackhole ingress throughput +0.71 [+0.66, +0.76] 1 Logs
otel_to_otel_logs ingress throughput +0.29 [-0.52, +1.09] 1 Logs
idle_all_features memory utilization +0.25 [+0.15, +0.34] 1 Logs
tcp_dd_logs_filter_exclude ingress throughput -0.00 [-0.01, +0.01] 1 Logs
uds_dogstatsd_to_api ingress throughput -0.02 [-0.11, +0.07] 1 Logs
idle memory utilization -0.19 [-0.24, -0.15] 1 Logs
file_tree memory utilization -0.47 [-0.58, -0.36] 1 Logs
uds_dogstatsd_to_api_cpu % cpu utilization -0.80 [-1.53, -0.07] 1 Logs
basic_py_check % cpu utilization -0.83 [-3.59, +1.93] 1 Logs

Bounds Checks

perf experiment bounds_check_name replicates_passed
idle memory_usage 10/10

Explanation

A regression test is an A/B test of target performance in a repeatable rig, where "performance" is measured as "comparison variant minus baseline variant" for an optimization goal (e.g., ingress throughput). Due to intrinsic variability in measuring that goal, we can only estimate its mean value for each experiment; we report uncertainty in that value as a 90.00% confidence interval denoted "Δ mean % CI".

For each experiment, we decide whether a change in performance is a "regression" -- a change worth investigating further -- if all of the following criteria are true:

  1. Its estimated |Δ mean %| ≥ 5.00%, indicating the change is big enough to merit a closer look.

  2. Its 90.00% confidence interval "Δ mean % CI" does not contain zero, indicating that if our statistical model is accurate, there is at least a 90.00% chance there is a difference in performance between baseline and comparison variants.

  3. Its configuration does not mark it "erratic".

test/new-e2e/pkg/e2e/suite.go Outdated Show resolved Hide resolved
test/new-e2e/pkg/e2e/suite_utils.go Outdated Show resolved Hide resolved
Comment on lines +65 to +81
if os.Getenv("CI") == "" {
// Create a symlink to the latest run for user convenience
// TODO: Is there a standard "ci" vs "local" check?
// This code used to be in localProfile.GetOutputDir()
latestLink := filepath.Join(filepath.Dir(outputRoot), "latest")
// Remove the symlink if it already exists
if _, err := os.Lstat(latestLink); err == nil {
err = os.Remove(latestLink)
if err != nil {
return "", err
}
}
err = os.Symlink(outputRoot, latestLink)
if err != nil {
return "", err
}
}
Copy link
Contributor

Choose a reason for hiding this comment

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

💬 suggestion
What about passing the profile, and having the profile passing a path to the output root directory. Then each suite would create a directory inside the root directory, while the generic one is static.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure I'm understanding.
profile.GetOutputDir() already returns static output dir, e.g. ~/e2e-output. The suite calls GetRootOutputDir() to create a new subdirectory for itself.

Copy link
Contributor

Choose a reason for hiding this comment

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

The rename to Create fixes this too

Copy link
Contributor

Choose a reason for hiding this comment

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

What I meant in my message is that is profile that knows where you are running. You might have a generic profile GetLatestLink that cleans up symlinks only on localprofile and that does nothing on ci profile. You would call it here with runner.GetProfile().CleanupOldLinks() or a better name.

Copy link
Contributor

@pducolin pducolin left a comment

Choose a reason for hiding this comment

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

Approving, would address the rename in base suite in this PR if possible

@clarkb7
Copy link
Contributor Author

clarkb7 commented Oct 7, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Oct 7, 2024

🚂 MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

@clarkb7
Copy link
Contributor Author

clarkb7 commented Oct 7, 2024

/merge -c

@dd-devflow
Copy link

dd-devflow bot commented Oct 7, 2024

⚠️ MergeQueue: This merge request was unqueued

This merge request was unqueued

If you need support, contact us on Slack #devflow!

@clarkb7
Copy link
Contributor Author

clarkb7 commented Oct 7, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Oct 7, 2024

🚂 MergeQueue: waiting for PR to be ready

This merge request is not mergeable yet, because of pending checks/missing approvals. It will be added to the queue as soon as checks pass and/or get approvals.
Note: if you pushed new commits since the last approval, you may need additional approval.
You can remove it from the waiting list with /remove command.

Use /merge -c to cancel this operation!

@dd-devflow
Copy link

dd-devflow bot commented Oct 8, 2024

🚂 MergeQueue: pull request added to the queue

The median merge time in main is 24m.

Use /merge -c to cancel this operation!

@dd-devflow
Copy link

dd-devflow bot commented Oct 8, 2024

🚨 MergeQueue: This merge request is in error

Gitlab pipeline didn't start on its own and we were unable to create it... Please retry.

If you need support, contact us on Slack #devflow with those details!

@clarkb7
Copy link
Contributor Author

clarkb7 commented Oct 9, 2024

/merge

@dd-devflow
Copy link

dd-devflow bot commented Oct 9, 2024

🚂 MergeQueue: pull request added to the queue

The median merge time in main is 26m.

Use /merge -c to cancel this operation!

@dd-mergequeue dd-mergequeue bot merged commit 81e640e into main Oct 9, 2024
369 checks passed
@dd-mergequeue dd-mergequeue bot deleted the branden.clark/fix-outputdir branch October 9, 2024 13:54
@github-actions github-actions bot added this to the 7.60.0 milestone Oct 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog/no-changelog qa/no-code-change Skip QA week as there is no code change in Agent code team/windows-agent
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants