Skip to content

Commit bf034f5

Browse files
github-actions[bot]jeremy-hannaEnzu83pgimalac
authored
[automated] Update Go version to 1.24.5 (#38835)
Co-authored-by: jeremy-hanna <[email protected]> Co-authored-by: Enzu83 <[email protected]> Co-authored-by: pgimalac <[email protected]>
1 parent e34cf6f commit bf034f5

File tree

15 files changed

+32
-24
lines changed

15 files changed

+32
-24
lines changed

.gitlab-ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -167,31 +167,31 @@ variables:
167167
# Build images versions
168168
# To use images from datadog-agent-buildimages dev branches, set the corresponding
169169
# SUFFIX variable to
170-
CI_IMAGE_BTF_GEN: v69766501-45da1c0b
170+
CI_IMAGE_BTF_GEN: v70289801-3a61ff42
171171
CI_IMAGE_BTF_GEN_SUFFIX: ""
172-
CI_IMAGE_DEB_X64: v69766501-45da1c0b
172+
CI_IMAGE_DEB_X64: v70289801-3a61ff42
173173
CI_IMAGE_DEB_X64_SUFFIX: ""
174-
CI_IMAGE_DEB_ARM64: v69766501-45da1c0b
174+
CI_IMAGE_DEB_ARM64: v70289801-3a61ff42
175175
CI_IMAGE_DEB_ARM64_SUFFIX: ""
176-
CI_IMAGE_DEB_ARMHF: v69766501-45da1c0b
176+
CI_IMAGE_DEB_ARMHF: v70289801-3a61ff42
177177
CI_IMAGE_DEB_ARMHF_SUFFIX: ""
178-
CI_IMAGE_DOCKER_X64: v69766501-45da1c0b
178+
CI_IMAGE_DOCKER_X64: v70289801-3a61ff42
179179
CI_IMAGE_DOCKER_X64_SUFFIX: ""
180-
CI_IMAGE_DOCKER_ARM64: v69766501-45da1c0b
180+
CI_IMAGE_DOCKER_ARM64: v70289801-3a61ff42
181181
CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
182-
CI_IMAGE_GITLAB_AGENT_DEPLOY: v69766501-45da1c0b
182+
CI_IMAGE_GITLAB_AGENT_DEPLOY: v70289801-3a61ff42
183183
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
184-
CI_IMAGE_LINUX_GLIBC_2_17_X64: v69766501-45da1c0b
184+
CI_IMAGE_LINUX_GLIBC_2_17_X64: v70289801-3a61ff42
185185
CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
186-
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v69766501-45da1c0b
186+
CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v70289801-3a61ff42
187187
CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
188-
CI_IMAGE_RPM_X64: v69766501-45da1c0b
188+
CI_IMAGE_RPM_X64: v70289801-3a61ff42
189189
CI_IMAGE_RPM_X64_SUFFIX: ""
190-
CI_IMAGE_RPM_ARM64: v69766501-45da1c0b
190+
CI_IMAGE_RPM_ARM64: v70289801-3a61ff42
191191
CI_IMAGE_RPM_ARM64_SUFFIX: ""
192-
CI_IMAGE_RPM_ARMHF: v69766501-45da1c0b
192+
CI_IMAGE_RPM_ARMHF: v70289801-3a61ff42
193193
CI_IMAGE_RPM_ARMHF_SUFFIX: ""
194-
CI_IMAGE_WIN_LTSC2022_X64: v68287210-66c494d7
194+
CI_IMAGE_WIN_LTSC2022_X64: v70289801-3a61ff42
195195
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
196196

197197
DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.4
1+
1.24.5

.wwhrd.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ exceptions:
4747

4848
additional:
4949
# list here paths to additional licenses
50-
golang/go: "raw.githubusercontent.com/golang/go/go1.24.4/LICENSE"
50+
golang/go: "raw.githubusercontent.com/golang/go/go1.24.5/LICENSE"

devenv/scripts/Install-DevEnv.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola
4545
$ErrorActionPreference = 'Stop'
4646
$ProgressPreference = 'SilentlyContinue'
4747

48-
$go_version = "1.24.4"
48+
$go_version = "1.24.5"
4949
Write-Host -ForegroundColor Green "Installing go $go_version"
5050

5151
$gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip"

docs/dev/agent_dev_env.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als
135135

136136
### Golang
137137

138-
You must [install Golang](https://golang.org/doc/install) version `1.24.4`. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
138+
You must [install Golang](https://golang.org/doc/install) version `1.24.5`. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke`
139139
cannot use any additional tool it might need.
140140

141141
**Please note that versions of Golang that aren't an exact match to the version

go.work

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
go 1.24.4
1+
go 1.24.5
22

33
// Disable new post-quantum key exchange mechanism X25519MLKEM768
44
// See https://github.com/DataDog/datadog-agent/issues/34323 for historical context.

internal/tools/gotest-custom/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/DataDog/datadog-agent/internal/tools/gotest-custom
22

3-
go 1.24.4
3+
go 1.24.0
44

55
require github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510

omnibus/python-scripts/packages.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ def create_python_installed_packages_file(filename):
115115
f.write(DO_NOT_REMOVE_WARNING_HEADER)
116116
installed_packages = importlib.metadata.distributions()
117117
for dist in installed_packages:
118+
if dist.metadata['Name'] is None or dist.version is None:
119+
continue
118120
f.write(f"{dist.metadata['Name']}=={dist.version}\n")
119121
if not os.name == 'nt':
120122
os.chmod(filename, 0o644)

pkg/logs/sds/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/DataDog/datadog-agent/pkg/logs/sds
22

3-
go 1.23.0
3+
go 1.24.0
44

55
require (
66
github.com/DataDog/datadog-agent/pkg/config/model v0.64.1

pkg/template/html/js.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func jsValEscaper(args ...any) string {
195195
// x//* error marshaling y:
196196
// second line of error message */null
197197
errStr := err.Error()
198-
errStr = scriptTagRe.ReplaceAllString(errStr, `\x3C${1}script`)
198+
errStr = string(scriptTagRe.ReplaceAll([]byte(errStr), []byte(`\x3C${1}script`)))
199199
errStr = strings.ReplaceAll(errStr, "*/", "* /")
200200
errStr = strings.ReplaceAll(errStr, "<!--", `\x3C!--`)
201201
return fmt.Sprintf(" /* %s */null ", errStr)

0 commit comments

Comments
 (0)