Skip to content

Update beats framework to 990a5f7#3289

Merged
graphaelli merged 2 commits intoelastic:masterfrom
graphaelli:update-beats-master
Feb 10, 2020
Merged

Update beats framework to 990a5f7#3289
graphaelli merged 2 commits intoelastic:masterfrom
graphaelli:update-beats-master

Conversation

@graphaelli
Copy link
Copy Markdown
Member

Mostly for #3277

@graphaelli
Copy link
Copy Markdown
Member Author

@elastic/apm-server Anyone know what's going on with the vendored github.com/gogo/protobuf/... deps? It seems we updated them but this beats update is trying to downgrade them?

@axw
Copy link
Copy Markdown
Member

axw commented Feb 6, 2020

@graphaelli I think we need the newer version for Jaeger support. IIRC, nothing in libbeat depends on it, so it should be safe. @simitt does that sound right to you?

@simitt
Copy link
Copy Markdown
Contributor

simitt commented Feb 7, 2020

Agree with what @axw said, I needed to update the library when adding Jaeger support.
I assume it tries to downgrade now after the vendoring file was fixed to include the origin in https://github.com/elastic/apm-server/pull/3272/files#diff-bd290170e2912d3e8694db1a151066e5R1947.

@graphaelli graphaelli changed the title Update beats framework to 95a7e10 Update beats framework to 990a5f7 Feb 7, 2020
@graphaelli
Copy link
Copy Markdown
Member Author

graphaelli commented Feb 7, 2020

Good point @simitt, I wasn't thinking that origin was related. github.com/gogo/protobuf has been updated in beats and is reflected here now. Sorry about the force push, was the most straightforward way to update this.

@graphaelli
Copy link
Copy Markdown
Member Author

looking into this issue

 $ staticcheck github.com/elastic/apm-server/...
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/customizations.go:36:20: NewDefaultRetryer not declared by package aws (compile)
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/customizations.go:24:4: d.MinRetryDelay undefined (type *aws.DefaultRetryer has no field or method MinRetryDelay) (compile)
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/customizations.go:25:4: d.MinThrottleDelay undefined (type *aws.DefaultRetryer has no field or method MinThrottleDelay) (compile)
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/customizations.go:26:4: d.MaxRetryDelay undefined (type *aws.DefaultRetryer has no field or method MaxRetryDelay) (compile)
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/customizations.go:27:4: d.MaxThrottleDelay undefined (type *aws.DefaultRetryer has no field or method MaxThrottleDelay) (compile)

* added origins to vendor/vendor.json for 2 deps where missing
* script/update_govendor_deps.py 990a5f76a3dc435bf783c1f44d9363abac211a0e
@robgil
Copy link
Copy Markdown

robgil commented Feb 10, 2020

Codecov Report

Merging #3289 into master will not change coverage by %.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3289   +/-   ##
=======================================
  Coverage   79.82%   79.82%           
=======================================
  Files         107      107           
  Lines        5625     5625           
=======================================
  Hits         4490     4490           
  Misses       1135     1135           

@graphaelli
Copy link
Copy Markdown
Member Author

Two more origins were missing, added them manually and updated them with govendor.

@graphaelli graphaelli merged commit 3ecbb33 into elastic:master Feb 10, 2020
@graphaelli graphaelli deleted the update-beats-master branch February 10, 2020 16:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants