Skip to content

Vendor Agent dependencies#16616

Merged
ph merged 2 commits intoelastic:masterfrom
ph:agent-vendor
Mar 2, 2020
Merged

Vendor Agent dependencies#16616
ph merged 2 commits intoelastic:masterfrom
ph:agent-vendor

Conversation

@ph
Copy link
Copy Markdown
Contributor

@ph ph commented Feb 26, 2020

This PR is only the dependencies required by the Agent. We do this to simplify the Agent PR itself and to facilitate future backport to 7.x

What does this PR do?

Why is it important?

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs

@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/ingest (Project:fleet)

@ph ph mentioned this pull request Feb 26, 2020
5 tasks
@ph ph added the needs_backport PR is waiting to be backported to other branches. label Feb 26, 2020
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
@urso
Copy link
Copy Markdown

urso commented Feb 27, 2020

Dependencies added:

antlr4: 👍
oklog/ulid: 👍

urso/ecslog: Please update to recent ecslog. The one you are vendoing is older and still contains some bugs. The update will bring in urso/diag, urso/diag-ecs, and urso/sderr (functinoality has been split up). The testing with these is much improved and minor bugs and stability issues have been fixed.

hashicorp/errwrap: Do we need this? We already have github.com/pkg/errors which provides Wrap function.

hashicorp/go-multierror: Do we need this? We already have go.uber.org/multierr

Ecslog (functionality has been moved to sderr) provides functionality from multiple error packages in one package only. Plus it is compatible to the recent Go2 proposal (pkg/errors is deprecated and unmaintained), supports multiline printing via %+v and integrates well into ecslog.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 27, 2020

I will update ecslog since this should not have any impact on our code but for errwrap and multierror I will make a followup. I don't want to do refactor and merge on master at the same time.

Copy link
Copy Markdown
Contributor

@michalpristas michalpristas left a comment

Choose a reason for hiding this comment

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

👍

@michalpristas
Copy link
Copy Markdown
Contributor

errwrap is not used so we might clean this up, but go-multierror is used and i would keep it there and address later outside of this PR. To keep migration simple.

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 27, 2020

@urso dependecies updated and errwrap removed.

Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
Comment thread vendor/vendor.json Outdated
@urso
Copy link
Copy Markdown

urso commented Feb 28, 2020

Looks like govendor did mess with you :)

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 28, 2020

@urso You have no idea how I hate that tool.

@urso
Copy link
Copy Markdown

urso commented Feb 28, 2020

@urso You have no idea how I hate that tool.

For me the tool just hangs for some projects I want to update. tried on windows/linux/mac, with new gopath... So I sometimes resort to update the json by hand. No idea who is more lucky :P

@ph
Copy link
Copy Markdown
Contributor Author

ph commented Feb 28, 2020

For me the tool just hangs for some projects I want to update. tried on windows/linux/mac, with new gopath... So I sometimes resort to update the json by hand. No idea who is more lucky :P

Both of us are not, I am not even sure if god mod will fix all theses problems.

Anyway, I've fixed the dependencies related to ecs.

ph added 2 commits March 2, 2020 10:03
This PR is only the dependencies required by the Agent.
@ph
Copy link
Copy Markdown
Contributor Author

ph commented Mar 2, 2020

merging failure aren't related to this change.

@ph ph merged commit a25903b into elastic:master Mar 2, 2020
@ph ph added v7.7.0 and removed needs_backport PR is waiting to be backported to other branches. labels Mar 2, 2020
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.

5 participants