Update to Go1.18.5

* builds from DataDog/datadog-agent-buildimages#270 * builds from https://github.com/DataDog/datadog-agent-builders/pull/224 * already using the new macos build image
DataDog · Aug 25, 2022 · eae9a2a · eae9a2a
1 parent 52a3560
commit eae9a2a
Show file tree

Hide file tree

Showing 25 changed files with 44 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: datadog/datadog-agent-runner-circle:go11711
+      - image: datadog/datadog-agent-runner-circle:go1185
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

diff --git a/.circleci/images/runner/Dockerfile b/.circleci/images/runner/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex \
         ssh
 
 # Golang
-ENV GIMME_GO_VERSION 1.17.11
+ENV GIMME_GO_VERSION 1.18.5
 ENV GOROOT /root/.gimme/versions/go$GIMME_GO_VERSION.linux.amd64
 ENV GOPATH /go
 ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -139,12 +139,12 @@ variables:
   S3_DSD6_URI: s3://dsd6-staging
   RELEASE_VERSION_6: nightly
   RELEASE_VERSION_7: nightly-a7
-  DATADOG_AGENT_BUILDIMAGES: v9405677-746a71d
-  DATADOG_AGENT_BUILDERS: v8333476-cd1c34b
-  DATADOG_AGENT_WINBUILDIMAGES: v9405677-746a71d
-  DATADOG_AGENT_ARMBUILDIMAGES: v9405677-746a71d
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v8364396-f91ff4f
-  DATADOG_AGENT_NIKOS_BUILDIMAGES:  v8364396-f91ff4f
+  DATADOG_AGENT_BUILDIMAGES: v9472974-a8f8b46
+  DATADOG_AGENT_BUILDERS: v9531714-74df2d8
+  DATADOG_AGENT_WINBUILDIMAGES: v9472974-a8f8b46
+  DATADOG_AGENT_ARMBUILDIMAGES: v9472974-a8f8b46
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v9472974-a8f8b46
+  DATADOG_AGENT_NIKOS_BUILDIMAGES:  v9472974-a8f8b46
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
   DOCKER_X64_BUILDER: v2718644-9ce6565-18.09.6-py3
   NIKOS_INSTALL_DIR: /opt/datadog-agent/embedded/nikos

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.17.11
+1.18.5
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ and development, is located under [the docs directory](docs) of the present repo
 ## Getting started
 
 To build the Agent you need:
- * [Go](https://golang.org/doc/install) 1.17 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
+ * [Go](https://golang.org/doc/install) 1.18 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
  * Python 3.7+ along with development libraries for tooling. You will also need Python 2.7 if you are building the Agent with Python 2 support.
  * Python dependencies. You may install these with `pip install -r requirements.txt`
    This will also pull in [Invoke](http://www.pyinvoke.org) if not yet installed.

diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1
@@ -45,11 +45,11 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
 $ErrorActionPreference = 'Stop'
 $ProgressPreference = 'SilentlyContinue'
 
-Write-Host -ForegroundColor Green "Installing go 1.17.11"
+Write-Host -ForegroundColor Green "Installing go 1.18.5"
 
-$gozip = "https://dl.google.com/go/go1.17.11.windows-amd64.zip"
+$gozip = "https://dl.google.com/go/go1.18.5.windows-amd64.zip"
 if ($Env:TARGET_ARCH -eq "x86") {
-    $gozip = "https://dl.google.com/go/go1.17.11.windows-386.zip"
+    $gozip = "https://dl.google.com/go/go1.18.5.windows-386.zip"
 }
 
 $out = 'c:\go.zip'

diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md
@@ -93,7 +93,7 @@ variables (see Invoke docs for more details).
 
 ## Golang
 
-You must [install Golang](https://golang.org/doc/install) version `1.17.11` or
+You must [install Golang](https://golang.org/doc/install) version `1.18.5` or
 higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
 cannot use any additional tool it might need.
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent
 
-go 1.17
+go 1.18
 
 // v0.8.0 was tagged long ago, and appared on pkg.go.dev.  We do not want any tagged version
 // to appear there.  The trick to accomplish this is to make a new version (in this case v0.9.0)

diff --git a/internal/tools/go.mod b/internal/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/internal/tools
 
-go 1.17
+go 1.18
 
 require (
 	github.com/frapposelli/wwhrd v0.4.0

diff --git a/internal/tools/independent-lint/go.mod b/internal/tools/independent-lint/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/cmd/independent-lint
 
-go 1.17
+go 1.18
 
 require golang.org/x/mod v0.5.1
 

diff --git a/internal/tools/modparser/go.mod b/internal/tools/modparser/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/internal/tools/modparser
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.7.0

diff --git a/internal/tools/modparser/testdata/match/go.mod b/internal/tools/modparser/testdata/match/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/internal/tools/modparser/testdata/match
 
-go 1.17
+go 1.18
 
 require (
     github.com/DataDog/datadog-agent/pkg/test v0.65.3

diff --git a/internal/tools/modparser/testdata/nomatch/go.mod b/internal/tools/modparser/testdata/nomatch/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/internal/tools/modparser/testdata/nomatch
 
-go 1.17
+go 1.18
 
 require (
     github.com/DataDog/datadog-not-agent/pkg/test v0.65.3

diff --git a/internal/tools/proto/go.mod b/internal/tools/proto/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/internal/tools/proto
 
-go 1.17
+go 1.18
 
 require (
 	github.com/golang/mock v1.5.0

diff --git a/pkg/dogstatsd/batch.go b/pkg/dogstatsd/batch.go
@@ -3,6 +3,7 @@
 // This product includes software developed at Datadog (https://www.datadoghq.com/).
 // Copyright 2016-present Datadog, Inc.
 
+// Package dogstatsd implements DogStatsD.
 package dogstatsd
 
 import (

diff --git a/pkg/dogstatsd/parse_events.go b/pkg/dogstatsd/parse_events.go
@@ -8,6 +8,7 @@ package dogstatsd
 import (
 	"bytes"
 	"fmt"
+	"math"
 
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )
@@ -92,9 +93,7 @@ func parseHeader(rawHeader []byte) (eventHeader, error) {
 
 	// Convert title length to workable type and do a basic validity check on value
 	titleLength, err := parseInt64(rawTitleLength)
-	// Before Go 1.17, we can use the following trick to define MaxInt
-	const MaxInt = ^uint(0) >> 1
-	if err != nil || titleLength < 0 || titleLength > int64(MaxInt) {
+	if err != nil || titleLength < 0 || titleLength > int64(math.MaxInt) {
 		return eventHeader{}, fmt.Errorf("invalid event header: %q", rawHeader)
 	}
 
@@ -105,7 +104,7 @@ func parseHeader(rawHeader []byte) (eventHeader, error) {
 
 	// Convert text length to workable type and do a basic validity check on value
 	textLength, err := parseInt64(rawTextLength)
-	if err != nil || textLength < 0 || textLength > int64(MaxInt) {
+	if err != nil || textLength < 0 || textLength > int64(math.MaxInt) {
 		return eventHeader{}, fmt.Errorf("invalid event header: %q", rawHeader)
 	}
 

diff --git a/pkg/otlp/model/go.mod b/pkg/otlp/model/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/otlp/model
 
-go 1.17
+go 1.18
 
 replace github.com/DataDog/datadog-agent/pkg/quantile => ../../quantile
 

diff --git a/pkg/quantile/go.mod b/pkg/quantile/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/quantile
 
-go 1.17
+go 1.18
 
 require (
 	github.com/DataDog/sketches-go v1.4.1

diff --git a/pkg/remoteconfig/state/go.mod b/pkg/remoteconfig/state/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/remoteconfig/state
 
-go 1.17
+go 1.18
 
 require (
 	github.com/stretchr/testify v1.7.1

diff --git a/pkg/security/secl/go.mod b/pkg/security/secl/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/security/secl
 
-go 1.17
+go 1.18
 
 require (
 	github.com/Masterminds/semver v1.5.0

diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/pkg/trace
 
-go 1.17
+go 1.18
 
 // NOTE: Prefer using simple `require` directives instead of using `replace` if possible.
 // See https://github.com/DataDog/datadog-agent/blob/main/docs/dev/gomodreplace.md

diff --git a/releasenotes/notes/go1185-fd9d8b88c7c7a12e.yaml b/releasenotes/notes/go1185-fd9d8b88c7c7a12e.yaml
@@ -0,0 +1,11 @@
+# Each section from every release note are combined when the
+# CHANGELOG.rst is rendered. So the text needs to be worded so that
+# it does not depend on any information only available in another
+# section. This may mean repeating some details, but each section
+# must be readable independently of the other.
+#
+# Each section note must be formatted as reStructuredText.
+---
+enhancements:
+  - |
+    Agents are now built with Go 1.18.5.
diff --git a/test/e2e/containers/otlp_sender/go.mod b/test/e2e/containers/otlp_sender/go.mod
@@ -1,6 +1,6 @@
 module github.com/DataDog/datadog-agent/tests/e2e/containers/otlp_sender
 
-go 1.17
+go 1.18
 
 require (
 	go.opentelemetry.io/collector v0.51.0

diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile
@@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf
 RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim
 
 # Install go
-RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.17.11.linux-amd64.tar.gz
+RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.18.5.linux-amd64.tar.gz
 RUN tar xzvf golang.tgz
 RUN ln -s /go /goroot
 

diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod
@@ -5,7 +5,7 @@
 
 module github.com/DataDog/datadog-agent/tools/retry_file_dump
 
-go 1.17
+go 1.18
 
 require github.com/golang/protobuf v1.4.3
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ @@
     module github.com/DataDog/datadog-agent/tools/retry_file_dump
-    go 1.17
+    go 1.18
     require github.com/golang/protobuf v1.4.3
@@ Expand Down @@