Update Golang to 1.12.1 (#11330)

Changes in 1.12: https://golang.org/doc/go1.12 Changes in minor release: https://github.com/golang/go/issues?q=milestone%3AGo1.12.1 Updated vendored packages: - `github.com/tsg/gopacket/pcap` - `github.com/docker/docker/pkg/*` - `github.com/docker/go-connections` New vendored packages (as required by dependencies): - `github.com/konsorten/go-windows-terminal-sequences` Removed vendored package: - `github.com/Sirupsen/logrus`: `github.com/sirupsen/logrus` is used and it leads to a case insensitive collision, required by docker dependencies
elastic · Apr 9, 2019 · 0c1d247 · 0c1d247
1 parent 9aca9e7
commit 0c1d247
Show file tree

Hide file tree

Showing 85 changed files with 2,638 additions and 1,628 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.11.5
+1.12.1
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -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]
+
 *Auditbeat*
 
 - Auditd module: Normalized value of `event.category` field from `user-login` to `authentication`. {pull}11432[11432]

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -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:
 --------------------------------------------------------------------
@@ -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:
 --------------------------------------------------------------------
@@ -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
@@ -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)
 

diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5
+FROM golang:1.12.1
 
 RUN \
     apt-get update \

diff --git a/filebeat/Dockerfile b/filebeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5
+FROM golang:1.12.1
 
 RUN \
     apt-get update \

diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5
+FROM golang:1.12.1
 MAINTAINER Nicolas Ruflin <ruflin@elastic.co>
 
 RUN set -x && \

diff --git a/journalbeat/Dockerfile b/journalbeat/Dockerfile
@@ -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 && \

diff --git a/libbeat/Dockerfile b/libbeat/Dockerfile
@@ -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 && \

diff --git a/libbeat/logp/global.go b/libbeat/logp/global.go
@@ -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"))
 	}
 }
diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.10.3
+FROM golang:1.12.1
 
 RUN \
     apt-get update \

diff --git a/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/vendor/github.com/Sirupsen/logrus/CHANGELOG.md