Import tools: a486a2aad18c47a9bc6c16e65672690888210832 from branch v3.4

ref: 1d8a122867..a486a2aad1
for: 3.4.17

TOOLS-1991    Build tools with Go 1.10.1

3 files changed, 48 insertions, 49 deletions

diff --git a/src/mongo/gotools/common.yml b/src/mongo/gotools/common.yml
index ee3c741a010..44c64b6870d 100644
--- a/src/mongo/gotools/common.yml
+++ b/src/mongo/gotools/common.yml
@@ -1429,21 +1429,21 @@ buildvariants:
 #######################################
 
 - name: amazonlinux64
-  display_name: Amazon Linux 64 (Go 1.8)
+  display_name: Amazon Linux 64 (Go 1.10)
   run_on:
   - linux-64-amzn-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
 
 - name: amazon2
-  display_name: Amazon Linux 64 v2 (Go 1.8)
+  display_name: Amazon Linux 64 v2 (Go 1.10)
   run_on:
   - amazon2-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1463,11 +1463,11 @@ buildvariants:
   - name: dist
 
 - name: debian81
-  display_name: Debian 8.1 (Go 1.8)
+  display_name: Debian 8.1 (Go 1.10)
   run_on:
   - debian81-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1477,7 +1477,7 @@ buildvariants:
 #######################################
 
 - name: macOS-1012
-  display_name: MacOS 10.12 (Go 1.8)
+  display_name: MacOS 10.12 (Go 1.10)
   run_on:
   - macos-1012
   expansions:
@@ -1486,11 +1486,11 @@ buildvariants:
     mongo_os: "osx"
     arch: "osx/x86_64"
     excludes: requires_many_files
-    gorootvars: 'PATH="/usr/local/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/usr/local/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
   tasks: *macos_1012_tasks
 
 - name: macOS-1012-ssl
-  display_name: MacOS 10.12 SSL (Go 1.8)
+  display_name: MacOS 10.12 SSL (Go 1.10)
   run_on:
   - macos-1012
   expansions:
@@ -1501,7 +1501,7 @@ buildvariants:
     arch: "osx/x86_64"
     build_tags: "ssl openssl_pre_1.0"
     excludes: requires_many_files
-    gorootvars: 'PATH="/usr/local/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/usr/local/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
   tasks: *macos_1012_ssl_tasks
 
 #######################################
@@ -1509,21 +1509,21 @@ buildvariants:
 #######################################
 
 - name: rhel62
-  display_name: RHEL 6.2 (Go 1.8)
+  display_name: RHEL 6.2 (Go 1.10)
   run_on:
   - rhel62-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
 
 - name: rhel70
-  display_name: RHEL 7.0 (Go 1.8)
+  display_name: RHEL 7.0 (Go 1.10)
   run_on:
   - rhel70
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1533,11 +1533,11 @@ buildvariants:
 #######################################
 
 - name: suse12
-  display_name: SUSE 12 (Go 1.8)
+  display_name: SUSE 12 (Go 1.10)
   run_on:
   - suse12-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1547,7 +1547,7 @@ buildvariants:
 #######################################
 
 - name: ubuntu1404
-  display_name: Ubuntu 14.04 (Go 1.8)
+  display_name: Ubuntu 14.04 (Go 1.10)
   run_on:
   - ubuntu1404-test
   expansions:
@@ -1555,15 +1555,15 @@ buildvariants:
     <<: *mongo_default_startup_args
     mongo_os: "ubuntu1404"
     mongo_edition: "targeted"
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
-    build_tags: "ssl"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
     arch: "linux/x86_64"
     integration_test_args: integration
     resmoke_args: --jobs $(grep -c ^processor /proc/cpuinfo)
   tasks: *ubuntu1404_tasks
 
 - name: ubuntu1404-ssl
-  display_name: Ubuntu 14.04 SSL (Go 1.8)
+  display_name: Ubuntu 14.04 SSL (Go 1.10)
   run_on:
   - ubuntu1404-test
   expansions:
@@ -1571,7 +1571,7 @@ buildvariants:
     <<: *mongo_ssl_startup_args
     mongo_os: "ubuntu1404"
     mongo_edition: "enterprise"
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
     edition: ssl
     arch: "linux/x86_64"
@@ -1590,7 +1590,7 @@ buildvariants:
     <<: *mongo_default_startup_args
     mongo_os: "ubuntu1404"
     mongo_edition: "enterprise"
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "ssl sasl"
     smoke_use_ssl: --use-ssl
     resmoke_use_ssl: _ssl
@@ -1602,11 +1602,11 @@ buildvariants:
   tasks: *ubuntu1404_enterprise_tasks
 
 - name: ubuntu1604
-  display_name: Ubuntu 16.04 (Go 1.8)
+  display_name: Ubuntu 16.04 (Go 1.10)
   run_on:
   - ubuntu1604-test
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1616,7 +1616,7 @@ buildvariants:
 #######################################
 
 - name: windows-64
-  display_name: Windows 64-bit (Go 1.8)
+  display_name: Windows 64-bit (Go 1.10)
   run_on:
   - windows-64-vs2013-test
   expansions:
@@ -1629,11 +1629,11 @@ buildvariants:
     arch: "win32/x86_64"
     preproc_gpm: "perl -pi -e 's/\\r\\n/\\n/g' "
     integration_test_args: "integration"
-    gorootvars: 'PATH="/cygdrive/c/go1.8/go/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/go1.8/go"'
+    gorootvars: 'PATH="/cygdrive/c/golang/go1.10/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/golang/go1.10"'
   tasks: *windows_64_tasks
 
 - name: windows-64-ssl
-  display_name: Windows 64-bit SSL (Go 1.8)
+  display_name: Windows 64-bit SSL (Go 1.10)
   run_on:
   - windows-64-vs2013-compile
   expansions:
@@ -1649,13 +1649,13 @@ buildvariants:
     multiversion_override: "2.6"
     extension: .exe
     arch: "win32/x86_64"
-    gorootvars: 'PATH="/cygdrive/c/go1.8/go/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/go1.8/go"'
+    gorootvars: 'PATH="/cygdrive/c/golang/go1.10/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/golang/go1.10"'
     preproc_gpm: "perl -pi -e 's/\\r\\n/\\n/g' "
     integration_test_args: "integration,ssl"
   tasks: *windows_64_ssl_tasks
 
 - name: windows-64-enterprise
-  display_name: Windows 64-bit Enterprise (Go 1.8)
+  display_name: Windows 64-bit Enterprise (Go 1.10)
   run_on:
   - windows-64-vs2013-compile
   expansions:
@@ -1672,7 +1672,7 @@ buildvariants:
     edition: enterprise
     extension: .exe
     arch: "win32/x86_64"
-    gorootvars: 'PATH="/cygdrive/c/go1.8/go/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/go1.8/go"'
+    gorootvars: 'PATH="/cygdrive/c/golang/go1.10/bin:/cygdrive/c/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin:$PATH" GOROOT="c:/golang/go1.10"'
     preproc_gpm: "perl -pi -e 's/\\r\\n/\\n/g' "
     integration_test_args: "integration"
   tasks: *windows_64_enterprise_tasks
@@ -1682,7 +1682,7 @@ buildvariants:
 #######################################
 
 - name: ubuntu1604-arm64
-  display_name: ZAP ARM64 Ubuntu 16.04 SSL (gccgo 1.4)
+  display_name: ZAP ARM64 Ubuntu 16.04 SSL (Go 1.10)
   run_on:
   - ubuntu1604-arm64-small
   stepback: false
@@ -1693,10 +1693,9 @@ buildvariants:
     mongo_os: "ubuntu1604"
     mongo_edition: "targeted"
     mongo_arch: "arm64"
-    args: -gccgoflags "$(pkg-config --libs --cflags libcrypto libssl)"
     build_tags: "ssl"
     resmoke_use_ssl: _ssl
-    gorootvars: PATH="/opt/mongodbtoolchain/v2/bin/:$PATH"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/aarch64-mongodb-linux-gcc'
     excludes: requires_mmap_available,requires_large_ram,requires_mongo_24,requires_mongo_26,requires_mongo_30
     resmoke_args: -j 2
     multiversion_override: "skip"
@@ -1710,7 +1709,7 @@ buildvariants:
 #######################################
 
 - name: rhel71-ppc64le-enterprise
-  display_name: ZAP PPC64LE RHEL 7.1 Enterprise (Go 1.8)
+  display_name: ZAP PPC64LE RHEL 7.1 Enterprise (Go 1.10)
   run_on:
   - rhel71-power8-test
   stepback: false
@@ -1725,7 +1724,7 @@ buildvariants:
     #args: ... libsasl2; build_tags "sasl ssl"
     build_tags: 'ssl'
     resmoke_use_ssl: _ssl
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
     resmoke_args: -j 4
     excludes: requires_mmap_available,requires_large_ram,requires_mongo_24,requires_mongo_26,requires_mongo_30
     multiversion_override: "skip"
@@ -1736,14 +1735,14 @@ buildvariants:
   tasks: *rhel71_enterprise_tasks
 
 - name: ubuntu1604-ppc64le-enterprise
-  display_name: ZAP PPC64LE Ubuntu 16.04 Enterprise (Go 1.8)
+  display_name: ZAP PPC64LE Ubuntu 16.04 Enterprise (Go 1.10)
   run_on:
   - ubuntu1604-power8-test
   stepback: false
   batchtime: 10080 # weekly
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
-    build_tags: 'ssl'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/ppc64le-mongodb-linux-gcc'
+    build_tags: 'ssl sasl'
   tasks:
   - name: dist
 
@@ -1752,7 +1751,7 @@ buildvariants:
 #######################################
 
 - name: rhel67-s390x-enterprise
-  display_name: ZAP s390x RHEL 6.7 Enterprise (Go 1.8)
+  display_name: ZAP s390x RHEL 6.7 Enterprise (Go 1.10)
   run_on:
   - rhel67-zseries-test
   stepback: false
@@ -1777,7 +1776,7 @@ buildvariants:
     mongo_arch: "s390x"
     build_tags: "sasl ssl"
     resmoke_use_ssl: _ssl
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
     excludes: requires_mmap_available,requires_mongo_24,requires_mongo_26,requires_mongo_30
     resmoke_args: -j 2
     multiversion_override: "skip"
@@ -1800,13 +1799,13 @@ buildvariants:
   - name: dist
 
 - name: ubuntu1604-s390x-enterprise
-  display_name: ZAP s390x Ubuntu 16.04 Enterprise (Go 1.8)
+  display_name: ZAP s390x Ubuntu 16.04 Enterprise (Go 1.10)
   run_on:
   - ubuntu1604-zseries-small
   stepback: false
   batchtime: 10080 # weekly
   expansions:
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10 CC=/opt/mongodbtoolchain/v2/bin/s390x-mongodb-linux-gcc'
     build_tags: "sasl ssl"
   tasks:
   - name: dist
@@ -1818,7 +1817,7 @@ buildvariants:
 - name: ubuntu-race
   stepback: false
   batchtime: 1440 # daily
-  display_name: z Race Detector Ubuntu 14.04 (Go 1.8)
+  display_name: z Race Detector Ubuntu 14.04 (Go 1.10)
   run_on:
   - ubuntu1404-test
   expansions:
@@ -1826,8 +1825,8 @@ buildvariants:
     <<: *mongo_default_startup_args
     mongo_os: "ubuntu1404"
     mongo_edition: "enterprise"
-    gorootvars: 'PATH="/opt/go1.8/go/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/go1.8/go'
-    build_tags: "ssl"
+    gorootvars: 'PATH="/opt/golang/go1.10/bin:/opt/mongodbtoolchain/v2/bin/:$PATH" GOROOT=/opt/golang/go1.10'
+    build_tags: "sasl ssl"
     arch: "linux/x86_64"
     args: "-race"
     excludes: requires_large_ram
diff --git a/src/mongo/gotools/import.data b/src/mongo/gotools/import.data
index 1a899166fbd..6372c20bf10 100644
--- a/src/mongo/gotools/import.data
+++ b/src/mongo/gotools/import.data
@@ -1,5 +1,5 @@
 {
-    "commit": "1d8a1228671d09cdf31c9032ce53d2f0787e8cdf", 
+    "commit": "a486a2aad18c47a9bc6c16e65672690888210832", 
     "github": "mongodb/mongo-tools.git", 
     "vendor": "tools", 
     "branch": "v3.4"
diff --git a/src/mongo/gotools/mongoreplay/stat_format.go b/src/mongo/gotools/mongoreplay/stat_format.go
index ad64ef7bd95..613087fbc43 100644
--- a/src/mongo/gotools/mongoreplay/stat_format.go
+++ b/src/mongo/gotools/mongoreplay/stat_format.go
@@ -28,10 +28,10 @@ type OpStat struct {
 	Ns string `json:"ns,omitempty"`
 
 	// Data represents the payload of the request operation.
-	RequestData interface{} `json:"request_data, omitempty"`
+	RequestData interface{} `json:"request_data,omitempty"`
 
 	// Data represents the payload of the reply operation.
-	ReplyData interface{} `json:"reply_data, omitempty"`
+	ReplyData interface{} `json:"reply_data,omitempty"`
 
 	// NumReturned is the number of documents that were fetched as a result of this operation.
 	NumReturned int `json:"nreturned,omitempty"`
@@ -71,7 +71,7 @@ type OpStat struct {
 	// RequestID is the ID of the mongodb operation as taken from the header.
 	// The RequestID for a request operation is the same as the ResponseID for
 	// the corresponding reply, so this field will be the same for request/reply pairs.
-	RequestID int32 `json:"request_id, omitempty"`
+	RequestID int32 `json:"request_id,omitempty"`
 }
 
 // jsonGet retrieves serialized json req/res via the channel-like arg;