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

systemtest: compare fields instead of _source in approvals #12098

Merged
merged 4 commits into from
Nov 28, 2023

Conversation

axw
Copy link
Member

@axw axw commented Nov 23, 2023

Motivation/summary

This is a precursor to #12066. We flatten test approvals because with the move to the apm-data plugin, some fields will be moving from _source to index-time runtime fields.

Note to reviewer: most of the changes come from 749c03e, which is entirely mechanical. The interesting bits are in the other commits.

Checklist

- [ ] Update CHANGELOG.asciidoc
- [ ] Update package changelog.yml (only if changes to apmpackage have been made)
- [ ] Documentation has been updated

How to test these changes

N/A, non-functional change.

Related issues

Closes #11240

Copy link
Contributor

mergify bot commented Nov 23, 2023

This pull request does not have a backport label. Could you fix it @axw? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.17 is the label to automatically backport to the 7.17 branch.
  • backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Nov 23, 2023
@axw axw changed the title Approvefields Flatten approvals, update integration package in preparation for input-only integration package Nov 23, 2023
@axw axw force-pushed the approvefields branch 2 times, most recently from a2bb86f to 5b22d96 Compare November 24, 2023 06:50
Copy link
Contributor

mergify bot commented Nov 27, 2023

This pull request is now in conflicts. Could you fix it @axw? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b approvefields upstream/approvefields
git merge upstream/main
git push upstream approvefields

axw added 4 commits November 28, 2023 12:35
Update apm-tools to bring in the newer version of opentelemetry-go,
which affects approvals.
(Unrelated to other changes.)
find -name '*.approved.json' -exec go run path/to/apm-tools/cmd/flatten-approvals -i {} \;
@axw axw changed the title Flatten approvals, update integration package in preparation for input-only integration package systemtest: flatten approvals Nov 28, 2023
@axw axw added the v8.12.0 label Nov 28, 2023
@axw axw changed the title systemtest: flatten approvals systemtest: compare fields instead of _source in approvals Nov 28, 2023
@axw axw marked this pull request as ready for review November 28, 2023 05:24
@axw axw requested a review from a team as a code owner November 28, 2023 05:24
@axw axw merged commit 2e1d98f into elastic:main Nov 28, 2023
11 checks passed
@axw axw deleted the approvefields branch November 28, 2023 12:35
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 v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

systemtest: compare fields in approval tests, not _source
2 participants