Skip to content

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 24, 2025

Motivation/summary

bump to latest stable version

go 1.25 adds native auto maxprocs so we don't need the automaxprocs lib
anymore.

remove dependency and related tests

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues

Blocked until wolfi go 1.25.0 image is published


This is an automatic backport of pull request #18121 done by [Mergify](https://mergify.com).

* feat: bump go to 1.25.0

bump to latest stable version

* feat: remove unused automaxprocs dependency and related tests

go 1.25 adds native auto maxprocs so we don't need the automaxprocs lib
anymore.

remove dependency and related tests

* Update .go-version

* Update go.mod

* Update go.mod

* Update go.mod

* Update go.mod

* lint: regenerate notice files

* test: remove subjectkeyid fips workaround

go 1.25 switched to SHA-256 to fill in missing SubjectKeyId
in crypto/x509.CreateCertificate.

Remove the manual key generation to avoid sha1

* ci: disable X25519MLKEM768 in fips tests

pass GODEBUG=tlsmlkem=0 to remove X25519MLKEM768 from enabled
by default curve list.

Go 1.25 allowed X25519MLKEM768 in fips mode but this might fail
if X25519 is used in fipsonly mode because X25519 is not allowed.

remove the curve from the default list until this is fixed upstream

* Update ci.yml

(cherry picked from commit 632899a)

# Conflicts:
#	.github/workflows/ci.yml
#	go.mod
#	integrationservertest/go.mod
@mergify mergify bot added the backport label Sep 24, 2025
@mergify mergify bot requested a review from a team as a code owner September 24, 2025 12:28
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 24, 2025
Copy link
Contributor Author

mergify bot commented Sep 24, 2025

Cherry-pick of 632899a has failed:

On branch mergify/bp/8.19/pr-18121
Your branch is up to date with 'origin/8.19'.

You are currently cherry-picking commit 632899af.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .go-version
	modified:   NOTICE-fips.txt
	modified:   NOTICE.txt
	modified:   cmd/intake-receiver/go.mod
	modified:   go.sum
	modified:   internal/beatcmd/beat.go
	modified:   internal/beatcmd/beat_test.go
	deleted:    internal/beatcmd/maxprocs.go
	deleted:    internal/beatcmd/maxprocs_test.go
	modified:   systemtest/apmservertest/server.go
	modified:   systemtest/go.mod

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/ci.yml
	both modified:   go.mod
	deleted by us:   integrationservertest/go.mod

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the backport label Sep 24, 2025
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 24, 2025
@mergify mergify bot mentioned this pull request Sep 24, 2025
2 tasks
Copy link
Contributor

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Sep 24, 2025
@kruskall kruskall enabled auto-merge (squash) September 24, 2025 12:48
mergify bot added a commit that referenced this pull request Sep 24, 2025
mergify bot added a commit that referenced this pull request Sep 24, 2025
@mergify mergify bot merged commit e90e75b into 8.19 Sep 24, 2025
16 checks passed
@mergify mergify bot deleted the mergify/bp/8.19/pr-18121 branch September 24, 2025 12:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant