Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1ed9237
Bump Go version to 1.25.1
ycombinator Sep 25, 2025
7b02292
Update CHANGELOG entry
ycombinator Sep 25, 2025
2efec20
Bump the version of golangci-lint
ycombinator Sep 25, 2025
83f1171
Update dev-tools/mage/otel/deps_test.go
ycombinator Sep 25, 2025
b3aa7f9
Remove references to the ms_tls13kdf build tag
ycombinator Sep 25, 2025
c3da90a
Use mage target specifically intended for fips140=only unit testing
ycombinator Sep 25, 2025
ba6de0f
Download go module dependencies before GODEBUG=fips140=only is set
ycombinator Sep 25, 2025
dc2c700
Fix target name
ycombinator Sep 25, 2025
3a0732a
[Debugging] Print go test command environment right before command is…
ycombinator Sep 25, 2025
6a697f2
Revert "[Debugging] Print go test command environment right before co…
ycombinator Sep 26, 2025
c3617ce
Fix regular expression for matching panicking output
ycombinator Sep 26, 2025
c9b23d8
Run dependencies first
ycombinator Sep 26, 2025
0540748
Append requirefips build tag for fips140=only unit tests
ycombinator Sep 26, 2025
19ad24c
Fix policy change handler unit tests
ycombinator Sep 26, 2025
d6cfca0
Fix TestDownloadVersion test
ycombinator Sep 26, 2025
3111831
Set GODEBUG=tlsmlkem=0 for test
ycombinator Sep 27, 2025
f310eb7
No longer necessary
ycombinator Sep 27, 2025
0f8fb4b
Formatting fixes
ycombinator Sep 27, 2025
401c2d8
Remove replace and running mage notice
ycombinator Sep 27, 2025
6c9b4c7
Remove pre-downloading of go modules
ycombinator Sep 29, 2025
b6b1a81
Revert unit test pipeline changes
ycombinator Oct 1, 2025
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 .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ steps:
artifact_paths:
- "build/TEST-go-unit.cov"
agents:
image: "golang:1.24.7"
image: "golang:1.25.1"
depends_on:
- unit-tests
- extended-windows
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v2.1.0
version: v2.5.0

# Give the job more time to execute.
# Regarding `--whole-files`, the linter is supposed to support linting of changed a patch only but,
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.24.7
1.25.1
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.24.7
ARG GO_VERSION=1.25.1
FROM circleci/golang:${GO_VERSION}


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.skaffold
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.24.7
ARG GO_VERSION=1.25.1
ARG crossbuild_image="docker.elastic.co/beats-dev/golang-crossbuild"
ARG AGENT_VERSION=8.9.0-SNAPSHOT
ARG AGENT_IMAGE="docker.elastic.co/beats/elastic-agent"
Expand Down
32 changes: 32 additions & 0 deletions changelog/fragments/1758822287-bump-golang-1.25.1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Kind can be one of:
# - breaking-change: a change to previously-documented behavior
# - deprecation: functionality that is being removed in a later release
# - bug-fix: fixes a problem in a previous version
# - enhancement: extends functionality but does not break or fix existing behavior
# - feature: new functionality
# - known-issue: problems that we are aware of in a given version
# - security: impacts on the security of a product or a user’s deployment.
# - upgrade: important information for someone upgrading from a prior version
# - other: does not fit into any of the other categories
kind: enhancement

# Change summary; a 80ish characters long description of the change.
summary: Update Go version to 1.25.1

# Long description; in case the summary is not enough to describe the change
# this field accommodate a description without length limits.
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
#description:

# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
component: elastic-agent

# PR URL; optional; the PR number that added the changeset.
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
# Please provide it if you are adding a fragment for a different PR.
pr: https://github.com/elastic/elastic-agent/pull/10156

# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
# If not present is automatically filled by the tooling with the issue linked to the PR number.
#issue: https://github.com/owner/repo/1234
2 changes: 1 addition & 1 deletion dev-tools/mage/gotest.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
}

func makeGoTestArgs(name string) GoTestArgs {
fileName := fmt.Sprintf("build/TEST-go-%s", strings.Replace(strings.ToLower(name), " ", "_", -1))

Check failure on line 49 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
params := GoTestArgs{
LogName: name,
Race: RaceDetector,
Expand All @@ -64,8 +64,8 @@

func makeGoTestArgsForModule(name, module string) GoTestArgs {
fileName := fmt.Sprintf("build/TEST-go-%s-%s",
strings.Replace(strings.ToLower(name), " ", "_", -1),

Check failure on line 67 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
strings.Replace(strings.ToLower(module), " ", "_", -1),

Check failure on line 68 in dev-tools/mage/gotest.go

View workflow job for this annotation

GitHub Actions / lint (ubuntu-latest)

QF1004: could use strings.ReplaceAll instead (staticcheck)
)
params := GoTestArgs{
LogName: fmt.Sprintf("%s-%s", name, module),
Expand All @@ -86,7 +86,7 @@
func testTagsFromEnv() []string {
tags := strings.Split(strings.Trim(os.Getenv("TEST_TAGS"), ", "), ",")
if FIPSBuild {
tags = append(tags, "requirefips", "ms_tls13kdf")
tags = append(tags, "requirefips")
}
return tags
}
Expand Down
4 changes: 1 addition & 3 deletions dev-tools/mage/gotest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,7 @@ func TestGoTest_Helper_WithPanic(t *testing.T) {

var wantTestWithPanic = `(?sm:
=== FAIL: dev-tools/mage TestGoTest_Helper_WithPanic.*
panic: Kaputt. \[recovered\].*
panic: Kaputt.*
)`
panic: Kaputt. \[recovered, repanicked\].*)`

func TestGoTest_Helper_WithWrongPanic(t *testing.T) {
if !gotestHelperMode {
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/mage/otel/deps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
func TestGetOtelDependencies(t *testing.T) {
goModContent := `module github.com/elastic/elastic-agent

go 1.24.1
go 1.25.1

require (
github.com/elastic/opentelemetry-collector-components/connector/signaltometricsconnector v0.3.0
Expand Down
1 change: 0 additions & 1 deletion dev-tools/packaging/packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ settings:
MS_GOTOOLCHAIN_TELEMETRY_ENABLED: "0"
tags:
- requirefips
- ms_tls13kdf
platforms:
- *linux-amd64
- *linux-arm64
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/elastic-agent

go 1.24.7
go 1.25.1

require (
github.com/Jeffail/gabs/v2 v2.6.0
Expand Down
13 changes: 11 additions & 2 deletions magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ func (Build) WindowsArchiveRootBinary() error {
if devtools.FIPSBuild {
// there is no actual FIPS relevance for this particular binary
// but better safe than sorry
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips,ms_tls13kdf")
args.ExtraFlags = append(args.ExtraFlags, "-tags=requirefips")
args.Env["MS_GOTOOLCHAIN_TELEMETRY_ENABLED"] = "0"
args.CGO = true
}
Expand Down Expand Up @@ -487,8 +487,17 @@ func (Test) Unit(ctx context.Context) error {
// FIPSOnlyUnit runs all the unit tests with GODEBUG=fips140=only.
func (Test) FIPSOnlyUnit(ctx context.Context) error {
mg.Deps(Prepare.Env, Build.TestBinaries)

params := devtools.DefaultGoTestUnitArgs()
params.Env["GODEBUG"] = "fips140=only"
params.Env["FIPS"] = "true"

// We also set GODEBUG=tlsmlkem=0 to disable the X25519MLKEM768 TLS key
// exchange mechanism; without this setting and with the GODEBUG=fips140=only
// setting, we get errors in tests like so:
// Failed to connect: crypto/ecdh: use of X25519 is not allowed in FIPS 140-only mode
// Note that we are only disabling this TLS key exchange mechanism in tests!
params.Env["GODEBUG"] = "fips140=only,tlsmlkem=0"
params.Tags = append(params.Tags, "requirefips")
return devtools.GoTest(ctx, params)
}

Expand Down
2 changes: 1 addition & 1 deletion version/docs/version.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// FIXME: once elastic.co docs have been switched over to use `main`, remove
// the `doc-site-branch` line below as well as any references to it in the code.
:doc-site-branch: master
:go-version: 1.24.7
:go-version: 1.25.1
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion wrapper/windows/archive-proxy/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/elastic/elastic-agent/wrapper/windows/archive-proxy

go 1.24.7
go 1.25.1

require github.com/elastic/elastic-agent v0.0.0

Expand Down
Loading