EVG-19926: Upgrade go version to 1.20, and distros to latest. (#145)

johndaniels · web-flow · commit 4c0bb7ed9da5 · 2023-05-23T17:07:23.000-04:00
diff --git a/docs.go b/docs.go
@@ -5,7 +5,7 @@ logging, as well as systemd's journal service, and other logging
 systems, Grip provides a number of very powerful logging
 abstractions in one high-level package.
 
-Logging Instances
+# Logging Instances
 
 The central type of the grip package is the Journaler type,
 instances of which provide distinct log capturing system. For ease,
@@ -14,15 +14,15 @@ parallel public methods that use an internal "standard" Jouernaler
 instance in the grip package, which has some defaults configured
 and may be sufficient for many use cases.
 
-Output
+# Output
 
 The send.Sender interface provides a way of changing the logging
 backend, and the send package provides a number of alternate
 implementations of logging systems, including: systemd's journal,
 logging to standard output, logging to a file, and generic syslog
 support.
 
-Messages
+# Messages
 
 The message.Composer interface is the representation of all
 messages. They are implemented to provide a raw structured form as
diff --git a/evergreen.yaml b/evergreen.yaml
@@ -131,47 +131,35 @@ tasks:
 #           Buildvariants             #
 #######################################
 buildvariants:
-  - name: race-detector
-    display_name: Race Detector (Arch Linux)
-    expansions:
-      GOROOT: /opt/golang/go1.16
-      RACE_DETECTOR: true
-    run_on:
-      - archlinux-new-small
-      - archlinux-new-large
-    tasks: [ ".test" ]
-
   - name: lint
     display_name: Lint
     expansions:
-      GOROOT: /opt/golang/go1.16
+      GOROOT: /opt/golang/go1.20
     run_on:
-      - archlinux-new-small
-      - archlinux-new-large
+      - ubuntu2204-small
     tasks: [ ".report" ]
 
   - name: ubuntu
-    display_name: Ubuntu 18.04
+    display_name: Ubuntu 22.04
     expansions:
-      GOROOT: /opt/golang/go1.16
+      GOROOT: /opt/golang/go1.20
+      RACE_DETECTOR: true
     run_on:
-      - ubuntu1804-small
-      - ubuntu1804-large
+      - ubuntu2204-small
     tasks: [ ".test" ]
 
   - name: macos
     display_name: macOS
     expansions:
-      GOROOT: /opt/golang/go1.16
+      GOROOT: /opt/golang/go1.20
     run_on:
-      - macos-1014
+      - macos-1100-arm64
     tasks: [ ".test" ]
 
   - name: windows
     display_name: Windows
     run_on:
-      - windows-64-vs2019-large
-      - windows-64-vs2017-large
+      - windows-vsCurrent-small
     expansions:
-      GOROOT: C:/golang/go1.16
+      GOROOT: C:/golang/go1.20
     tasks: [ ".test" ]
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/mongodb/grip
 
-go 1.16
+go 1.20
 
 require (
 	github.com/andygrunwald/go-jira v1.14.0
@@ -15,6 +15,29 @@ require (
 	github.com/trivago/tgo v1.0.7
 )
 
+require (
+	github.com/PuerkitoBio/rehttp v1.1.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/structs v1.1.0 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/golang-jwt/jwt v3.2.1+incompatible // indirect
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/jpillora/backoff v1.0.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	golang.org/x/net v0.0.0-20210510120150-4163338589ed // indirect
+	golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
+
 require (
 	github.com/evergreen-ci/utility v0.0.0-20230216205613-b8156d58f1e5
 	github.com/google/go-cmp v0.5.9 // indirect
diff --git a/loggers.go b/loggers.go
@@ -3,14 +3,14 @@ Basic Logging
 
 Loging helpers exist for the following levels:
 
-   Emergency + (fatal/panic)
-   Alert + (fatal/panic)
-   Critical + (fatal/panic)
-   Error + (fatal/panic)
-   Warning
-   Notice
-   Info
-   Debug
+	Emergency + (fatal/panic)
+	Alert + (fatal/panic)
+	Critical + (fatal/panic)
+	Error + (fatal/panic)
+	Warning
+	Notice
+	Info
+	Debug
 
 These methods accept both strings (message content,) or types that
 implement the message.MessageComposer interface. Composer types make
@@ -22,7 +22,7 @@ All levels also have additional methods with `ln` and `f` appended to
 the end of the method name which allow Println() and Printf() style
 functionality. You must pass printf/println-style arguments to these methods.
 
-Conditional Logging
+# Conditional Logging
 
 The Conditional logging methods take two arguments, a Boolean, and a
 message argument. Messages can be strings, objects that implement the
diff --git a/logging/general.go b/logging/general.go
@@ -3,18 +3,18 @@ Package logging provides the primary implementation of the Journaler
 interface (which is cloned in public functions in the grip interface
 itself.)
 
-Basic Logging
+# Basic Logging
 
 Loging helpers exist for the following levels:
 
-   Emergency + (fatal/panic)
-   Alert + (fatal/panic)
-   Critical + (fatal/panic)
-   Error + (fatal/panic)
-   Warning
-   Notice
-   Info
-   Debug
+	Emergency + (fatal/panic)
+	Alert + (fatal/panic)
+	Critical + (fatal/panic)
+	Error + (fatal/panic)
+	Warning
+	Notice
+	Info
+	Debug
 */
 package logging
 
diff --git a/makefile b/makefile
@@ -60,7 +60,7 @@ $(shell mkdir -p $(buildDir))
 
 # start lint setup targets
 $(buildDir)/golangci-lint:
-	@curl --retry 10 --retry-max-time 60 -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(buildDir) v1.40.0 >/dev/null 2>&1
+	@curl --retry 10 --retry-max-time 60 -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(buildDir) v1.51.2 >/dev/null 2>&1
 $(buildDir)/run-linter: cmd/run-linter/run-linter.go $(buildDir)/golangci-lint
 	$(gobin) build -o $@ $<
 # end lint setup targets
diff --git a/message/doc.go b/message/doc.go
@@ -2,7 +2,7 @@
 package message defines the Composer interface and a handful of
 implementations which represent the structure for messages produced by grip.
 
-Message Composers
+# Message Composers
 
 The Composer interface provides a common way to define messages, with
 two main goals:
diff --git a/message/fields.go b/message/fields.go
@@ -24,7 +24,7 @@ type fieldMessage struct {
 // used for attaching structured metadata to a build request. For
 // example:
 //
-//     message.Fields{"key0", <value>, "key1", <value>}
+//	message.Fields{"key0", <value>, "key1", <value>}
 type Fields map[string]interface{}
 
 // NewFieldsMessage creates a fully configured Composer instance that
diff --git a/recovery/recovery.go b/recovery/recovery.go
@@ -46,8 +46,7 @@ func LogStackTraceAndExit(opDetails ...string) {
 //
 // Use in a common defer statement, such as:
 //
-//    defer recovery.LogStackTraceAndContinue("operation")
-//
+//	defer recovery.LogStackTraceAndContinue("operation")
 func LogStackTraceAndContinue(opDetails ...string) {
 	if p := recover(); p != nil {
 		logAndContinue(p, logging.MakeGrip(grip.GetSender()), message.MakeFields(getMessage(opDetails)))
@@ -62,13 +61,12 @@ func LogStackTraceAndContinue(opDetails ...string) {
 //
 // You must construct a recovery function as in the following example:
 //
-//     defer func() { err = recovery.HandlePanicWithError(recover(),  err, "op") }()
+//	defer func() { err = recovery.HandlePanicWithError(recover(),  err, "op") }()
 //
 // This defer statement must occur in a function that declares a
 // default error return value as in:
 //
-//     func operation() (err error) {}
-//
+//	func operation() (err error) {}
 func HandlePanicWithError(p interface{}, err error, opDetails ...string) error {
 	catcher := grip.NewSimpleCatcher()
 	catcher.Add(err)
diff --git a/send/buildlogger.go b/send/buildlogger.go
@@ -116,11 +116,11 @@ func (c *BuildloggerConfig) SetCredentials(username, password string) {
 // buildlogger terminology. Then, set set the CreateTest attribute,
 // and generate additional per-test senders. For example:
 //
-//    conf := GetBuildloggerConfig()
-//    global := MakeBuildlogger("<name>-global", conf)
-//    // ... use global
-//    conf.CreateTest = true
-//    testOne := MakeBuildlogger("<name>-testOne", conf)
+//	conf := GetBuildloggerConfig()
+//	global := MakeBuildlogger("<name>-global", conf)
+//	// ... use global
+//	conf.CreateTest = true
+//	testOne := MakeBuildlogger("<name>-testOne", conf)
 func GetBuildloggerConfig() (*BuildloggerConfig, error) {
 	conf := &BuildloggerConfig{
 		URL:     os.Getenv("BULDLOGGER_URL"),
diff --git a/send/call_site.go b/send/call_site.go
@@ -20,10 +20,10 @@ indirection.
 
 Create a call site logger with one of the following constructors:
 
-   NewCallSiteConsoleLogger(<name>, <depth>, <LevelInfo>)
-   MakeCallSiteConsoleLogger(<depth>)
-   NewCallSiteFileLogger(<name>, <fileName>, <depth>, <LevelInfo>)
-   MakeCallSiteFileLogger(<fileName>, <depth>)
+	NewCallSiteConsoleLogger(<name>, <depth>, <LevelInfo>)
+	MakeCallSiteConsoleLogger(<depth>)
+	NewCallSiteFileLogger(<name>, <fileName>, <depth>, <LevelInfo>)
+	MakeCallSiteFileLogger(<fileName>, <depth>)
 */
 package send
 
diff --git a/send/formatter.go b/send/formatter.go
@@ -38,7 +38,7 @@ func MakeJSONFormatter() MessageFormatter {
 // MakeDefaultFormatter returns a MessageFormatter that will produce a
 // message in the following format:
 //
-//     [p=<level>]: <message>
+//	[p=<level>]: <message>
 //
 // It can never error.
 func MakeDefaultFormatter() MessageFormatter {
@@ -58,7 +58,7 @@ func MakePlainFormatter() MessageFormatter {
 // MakeCallSiteFormatter returns a MessageFormater that formats
 // messages with the following format:
 //
-//     [p=<levvel>] [<fileName>:<lineNumber>]: <message>
+//	[p=<levvel>] [<fileName>:<lineNumber>]: <message>
 //
 // It can never error.
 func MakeCallSiteFormatter(depth int) MessageFormatter {
@@ -69,10 +69,10 @@ func MakeCallSiteFormatter(depth int) MessageFormatter {
 	}
 }
 
-//MakeXMPPFormatter returns a MessageFormatter that will produce
+// MakeXMPPFormatter returns a MessageFormatter that will produce
 // messages in the following format, used primarily by the xmpp logger:
 //
-//     [<name>] (p=<priority>) <message>
+//	[<name>] (p=<priority>) <message>
 //
 // It can never error.
 func MakeXMPPFormatter(name string) MessageFormatter {
diff --git a/send/smtp.go b/send/smtp.go
@@ -283,8 +283,11 @@ func (o *SMTPOptions) Validate() error {
 	return nil
 }
 
-/* Connects an SMTP server (usually localhost:25 in prod) and uses that to
-   send an email with the body encoded in base64. */
+/*
+Connects an SMTP server (usually localhost:25 in prod) and uses that to
+
+	send an email with the body encoded in base64.
+*/
 func (o *SMTPOptions) sendMail(m message.Composer) error {
 	o.mutex.Lock()
 	defer o.mutex.Unlock()
diff --git a/send/splunk.go b/send/splunk.go
@@ -37,9 +37,9 @@ type SplunkConnectionInfo struct {
 // GetSplunkConnectionInfo builds a SplunkConnectionInfo structure
 // reading default values from the following environment variables:
 //
-//		GRIP_SPLUNK_SERVER_URL
-//		GRIP_SPLUNK_CLIENT_TOKEN
-//		GRIP_SPLUNK_CHANNEL
+//	GRIP_SPLUNK_SERVER_URL
+//	GRIP_SPLUNK_CLIENT_TOKEN
+//	GRIP_SPLUNK_CHANNEL
 func GetSplunkConnectionInfo() SplunkConnectionInfo {
 	return SplunkConnectionInfo{
 		ServerURL: os.Getenv(splunkServerURL),
@@ -160,9 +160,9 @@ func buildSplunkLogger(name string, client *http.Client, info SplunkConnectionIn
 // MakeSplunkLogger constructs a new Sender implementation that reads
 // the hostname, username, and password from environment variables:
 //
-//		GRIP_SPLUNK_SERVER_URL
-//		GRIP_SPLUNK_CLIENT_TOKEN
-//		GRIP_SPLUNK_CLIENT_CHANNEL
+//	GRIP_SPLUNK_SERVER_URL
+//	GRIP_SPLUNK_CLIENT_TOKEN
+//	GRIP_SPLUNK_CLIENT_CHANNEL
 func MakeSplunkLogger(name string) (Sender, error) {
 	info := GetSplunkConnectionInfo()
 	if err := info.validateFromEnv(); err != nil {
diff --git a/send/standard_linux.go b/send/standard_linux.go
@@ -1,4 +1,4 @@
-// +build linux
+//go:build linux
 
 package send
 
diff --git a/send/standard_other.go b/send/standard_other.go
@@ -1,4 +1,4 @@
-// +build !linux
+//go:build !linux
 
 package send
 
diff --git a/send/xmpp.go b/send/xmpp.go
@@ -37,9 +37,9 @@ const (
 // GetXMPPConnectionInfo builds an XMPPConnectionInfo structure
 // reading default values from the following environment variables:
 //
-//    GRIP_XMPP_HOSTNAME
-//    GRIP_XMPP_USERNAME
-//    GRIP_XMPP_PASSWORD
+//	GRIP_XMPP_HOSTNAME
+//	GRIP_XMPP_USERNAME
+//	GRIP_XMPP_PASSWORD
 func GetXMPPConnectionInfo() XMPPConnectionInfo {
 	return XMPPConnectionInfo{
 		Hostname: os.Getenv(xmppHostEnvVar),
@@ -65,9 +65,9 @@ func NewXMPPLogger(name, target string, info XMPPConnectionInfo, l LevelInfo) (S
 // MakeXMPP constructs an XMPP logging backend that reads the
 // hostname, username, and password from environment variables:
 //
-//    - GRIP_XMPP_HOSTNAME
-//    - GRIP_XMPP_USERNAME
-//    - GRIP_XMPP_PASSWORD
+//   - GRIP_XMPP_HOSTNAME
+//   - GRIP_XMPP_USERNAME
+//   - GRIP_XMPP_PASSWORD
 //
 // The instance is otherwise unconquered. Call SetName or inject it
 // into a Journaler instance using SetSender before using.
@@ -85,9 +85,9 @@ func MakeXMPP(target string) (Sender, error) {
 // NewXMPP constructs an XMPP logging backend that reads the
 // hostname, username, and password from environment variables:
 //
-//    - GRIP_XMPP_HOSTNAME
-//    - GRIP_XMPP_USERNAME
-//    - GRIP_XMPP_PASSWORD
+//   - GRIP_XMPP_HOSTNAME
+//   - GRIP_XMPP_USERNAME
+//   - GRIP_XMPP_PASSWORD
 //
 // Otherwise, the semantics of NewXMPPDefault are the same as NewXMPPLogger.
 func NewXMPP(name, target string, l LevelInfo) (Sender, error) {
diff --git a/slogger/logger.go b/slogger/logger.go
