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.

Sign up for GitHub

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

Jump to bottom

Update Golang to 1.12.1 #11330

Merged
merged 6 commits into from
Apr 9, 2019
Merged

Update Golang to 1.12.1 #11330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
474e351
update version numbers in the appropiate places
kvch Mar 20, 2019
d5d0a67
vendor github.com/tsg/gopacket
kvch Mar 21, 2019
adb4561
decrease the number of skipped Callers when recovering from panic
kvch Mar 21, 2019
ca1598d
add changelog entry
kvch Mar 21, 2019
89d0de2
update docker dependencies to remove Sirupsen from vendor
kvch Apr 2, 2019
adddf0c
update changelog
kvch Apr 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.11.5
1.12.1
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d

*Affecting all Beats*

- Update to Golang 1.12.1. {pull}11330[11330]
kvch marked this conversation as resolved.
Show resolved Hide resolved

*Auditbeat*

*Filebeat*
Expand Down
27 changes: 22 additions & 5 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ Apache License 2.0

--------------------------------------------------------------------
Dependency: github.com/docker/docker
Revision: d192db0d9350222d2b8bb6eba8525b04c3be7d61
Revision: 1009e6a40b295187e038b67e184e9c0384d95538
License type (autodetected): Apache-2.0
./vendor/github.com/docker/docker/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -457,7 +457,8 @@ See also https://www.apache.org/dev/crypto.html and/or seek legal counsel.

--------------------------------------------------------------------
Dependency: github.com/docker/go-connections
Revision: e15c02316c12de00874640cd76311849de2aeed5
Version: v0.3.0
Revision: 3ede32e2033de7505e6500d6c868c2b9ed9f169d
License type (autodetected): Apache-2.0
./vendor/github.com/docker/go-connections/LICENSE:
--------------------------------------------------------------------
Expand Down Expand Up @@ -1891,6 +1892,22 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

--------------------------------------------------------------------
Dependency: github.com/konsorten/go-windows-terminal-sequences
Revision: f55edac94c9bbba5d6182a4be46d86a2c9b5b50e
License type (autodetected): MIT
./vendor/github.com/konsorten/go-windows-terminal-sequences/LICENSE:
--------------------------------------------------------------------
(The MIT License)

Copyright (c) 2017 marvin + konsorten GmbH (open-source@konsorten.de)

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/kubernetes/apimachinery
Version: kubernetes-1.11.1
Expand Down Expand Up @@ -2658,10 +2675,10 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

--------------------------------------------------------------------
Dependency: github.com/Sirupsen/logrus
Revision: 5e5dc898656f695e2a086b8e12559febbfc01562
Dependency: github.com/sirupsen/logrus
Revision: a6c0064cfaf982707445a1c90368f956421ebcf0
License type (autodetected): MIT
./vendor/github.com/Sirupsen/logrus/LICENSE:
./vendor/github.com/sirupsen/logrus/LICENSE:
--------------------------------------------------------------------
The MIT License (MIT)

Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11.5
FROM golang:1.12.1

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion filebeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11.5
FROM golang:1.12.1

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11.5
FROM golang:1.12.1
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion journalbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.11.5
FROM golang:1.12.1
MAINTAINER Noémi Ványi <noemi.vanyi@elastic.co>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Beats dockerfile used for testing
FROM golang:1.11.5
FROM golang:1.12.1
MAINTAINER Nicolas Ruflin <ruflin@elastic.co>

RUN set -x && \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/logp/global.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func WTF(format string, v ...interface{}) {
func Recover(msg string) {
if r := recover(); r != nil {
msg := fmt.Sprintf("%s. Recovering, but please report this.", msg)
globalLogger().WithOptions(zap.AddCallerSkip(2)).
globalLogger().WithOptions(zap.AddCallerSkip(1)).
Error(msg, zap.Any("panic", r), zap.Stack("stack"))
}
}
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.10.3
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ruflin Do you know why the version of Golang differed from other Beats versions? Is it ok to update it?
I haven't seen any related failures yet.

Copy link
Member

Choose a reason for hiding this comment

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

This is odd, all Beats should be in sync :-( I assume this had only an affect on testing and not packaging, meaning in 7.0 all Beats are packaged with the same Golang version.

Please update, I assume we missed it in the last Golang update.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was downgraded here: https://github.com/elastic/beats/pull/9242/files#diff-69f23758930df5eda4eeb23437b8a2ccR1

It seems like an accidental change. Or at least I haven't seen any reasoning why it was done.

Copy link
Member

Choose a reason for hiding this comment

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

@kvch Thanks for investigation. @sayden I left a comment on the old PR, I wonder if any of these changes should have happened there.

Copy link
Member

Choose a reason for hiding this comment

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

It probably was a merge gone bad.

Copy link
Member

Choose a reason for hiding this comment

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

@sayden Can you please open a PR with reverting to the old Dockerfile?

FROM golang:1.12.1

RUN \
apt-get update \
Expand Down
94 changes: 0 additions & 94 deletions vendor/github.com/Sirupsen/logrus/CHANGELOG.md
View file
Open in desktop

This file was deleted.

Loading