chore: update-beats goal to bump the go version #5778
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kuisathaverat
approved these changes
Jul 21, 2021
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
cachedout
approved these changes
Jul 21, 2021
axw
reviewed
Jul 22, 2021
There was a problem hiding this comment.
Thanks @v1v! Just a couple of small things. Would you mind also updating https://github.com/elastic/apm-server/blob/master/README.md#requirements, to just say "1.16.x" rather than a specific version? We'll be increasing major versions infrequently enough that we can change from (e.g.) 1.16.x to 1.17.x manually.
Makefile
Outdated
| || { code=$$?; echo ".go-version out of sync with Beats"; exit $$code; } | ||
| cp -f $$($(GO) list -m -f {{.Dir}} $(BEATS_MODULE))/.go-version .go-version | ||
| sed -i'.bck' -E -e "s#(FROM golang):[0-9]+\.[0-9]+\.[0-9]+#\1:$$(cat .go-version)#g" tests/Dockerfile | ||
| sed -i'.bck' -E -e "s#(FROM golang):[0-9]+\.[0-9]+\.[0-9]+#\1:$$(cat .go-version)#g" Dockerfile |
There was a problem hiding this comment.
can/should we also update docs/version.asciidoc here?
https://github.com/elastic/apm-server/blame/master/docs/version.asciidoc#L3
Co-authored-by: Andrew Wilkins <axwalk@gmail.com>
|
I've just tested with the latest changes: $ git diff HEAD^1..HEAD --name-only
.go-version
Dockerfile
NOTICE.txt
docs/version.asciidoc
go.mod
go.sum
tests/Dockerfile
$ git diff
diff --git a/.go-version b/.go-version
index 0d92a1028..de646d2fc 100644
--- a/.go-version
+++ b/.go-version
@@ -1 +1 @@
-1.16.5
+1.16.6
diff --git a/Dockerfile b/Dockerfile
index dd107742b..7f149bd08 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.5
+FROM golang:1.16.6
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
RUN set -x && \
diff --git a/NOTICE.txt b/NOTICE.txt
index 69a550aef..ec184f93d 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -576,11 +576,11 @@ SOFTWARE.
--------------------------------------------------------------------------------
Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20210713084715-eb758b9b11ad
+Version: v7.0.0-alpha2.0.20210721182418-fd59cf742027
Licence type (autodetected): Elastic
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210713084715-eb758b9b11ad/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20210721182418-fd59cf742027/LICENSE.txt:
Source code in this repository is variously licensed under the Apache License
Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -4601,11 +4601,11 @@ Contents of probable licence file LICENSE:
--------------------------------------------------------------------------------
Dependency : go.uber.org/atomic
-Version: v1.8.0
+Version: v1.9.0
Licence type (autodetected): MIT
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/go.uber.org/atomic@v1.8.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/go.uber.org/atomic@v1.9.0/LICENSE.txt:
Copyright (c) 2016 Uber Technologies, Inc.
@@ -4659,11 +4659,11 @@ THE SOFTWARE.
--------------------------------------------------------------------------------
Dependency : golang.org/x/net
-Version: v0.0.0-20210614182718-04defd469f4e
+Version: v0.0.0-20210716203947-853a461950ff
Licence type (autodetected): BSD-3-Clause
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20210614182718-04defd469f4e/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.0.0-20210716203947-853a461950ff/LICENSE:
Copyright (c) 2009 The Go Authors. All rights reserved.
@@ -15448,11 +15448,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
Dependency : github.com/prometheus/procfs
-Version: v0.7.0
+Version: v0.7.1
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.7.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/prometheus/procfs@v0.7.1/LICENSE:
Apache License
Version 2.0, January 2004
@@ -18055,11 +18055,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--------------------------------------------------------------------------------
Dependency : google.golang.org/genproto
-Version: v0.0.0-20210713002101-d411969a0d9a
+Version: v0.0.0-20210721163202-f1cecdd8b78a
Licence type (autodetected): Apache-2.0
--------------------------------------------------------------------------------
-Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20210713002101-d411969a0d9a/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/genproto@v0.0.0-20210721163202-f1cecdd8b78a/LICENSE:
Apache License
diff --git a/docs/version.asciidoc b/docs/version.asciidoc
index 2d2e4525c..33bff5660 100644
--- a/docs/version.asciidoc
+++ b/docs/version.asciidoc
@@ -1,6 +1,6 @@
// doc-branch can be: master, 8.0, 8.1, etc.
:doc-branch: master
-:go-version: 1.16.5
+:go-version: 1.16.6
:python: 3.7
:docker: 1.12
:docker-compose: 1.11
diff --git a/go.mod b/go.mod
index d6c2e9001..74b76375d 100644
--- a/go.mod
+++ b/go.mod
@@ -10,11 +10,11 @@ require (
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e
github.com/dgraph-io/badger/v2 v2.2007.3-0.20201012072640-f5a7e0a1c83b
github.com/dlclark/regexp2 v1.4.0 // indirect
- github.com/dop251/goja v0.0.0-20210712101704-705acef95ba3 // indirect
+ github.com/dop251/goja v0.0.0-20210720190508-a7a3a1366b2e // indirect
github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7 // indirect
github.com/dustin/go-humanize v1.0.0
github.com/elastic/apm-server/approvaltest v0.0.0-00010101000000-000000000000
- github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210713084715-eb758b9b11ad
+ github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210721182418-fd59cf742027
github.com/elastic/ecs v1.10.0
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210407144825-cc1c33cfa1d0 // indirect
github.com/elastic/elastic-package v0.0.0-20210310173719-3b8f76516ae3
@@ -43,7 +43,7 @@ require (
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/pkg/errors v0.9.1
github.com/poy/eachers v0.0.0-20181020210610-23942921fe77 // indirect
- github.com/prometheus/procfs v0.7.0 // indirect
+ github.com/prometheus/procfs v0.7.1 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/reviewdog/reviewdog v0.9.17
github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735
@@ -63,16 +63,16 @@ require (
go.elastic.co/fastjson v1.1.0
go.elastic.co/go-licence-detector v0.5.0
go.opentelemetry.io/collector v0.28.0
- go.uber.org/atomic v1.8.0
+ go.uber.org/atomic v1.9.0
go.uber.org/multierr v1.7.0 // indirect
go.uber.org/zap v1.18.1
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
- golang.org/x/net v0.0.0-20210614182718-04defd469f4e
+ golang.org/x/net v0.0.0-20210716203947-853a461950ff
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
- golang.org/x/tools v0.1.4
- google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a // indirect
+ golang.org/x/tools v0.1.5
+ google.golang.org/genproto v0.0.0-20210721163202-f1cecdd8b78a // indirect
google.golang.org/grpc v1.39.0
gopkg.in/yaml.v2 v2.4.0
gotest.tools/gotestsum v0.6.0
diff --git a/go.sum b/go.sum
index 89c77bb54..0e4ce74be 100644
--- a/go.sum
+++ b/go.sum
@@ -347,8 +347,8 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
github.com/eclipse/paho.mqtt.golang v1.2.1-0.20200121105743-0d940dd29fd2/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7joQ8SYLhZwfeOo6Ts=
github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210713084715-eb758b9b11ad h1:GRQLlvr+iGKmv0D+oqftj+vtxOif8TivI2n5SyxeeGs=
-github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210713084715-eb758b9b11ad/go.mod h1:UOdbBlZ1HWulsk7qhVhiHHnEHK9VkPCm6rJXCv+ECHU=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210721182418-fd59cf742027 h1:mFjorWDRsPFOue6gtG21myC6/M8ucybASeGIwOZOxNU=
+github.com/elastic/beats/v7 v7.0.0-alpha2.0.20210721182418-fd59cf742027/go.mod h1:UOdbBlZ1HWulsk7qhVhiHHnEHK9VkPCm6rJXCv+ECHU=
github.com/elastic/ecs v1.10.0 h1:C+0ZidF/eh5DKYAZBir3Hq9Q6aMXcwpgEuQnj4bRzKA=
github.com/elastic/ecs v1.10.0/go.mod h1:pgiLbQsijLOJvFR8OTILLu0Ni/R/foUNg0L+T6mU9b4=
github.com/elastic/elastic-agent-client/v7 v7.0.0-20210308165121-7dd05ee2b5a5/go.mod h1:uh/Gj9a0XEbYoM4NYz4LvaBVARz3QXLmlNjsrKY9fTc=
@@ -1185,8 +1185,8 @@ github.com/prometheus/procfs v0.0.11/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.0 h1:OQZ41sZU9XkRpzrz8/TD0EldH/Rwbddkdu5wDyUwzfE=
-github.com/prometheus/procfs v0.7.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.7.1 h1:TlEtJq5GvGqMykEwWzbZWjjztF86swFhsPix1i0bkgA=
+github.com/prometheus/procfs v0.7.1/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
github.com/prometheus/prometheus v1.8.2-0.20210430082741-2a4b8e12bbf2/go.mod h1:5aBj+GpLB+V5MCnrKm5+JAqEJwzDiLugOmDhgt7sDec=
github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s=
github.com/prometheus/statsd_exporter v0.20.0/go.mod h1:YL3FWCG8JBBtaUSxAg4Gz2ZYu22bS84XM89ZQXXTWmQ=
@@ -1443,8 +1443,8 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/atomic v1.8.0 h1:CUhrE4N1rqSE6FM9ecihEjRkLQu8cDfgDyoOs83mEY4=
-go.uber.org/atomic v1.8.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q=
go.uber.org/goleak v1.0.0/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
@@ -1589,8 +1589,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
golang.org/x/net v0.0.0-20210324051636-2c4c8ecb7826/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20210716203947-853a461950ff h1:j2EK/QoxYNBsXI4R7fQkkRUk8y6wnOBI+6hgPdP/6Ds=
+golang.org/x/net v0.0.0-20210716203947-853a461950ff/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1824,8 +1824,8 @@ google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6D
google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
google.golang.org/genproto v0.0.0-20210312152112-fc591d9ea70f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a h1:89EorDSnBRFywcvGsJvpxw2IsiDMI+DeM7iZOaunfHs=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
+google.golang.org/genproto v0.0.0-20210721163202-f1cecdd8b78a h1:17YmRUuEF4d+t2ygJZaDPhqNL2Hf17832xWKcMU7r2I=
+google.golang.org/genproto v0.0.0-20210721163202-f1cecdd8b78a/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
diff --git a/tests/Dockerfile b/tests/Dockerfile
index f6adcda61..7816c9b72 100644
--- a/tests/Dockerfile
+++ b/tests/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.16.5
+FROM golang:1.16.6
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
RUN apt-get update |
v1v
added
backport-7.x
backport-7.14
mergify bot
pushed a commit
that referenced
this pull request
Jul 28, 2021
(cherry picked from commit bcd5bb6) # Conflicts: # .ci/scripts/update-beats.sh # README.md
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation/summary
As discussed offline, this should help to automate the bump even for a change in the go-version. Similar to what it was done in #5754
How to test these changes
make update-beatsbut you need to use a specific git commit that can run the above as expected:
produces:
Related issues
Caused by #5692