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

[ASCII-2487][automated] Update Go version to 1.23.3 #31022

Merged
merged 31 commits into from
Dec 4, 2024
Merged

[ASCII-2487][automated] Update Go version to 1.23.3 #31022

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ee1c053
Update Go version to 1.23.3
agent-platform-auto-pr[bot] Nov 13, 2024
b8add43
Upgrading golangci-lint to a version that support go 1.23
ogaca-dd Nov 14, 2024
c247c38
SA1006: printf-style function with dynamic format string and no furt…
ogaca-dd Nov 14, 2024
78969ed
SA6006: use io.Writer.Write instead of converting from []byte to stri…
ogaca-dd Nov 14, 2024
f4985bf
SA4032: due to the file's build constraints, runtime.GOOS will never …
ogaca-dd Nov 14, 2024
d965601
should omit nil check; len() for ZXW is defined as zero (gosimple)
ogaca-dd Nov 14, 2024
8a01346
SA1019: reflect.PtrTo has been deprecated since Go 1.22 and an altern…
ogaca-dd Nov 14, 2024
43e6b35
ast.Object is deprecated
ogaca-dd Nov 14, 2024
eac248b
run inv tidy
ogaca-dd Nov 14, 2024
db13a48
Run inv -e go-deps.generate
ogaca-dd Nov 14, 2024
94dbcb7
SA4032: due to the file's build constraints, runtime.GOOS will never …
ogaca-dd Nov 14, 2024
33fcc01
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 15, 2024
78b8e88
Add missing argument.
ogaca-dd Nov 15, 2024
fdd507d
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 18, 2024
d5455a3
Merge from main
ogaca-dd Nov 20, 2024
2b1aec8
Gofmt on dump.go
ogaca-dd Nov 20, 2024
9862d7f
Fix provide_comp_test
ogaca-dd Nov 20, 2024
54a777c
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 21, 2024
01dee20
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 22, 2024
21a5def
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 25, 2024
4e6870a
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 25, 2024
b2d38f9
SA4032: due to the file's build constraints, runtime.GOOS will never …
ogaca-dd Nov 25, 2024
e3fd90f
Fix typos
ogaca-dd Nov 25, 2024
ec082c8
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Nov 29, 2024
5284303
Go mod tidy
ogaca-dd Nov 29, 2024
f227cb1
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Dec 3, 2024
50c94ad
Merge branch 'main' of github.com:DataDog/datadog-agent into buildima…
ogaca-dd Dec 3, 2024
cf84285
run inv generate-licenses
ogaca-dd Dec 3, 2024
2c6c36f
Use latest image
ogaca-dd Dec 4, 2024
5cbbf2a
Use the correct build image tag
ogaca-dd Dec 4, 2024
0fde371
Fix circleci image
ogaca-dd Dec 4, 2024
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 .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ experimental:
templates:
job_template: &job_template
docker:
- image: gcr.io/datadoghq/agent-circleci-runner:v48372186-ff395e52
- image: gcr.io/datadoghq/agent-circleci-runner_test_only:v48883349-6ba172ff
environment:
USE_SYSTEM_LIBS: "1"
working_directory: /go/src/github.com/DataDog/datadog-agent
Expand Down
2 changes: 1 addition & 1 deletion .custom-gcl.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: v1.59.1
version: v1.60.3

name: golangci-lint

Expand Down
88 changes: 44 additions & 44 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,51 +172,51 @@ variables:
# Build images versions
# To use images from datadog-agent-buildimages dev branches, set the corresponding
# SUFFIX variable to _test_only
DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BUILDIMAGES: v48372186-ff395e52
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_WINBUILDIMAGES: v48372186-ff395e52
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_ARMBUILDIMAGES: v48372186-ff395e52
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48372186-ff395e52
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48372186-ff395e52
DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_BUILDIMAGES: v48883349-6ba172ff
DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_WINBUILDIMAGES: v48883349-6ba172ff
DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_ARMBUILDIMAGES: v48883349-6ba172ff
DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48883349-6ba172ff
DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only"
DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48883349-6ba172ff
# New images to enable different version per image - not used yet
CI_IMAGE_BTF_GEN: v48372186-ff395e52
CI_IMAGE_BTF_GEN_SUFFIX: ""
CI_IMAGE_DEB_X64: v48372186-ff395e52
CI_IMAGE_DEB_X64_SUFFIX: ""
CI_IMAGE_DEB_ARM64: v48372186-ff395e52
CI_IMAGE_DEB_ARM64_SUFFIX: ""
CI_IMAGE_DEB_ARMHF: v48372186-ff395e52
CI_IMAGE_DEB_ARMHF_SUFFIX: ""
CI_IMAGE_DD_AGENT_TESTING: v48372186-ff395e52
CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
CI_IMAGE_DOCKER_X64: v48372186-ff395e52
CI_IMAGE_DOCKER_X64_SUFFIX: ""
CI_IMAGE_DOCKER_ARM64: v48372186-ff395e52
CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
CI_IMAGE_GITLAB_AGENT_DEPLOY: v48372186-ff395e52
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
CI_IMAGE_LINUX_GLIBC_2_17_X64: v48372186-ff395e52
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48372186-ff395e52
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
CI_IMAGE_SYSTEM_PROBE_X64: v48372186-ff395e52
CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
CI_IMAGE_SYSTEM_PROBE_ARM64: v48372186-ff395e52
CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
CI_IMAGE_RPM_X64: v48372186-ff395e52
CI_IMAGE_RPM_X64_SUFFIX: ""
CI_IMAGE_RPM_ARM64: v48372186-ff395e52
CI_IMAGE_RPM_ARM64_SUFFIX: ""
CI_IMAGE_RPM_ARMHF: v48372186-ff395e52
CI_IMAGE_RPM_ARMHF_SUFFIX: ""
CI_IMAGE_WIN_1809_X64: v48372186-ff395e52
CI_IMAGE_WIN_1809_X64_SUFFIX: ""
CI_IMAGE_WIN_LTSC2022_X64: v48372186-ff395e52
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
CI_IMAGE_BTF_GEN: v48883349-6ba172ff
CI_IMAGE_BTF_GEN_SUFFIX: "_test_only"
CI_IMAGE_DEB_X64: v48883349-6ba172ff
CI_IMAGE_DEB_X64_SUFFIX: "_test_only"
CI_IMAGE_DEB_ARM64: v48883349-6ba172ff
CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only"
CI_IMAGE_DEB_ARMHF: v48883349-6ba172ff
CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only"
CI_IMAGE_DD_AGENT_TESTING: v48883349-6ba172ff
CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only"
CI_IMAGE_DOCKER_X64: v48883349-6ba172ff
CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only"
CI_IMAGE_DOCKER_ARM64: v48883349-6ba172ff
CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only"
CI_IMAGE_GITLAB_AGENT_DEPLOY: v48883349-6ba172ff
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only"
CI_IMAGE_LINUX_GLIBC_2_17_X64: v48883349-6ba172ff
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only"
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48883349-6ba172ff
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only"
CI_IMAGE_SYSTEM_PROBE_X64: v48883349-6ba172ff
CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only"
CI_IMAGE_SYSTEM_PROBE_ARM64: v48883349-6ba172ff
CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only"
CI_IMAGE_RPM_X64: v48883349-6ba172ff
CI_IMAGE_RPM_X64_SUFFIX: "_test_only"
CI_IMAGE_RPM_ARM64: v48883349-6ba172ff
CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only"
CI_IMAGE_RPM_ARMHF: v48883349-6ba172ff
CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only"
CI_IMAGE_WIN_1809_X64: v48883349-6ba172ff
CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only"
CI_IMAGE_WIN_LTSC2022_X64: v48883349-6ba172ff
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only"

DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded
DEB_GPG_KEY_ID: c0962c7d
Expand Down
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.22.8
1.23.3
2 changes: 1 addition & 1 deletion .wwhrd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ exceptions:

additional:
# list here paths to additional licenses
golang/go: "raw.githubusercontent.com/golang/go/go1.22.8/LICENSE"
golang/go: "raw.githubusercontent.com/golang/go/go1.23.3/LICENSE"
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.22 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
* [Go](https://golang.org/doc/install) 1.23 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path.
* Python 3.11+ 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.
Expand Down
2 changes: 1 addition & 1 deletion cmd/process-agent/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ See the [Live Processes docs](https://docs.datadoghq.com/graphing/infrastructure

Pre-requisites:

* `go >= 1.22`
* `go >= 1.23`
* `invoke`

Check out the repo in your `$GOPATH`
Expand Down
7 changes: 5 additions & 2 deletions cmd/serverless/dependencies_linux_amd64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ crypto/internal/boring/bbig
crypto/internal/boring/sig
crypto/internal/edwards25519
crypto/internal/edwards25519/field
crypto/internal/hpke
crypto/internal/mlkem768
crypto/internal/nistec
crypto/internal/nistec/fiat
crypto/internal/randutil
Expand Down Expand Up @@ -1078,6 +1080,7 @@ html/template
io
io/fs
io/ioutil
iter
k8s.io/apimachinery/pkg/runtime/schema
k8s.io/apimachinery/pkg/util/sets
log
Expand Down Expand Up @@ -1120,10 +1123,8 @@ regexp/syntax
runtime
runtime/cgo
runtime/debug
runtime/internal/atomic
runtime/internal/math
runtime/internal/sys
runtime/internal/syscall
runtime/metrics
runtime/pprof
runtime/trace
Expand All @@ -1142,6 +1143,7 @@ time
unicode
unicode/utf16
unicode/utf8
unique
unsafe
vendor/golang.org/x/crypto/chacha20
vendor/golang.org/x/crypto/chacha20poly1305
Expand All @@ -1150,6 +1152,7 @@ vendor/golang.org/x/crypto/cryptobyte/asn1
vendor/golang.org/x/crypto/hkdf
vendor/golang.org/x/crypto/internal/alias
vendor/golang.org/x/crypto/internal/poly1305
vendor/golang.org/x/crypto/sha3
vendor/golang.org/x/net/dns/dnsmessage
vendor/golang.org/x/net/http/httpguts
vendor/golang.org/x/net/http/httpproxy
Expand Down
8 changes: 6 additions & 2 deletions cmd/serverless/dependencies_linux_arm64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ crypto/internal/boring/bbig
crypto/internal/boring/sig
crypto/internal/edwards25519
crypto/internal/edwards25519/field
crypto/internal/hpke
crypto/internal/mlkem768
crypto/internal/nistec
crypto/internal/nistec/fiat
crypto/internal/randutil
Expand Down Expand Up @@ -1077,6 +1079,7 @@ html/template
io
io/fs
io/ioutil
iter
k8s.io/apimachinery/pkg/runtime/schema
k8s.io/apimachinery/pkg/util/sets
log
Expand Down Expand Up @@ -1119,10 +1122,8 @@ regexp/syntax
runtime
runtime/cgo
runtime/debug
runtime/internal/atomic
runtime/internal/math
runtime/internal/sys
runtime/internal/syscall
runtime/metrics
runtime/pprof
runtime/trace
Expand All @@ -1141,6 +1142,7 @@ time
unicode
unicode/utf16
unicode/utf8
unique
unsafe
vendor/golang.org/x/crypto/chacha20
vendor/golang.org/x/crypto/chacha20poly1305
Expand All @@ -1149,11 +1151,13 @@ vendor/golang.org/x/crypto/cryptobyte/asn1
vendor/golang.org/x/crypto/hkdf
vendor/golang.org/x/crypto/internal/alias
vendor/golang.org/x/crypto/internal/poly1305
vendor/golang.org/x/crypto/sha3
vendor/golang.org/x/net/dns/dnsmessage
vendor/golang.org/x/net/http/httpguts
vendor/golang.org/x/net/http/httpproxy
vendor/golang.org/x/net/http2/hpack
vendor/golang.org/x/net/idna
vendor/golang.org/x/sys/cpu
vendor/golang.org/x/text/secure/bidirule
vendor/golang.org/x/text/transform
vendor/golang.org/x/text/unicode/bidi
Expand Down
2 changes: 1 addition & 1 deletion comp/core/log/impl-trace/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/datadog-agent/comp/core/log/impl-trace

go 1.22.0
go 1.23.0

replace (
github.com/DataDog/datadog-agent/comp/api/api/def => ../../../api/api/def
Expand Down
2 changes: 1 addition & 1 deletion comp/core/status/statusimpl/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/DataDog/datadog-agent/comp/core/status/statusimpl

go 1.22.0
go 1.23.0

replace (
github.com/DataDog/datadog-agent/comp/api/api/def => ../../../api/api/def
Expand Down
2 changes: 1 addition & 1 deletion comp/languagedetection/client/clientimpl/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ func getContainerInfoFromPod(cid string, pod *workloadmeta.KubernetesPod) (strin
}

func podHasOwner(pod *workloadmeta.KubernetesPod) bool {
return pod.Owners != nil && len(pod.Owners) > 0
return len(pod.Owners) > 0
}
2 changes: 1 addition & 1 deletion comp/netflow/payload/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module github.com/DataDog/datadog-agent/comp/netflow/payload

go 1.22.0
go 1.23.0
2 changes: 1 addition & 1 deletion devenv/scripts/Install-DevEnv.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
$ErrorActionPreference = 'Stop'
$ProgressPreference = 'SilentlyContinue'

$go_version = "1.22.8"
$go_version = "1.23.3"
Write-Host -ForegroundColor Green "Installing go $go_version"

$gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip"
Expand Down
4 changes: 2 additions & 2 deletions docs/dev/agent_dev_env.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ This procedure ensures you not only get the correct version of `invoke`, but als

### Golang

You must [install Golang](https://golang.org/doc/install) version `1.22.8` or
higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
You must [install Golang](https://golang.org/doc/install) version `1.23.3` or
Copy link
Contributor

Choose a reason for hiding this comment

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

Recommend using "later" instead of "higher"

later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
cannot use any additional tool it might need.

**Please note that versions of Golang that aren't an exact match to the version
Expand Down
2 changes: 1 addition & 1 deletion docs/public/setup.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als

### Golang

You must [install Golang](https://golang.org/doc/install) version `1.22.8` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need.
You must [install Golang](https://golang.org/doc/install) version `1.23.3` or later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need.

!!! note
Versions of Golang that aren't an exact match to the version specified in our build images (see e.g. [here](https://github.com/DataDog/datadog-agent-buildimages/blob/c025473ee467ee6d884d532e4c12c7d982ce8fe1/circleci/Dockerfile#L43)) may not be able to build the agent and/or the [rtloader](https://github.com/DataDog/datadog-agent/tree/main/rtloader) binary properly.
Expand Down
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/DataDog/datadog-agent

go 1.22.1

toolchain go1.22.8
go 1.23.0

// 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)
Expand Down
Loading
Loading