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 setting of data_stream fields to processor #5717

Merged
merged 2 commits into from
Jul 15, 2021

Conversation

axw
Copy link
Member

@axw axw commented Jul 15, 2021

Motivation/summary

Move the logic associated with setting data_stream fields out of model, into a model processor. Most of our tests will not run the model processor, hence why the data_stream fields disappear from approvals. Importantly, the TestFleetIntegration system test's approval file (which doesn't and shouldn't show up in the diff) retains the fields.

Checklist

- [ ] Update CHANGELOG.asciidoc
- [ ] Documentation has been updated

How to test these changes

Non-functional change.

Related issues

#4410
#4120
#3565

@apmmachine
Copy link
Contributor

apmmachine commented Jul 15, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-15T05:19:37.848+0000

  • Duration: 40 min 37 sec

  • Commit: c9a6280

Test stats 🧪

Test Results
Failed 0
Passed 5933
Skipped 14
Total 5947

Trends 🧪

Image of Build Times

Image of Tests

@axw
Copy link
Member Author

axw commented Jul 15, 2021

/test

@axw axw marked this pull request as ready for review July 15, 2021 03:43
@axw axw requested a review from a team July 15, 2021 03:43
@mergify
Copy link
Contributor

mergify bot commented Jul 15, 2021

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 modelprocessor-datastream upstream/modelprocessor-datastream
git merge upstream/master
git push upstream modelprocessor-datastream

@axw
Copy link
Member Author

axw commented Jul 15, 2021

Moving this back into draft while I fix conflicts and remove transform.Config.

will do that in a follow up

@axw axw marked this pull request as draft July 15, 2021 05:16
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.

Great to get rid of a lot of the *transformConfig dependencies when transforming the events to beat events.

@axw axw marked this pull request as ready for review July 15, 2021 05:20
@axw axw enabled auto-merge (squash) July 15, 2021 05:20
@axw axw disabled auto-merge July 15, 2021 06:01
@axw axw merged commit 29cfed3 into elastic:master Jul 15, 2021
@axw axw deleted the modelprocessor-datastream branch July 15, 2021 06:01
mergify bot pushed a commit that referenced this pull request Jul 15, 2021
(cherry picked from commit 29cfed3)

# Conflicts:
#	beater/beater.go
#	model/apmevent.go
#	model/error_test.go
#	model/metricset.go
#	model/metricset_test.go
#	model/profile.go
#	model/profile_test.go
#	model/span_test.go
#	model/transaction.go
#	model/transaction_test.go
#	transform/transform.go
@axw
Copy link
Member Author

axw commented Jul 15, 2021

@Mergifyio backport 7.x

@mergify
Copy link
Contributor

mergify bot commented Jul 15, 2021

Command backport 7.x: success

Backports have been created

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

Successfully merging this pull request may close these issues.

3 participants