Skip to content

Commit 0473cbc

Browse files
kruskallmergify[bot]
kruskall
authored and
mergify[bot]
committed
feat: bump go to 1.25.1 (#18121)
* 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: # go.mod # go.sum
1 parent 36d75e3 commit 0473cbc

File tree

14 files changed

+40
-259
lines changed

14 files changed

+40
-259
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ jobs:
106106
go-
107107
- env:
108108
GOFIPS140: "latest"
109-
GODEBUG: "fips140=only"
109+
# TODO: disable X25519MLKEM768 until upstream go issue is fixed https://github.com/golang/go/issues/74630#issuecomment-3224191006
110+
GODEBUG: "fips140=only,tlsmlkem=0"
110111
run: go test -v -race -tags=requirefips ./...
111112

112113
system-test:
@@ -149,7 +150,8 @@ jobs:
149150
- env:
150151
GOTESTFLAGS: "-v -tags=requirefips"
151152
GOFIPS140: "latest"
152-
GODEBUG: "fips140=only"
153+
# TODO: disable X25519MLKEM768 until upstream go issue is fixed https://github.com/golang/go/issues/74630#issuecomment-3224191006
154+
GODEBUG: "fips140=only,tlsmlkem=0"
153155
GH_TOKEN: ${{ github.token }}
154156
run: make system-test
155157

‎.go-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.6
1+
1.25.1

‎NOTICE-fips.txt‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5457,34 +5457,6 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.
54575457
limitations under the License.
54585458

54595459

5460-
--------------------------------------------------------------------------------
5461-
Dependency : go.uber.org/automaxprocs
5462-
Version: v1.6.0
5463-
Licence type (autodetected): MIT
5464-
--------------------------------------------------------------------------------
5465-
5466-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected]/LICENSE:
5467-
5468-
Copyright (c) 2017 Uber Technologies, Inc.
5469-
5470-
Permission is hereby granted, free of charge, to any person obtaining a copy
5471-
of this software and associated documentation files (the "Software"), to deal
5472-
in the Software without restriction, including without limitation the rights
5473-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5474-
copies of the Software, and to permit persons to whom the Software is
5475-
furnished to do so, subject to the following conditions:
5476-
5477-
The above copyright notice and this permission notice shall be included in
5478-
all copies or substantial portions of the Software.
5479-
5480-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5481-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5482-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
5483-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
5484-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
5485-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
5486-
THE SOFTWARE.
5487-
54885460
--------------------------------------------------------------------------------
54895461
Dependency : go.uber.org/zap
54905462
Version: v1.27.0

‎NOTICE.txt‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5457,34 +5457,6 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.
54575457
limitations under the License.
54585458

54595459

5460-
--------------------------------------------------------------------------------
5461-
Dependency : go.uber.org/automaxprocs
5462-
Version: v1.6.0
5463-
Licence type (autodetected): MIT
5464-
--------------------------------------------------------------------------------
5465-
5466-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected]/LICENSE:
5467-
5468-
Copyright (c) 2017 Uber Technologies, Inc.
5469-
5470-
Permission is hereby granted, free of charge, to any person obtaining a copy
5471-
of this software and associated documentation files (the "Software"), to deal
5472-
in the Software without restriction, including without limitation the rights
5473-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
5474-
copies of the Software, and to permit persons to whom the Software is
5475-
furnished to do so, subject to the following conditions:
5476-
5477-
The above copyright notice and this permission notice shall be included in
5478-
all copies or substantial portions of the Software.
5479-
5480-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5481-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
5482-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
5483-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
5484-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
5485-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
5486-
THE SOFTWARE.
5487-
54885460
--------------------------------------------------------------------------------
54895461
Dependency : go.uber.org/zap
54905462
Version: v1.27.0

‎cmd/intake-receiver/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/apm-server/cmd/intake-receiver
22

3-
go 1.24.6
3+
go 1.25.1
44

55
require (
66
github.com/stretchr/testify v1.6.1

‎go.mod‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
module github.com/elastic/apm-server
22

3+
<<<<<<< HEAD
34
go 1.24.7
5+
=======
6+
go 1.25.1
7+
>>>>>>> 632899af (feat: bump go to 1.25.1 (#18121))
48

59
require (
610
github.com/KimMachineGun/automemlimit v0.7.3
@@ -38,13 +42,22 @@ require (
3842
go.elastic.co/apm/module/apmotel/v2 v2.7.1
3943
go.elastic.co/apm/v2 v2.7.1
4044
go.elastic.co/fastjson v1.5.1
45+
<<<<<<< HEAD
4146
go.opentelemetry.io/collector/pdata v1.38.0
4247
go.opentelemetry.io/otel v1.37.0
4348
go.opentelemetry.io/otel/metric v1.37.0
4449
go.opentelemetry.io/otel/sdk v1.37.0
4550
go.opentelemetry.io/otel/sdk/metric v1.37.0
4651
go.opentelemetry.io/otel/trace v1.37.0
4752
go.uber.org/automaxprocs v1.6.0
53+
=======
54+
go.opentelemetry.io/collector/pdata v1.41.0
55+
go.opentelemetry.io/otel v1.38.0
56+
go.opentelemetry.io/otel/metric v1.38.0
57+
go.opentelemetry.io/otel/sdk v1.38.0
58+
go.opentelemetry.io/otel/sdk/metric v1.38.0
59+
go.opentelemetry.io/otel/trace v1.38.0
60+
>>>>>>> 632899af (feat: bump go to 1.25.1 (#18121))
4861
go.uber.org/zap v1.27.0
4962
go.uber.org/zap/exp v0.3.0
5063
golang.org/x/net v0.43.0

‎go.sum‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
495495
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
496496
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
497497
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
498-
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
499-
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
500498
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
501499
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
502500
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -649,6 +647,7 @@ go.opentelemetry.io/collector/pdata v1.38.0 h1:94LzVKMQM8R7RFJ8Z1+sL51IkI90TDfTc
649647
go.opentelemetry.io/collector/pdata v1.38.0/go.mod h1:DSvnwj37IKyQj2hpB97cGITyauR8tvAauJ6/gsxg8mg=
650648
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 h1:Hf9xI/XLML9ElpiHVDNwvqI0hIFlzV8dgIr35kV1kRU=
651649
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0/go.mod h1:NfchwuyNoMcZ5MLHwPrODwUF1HWCXWrL31s8gSAdIKY=
650+
<<<<<<< HEAD
652651
go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
653652
go.opentelemetry.io/otel v1.37.0/go.mod h1:ehE/umFRLnuLa/vSccNq9oS1ErUlkkK71gMcN34UG8I=
654653
go.opentelemetry.io/otel/metric v1.37.0 h1:mvwbQS5m0tbmqML4NqK+e3aDiO02vsf/WgbsdpcPoZE=
@@ -661,6 +660,24 @@ go.opentelemetry.io/otel/trace v1.37.0 h1:HLdcFNbRQBE2imdSEgm/kwqmQj1Or1l/7bW6mx
661660
go.opentelemetry.io/otel/trace v1.37.0/go.mod h1:TlgrlQ+PtQO5XFerSPUYG0JSgGyryXewPGyayAWSBS0=
662661
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
663662
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
663+
=======
664+
go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
665+
go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
666+
go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
667+
go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
668+
go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
669+
go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
670+
go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
671+
go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
672+
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
673+
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
674+
go.opentelemetry.io/proto/slim/otlp v1.7.1 h1:lZ11gEokjIWYM3JWOUrIILr2wcf6RX+rq5SPObV9oyc=
675+
go.opentelemetry.io/proto/slim/otlp v1.7.1/go.mod h1:uZ6LJWa49eNM/EXnnvJGTTu8miokU8RQdnO980LJ57g=
676+
go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.0.1 h1:Tr/eXq6N7ZFjN+THBF/BtGLUz8dciA7cuzGRsCEkZ88=
677+
go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.0.1/go.mod h1:riqUmAOJFDFuIAzZu/3V6cOrTyfWzpgNJnG5UwrapCk=
678+
go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.0.1 h1:z/oMlrCv3Kopwh/dtdRagJy+qsRRPA86/Ux3g7+zFXM=
679+
go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.0.1/go.mod h1:C7EHYSIiaALi9RnNORCVaPCQDuJgJEn/XxkctaTez1E=
680+
>>>>>>> 632899af (feat: bump go to 1.25.1 (#18121))
664681
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
665682
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
666683
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

‎integrationservertest/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/apm-server/integrationservertest
22

3-
go 1.24.6
3+
go 1.25.1
44

55
require (
66
github.com/dnaeon/go-vcr v1.2.0

‎internal/beatcmd/beat.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -372,10 +372,6 @@ func (b *Beat) Run(ctx context.Context) error {
372372
}
373373
}
374374

375-
g.Go(func() error {
376-
return adjustMaxProcs(ctx, 30*time.Second, b.Info.Logger)
377-
})
378-
379375
slogger := slog.New(zapslog.NewHandler(b.Info.Logger.Core()))
380376
if err := adjustMemlimit(30*time.Second, slogger); err != nil {
381377
return err

‎internal/beatcmd/beat_test.go‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"fmt"
2525
"net/http"
2626
"os"
27-
"strconv"
2827
"strings"
2928
"sync/atomic"
3029
"testing"
@@ -54,41 +53,6 @@ import (
5453
"github.com/elastic/go-docappender/v2/docappendertest"
5554
)
5655

57-
// TestRunMaxProcs ensures Beat.Run calls the GOMAXPROCS adjustment code by looking for log messages.
58-
func TestRunMaxProcs(t *testing.T) {
59-
for _, n := range []int{1, 2, 4} {
60-
t.Run(fmt.Sprintf("%d_GOMAXPROCS", n), func(t *testing.T) {
61-
t.Setenv("GOMAXPROCS", strconv.Itoa(n))
62-
beat := newNopBeat(t, "output.console.enabled: true")
63-
logs := logp.ObserverLogs()
64-
65-
stop := runBeat(t, beat)
66-
timeout := time.NewTimer(10 * time.Second)
67-
defer timeout.Stop()
68-
for {
69-
select {
70-
case <-timeout.C:
71-
t.Error("timed out waiting for log message, total logs observed:", logs.Len())
72-
for _, log := range logs.All() {
73-
t.Log(log.LoggerName, log.Message)
74-
}
75-
return
76-
case <-time.After(10 * time.Millisecond):
77-
}
78-
79-
logs := logs.FilterMessageSnippet(fmt.Sprintf(
80-
`maxprocs: Honoring GOMAXPROCS="%d" as set in environment`, n,
81-
))
82-
if logs.Len() > 0 {
83-
break
84-
}
85-
}
86-
87-
assert.NoError(t, stop())
88-
})
89-
}
90-
}
91-
9256
func TestRunnerParams(t *testing.T) {
9357
calls := make(chan RunnerParams, 1)
9458
b := newBeat(t, "output.console.enabled: true\nname: my-custom-name", func(args RunnerParams) (Runner, error) {

0 commit comments

Comments
 (0)