Skip to content

Commit 0ff8bb7

Browse files
Update Go version to 1.26.6
1 parent 6e41ee6 commit 0ff8bb7

13 files changed

Lines changed: 106 additions & 98 deletions

File tree

.gitlab-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,25 +291,25 @@ variables:
291291
# Build images versions
292292
# To use images from datadog-agent-buildimages dev branches, set the corresponding
293293
# SUFFIX variable to
294-
CI_IMAGE_BTF_GEN: v126430166-27084be1
294+
CI_IMAGE_BTF_GEN: v130931667-5a234c35
295295
CI_IMAGE_BTF_GEN_SUFFIX: ""
296-
CI_IMAGE_DOCKER_X64: v126430166-27084be1
296+
CI_IMAGE_DOCKER_X64: v130931667-5a234c35
297297
CI_IMAGE_DOCKER_X64_SUFFIX: ""
298-
CI_IMAGE_DOCKER_ARM64: v126430166-27084be1
298+
CI_IMAGE_DOCKER_ARM64: v130931667-5a234c35
299299
CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
300-
CI_IMAGE_GITLAB_AGENT_DEPLOY: v126430166-27084be1
300+
CI_IMAGE_GITLAB_AGENT_DEPLOY: v130931667-5a234c35
301301
CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
302-
CI_IMAGE_LINUX: v126430166-27084be1
302+
CI_IMAGE_LINUX: v130931667-5a234c35
303303
CI_IMAGE_LINUX_SUFFIX: ""
304-
CI_IMAGE_RPM_X64: v126430166-27084be1
304+
CI_IMAGE_RPM_X64: v130931667-5a234c35
305305
CI_IMAGE_RPM_X64_SUFFIX: ""
306-
CI_IMAGE_RPM_ARM64: v126430166-27084be1
306+
CI_IMAGE_RPM_ARM64: v130931667-5a234c35
307307
CI_IMAGE_RPM_ARM64_SUFFIX: ""
308-
CI_IMAGE_RPM_ARMHF: v126430166-27084be1
308+
CI_IMAGE_RPM_ARMHF: v130931667-5a234c35
309309
CI_IMAGE_RPM_ARMHF_SUFFIX: ""
310-
CI_IMAGE_WIN_LTSC2022_X64: v126430166-27084be1
310+
CI_IMAGE_WIN_LTSC2022_X64: v130931667-5a234c35
311311
CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
312-
CI_IMAGE_WIN_LTSC2025_X64: v126430166-27084be1
312+
CI_IMAGE_WIN_LTSC2025_X64: v130931667-5a234c35
313313
CI_IMAGE_WIN_LTSC2025_X64_SUFFIX: ""
314314

315315
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.26.5
1+
1.26.6

.wwhrd.yml

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

5151
additional:
5252
# list here paths to additional licenses
53-
golang/go: "raw.githubusercontent.com/golang/go/go1.26.5/LICENSE"
53+
golang/go: "raw.githubusercontent.com/golang/go/go1.26.6/LICENSE"

Dockerfiles/agent-ddot/Dockerfile.agent-otel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN if [ "$PACKAGE_TYPE" = "windows" ]; then \
6060
fi
6161

6262
# Install Go based on architecture
63-
ARG GO_VERSION=1.26.5
63+
ARG GO_VERSION=1.26.6
6464
RUN ARCH=$(dpkg --print-architecture) && \
6565
if [ "$ARCH" = "amd64" ]; then \
6666
GO_ARCH="linux-amd64"; \

MODULE.bazel.lock

Lines changed: 79 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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.26.5"
48+
$go_version = "1.26.6"
4949
Write-Host -ForegroundColor Green "Installing go $go_version"
5050

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

go.work

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

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

pkg/template/html/transition.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,11 +336,14 @@ func tJS(c context, s []byte) (context, int) {
336336
// We only care about tracking brace depth if we are inside of a
337337
// template literal.
338338
if len(c.jsBraceDepth) == 0 {
339+
c.jsCtx = nextJSCtx(s[i:i+1], c.jsCtx)
339340
return c, i + 1
340341
}
341342
c.jsBraceDepth[len(c.jsBraceDepth)-1]++
343+
c.jsCtx = nextJSCtx(s[i:i+1], c.jsCtx)
342344
case '}':
343345
if len(c.jsBraceDepth) == 0 {
346+
c.jsCtx = nextJSCtx(s[i:i+1], c.jsCtx)
344347
return c, i + 1
345348
}
346349
// There are no cases where a brace can be escaped in the JS context
@@ -349,6 +352,7 @@ func tJS(c context, s []byte) (context, int) {
349352
// fully fledged parsers will just fail anyway.
350353
c.jsBraceDepth[len(c.jsBraceDepth)-1]--
351354
if c.jsBraceDepth[len(c.jsBraceDepth)-1] >= 0 {
355+
c.jsCtx = nextJSCtx(s[i:i+1], c.jsCtx)
352356
return c, i + 1
353357
}
354358
c.jsBraceDepth = c.jsBraceDepth[:len(c.jsBraceDepth)-1]
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
enhancements:
3+
- |
4+
Agents are now built with Go ``1.26.6``.

tasks/go.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def version(_):
366366
@task
367367
def check_go_version(ctx):
368368
go_version_output = ctx.run('go version')
369-
# result is like "go version go1.26.5 linux/amd64"
369+
# result is like "go version go1.26.6 linux/amd64"
370370
running_go_version = go_version_output.stdout.split(' ')[2]
371371

372372
with open(".go-version") as f:

0 commit comments

Comments
 (0)