Skip to content

Commit 9ed8db0

Browse files
mergify[bot]mergify[bot]
authored
Merge of #18735 
2 parents 5c36d44 + 7511c9d commit 9ed8db0

File tree

13 files changed

+9
-264
lines changed

13 files changed

+9
-264
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ jobs:
7979
restore-keys: |
8080
go-
8181
- env:
82-
CGO_ENABLED: "0"
8382
GOFIPS140: "latest"
84-
GODEBUG: "fips140=only"
85-
run: go test -v -tags=requirefips ./...
83+
# TODO: disable X25519MLKEM768 until upstream go issue is fixed https://github.com/golang/go/issues/74630#issuecomment-3224191006
84+
GODEBUG: "fips140=only,tlsmlkem=0"
85+
run: go test -v -race -tags=requirefips ./...
8686

8787
system-test:
8888
runs-on: ubuntu-latest
@@ -124,7 +124,8 @@ jobs:
124124
- env:
125125
GOTESTFLAGS: "-v -tags=requirefips"
126126
GOFIPS140: "latest"
127-
GODEBUG: "fips140=only"
127+
# TODO: disable X25519MLKEM768 until upstream go issue is fixed https://github.com/golang/go/issues/74630#issuecomment-3224191006
128+
GODEBUG: "fips140=only,tlsmlkem=0"
128129
GH_TOKEN: ${{ github.token }}
129130
run: make system-test
130131

‎.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
@@ -6416,34 +6416,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
64166416
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
64176417
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
64186418

6419-
--------------------------------------------------------------------------------
6420-
Dependency : go.uber.org/automaxprocs
6421-
Version: v1.6.0
6422-
Licence type (autodetected): MIT
6423-
--------------------------------------------------------------------------------
6424-
6425-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected]/LICENSE:
6426-
6427-
Copyright (c) 2017 Uber Technologies, Inc.
6428-
6429-
Permission is hereby granted, free of charge, to any person obtaining a copy
6430-
of this software and associated documentation files (the "Software"), to deal
6431-
in the Software without restriction, including without limitation the rights
6432-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
6433-
copies of the Software, and to permit persons to whom the Software is
6434-
furnished to do so, subject to the following conditions:
6435-
6436-
The above copyright notice and this permission notice shall be included in
6437-
all copies or substantial portions of the Software.
6438-
6439-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
6440-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6441-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6442-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6443-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
6444-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
6445-
THE SOFTWARE.
6446-
64476419
--------------------------------------------------------------------------------
64486420
Dependency : go.uber.org/zap
64496421
Version: v1.27.0

‎NOTICE.txt‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6416,34 +6416,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
64166416
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
64176417
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
64186418

6419-
--------------------------------------------------------------------------------
6420-
Dependency : go.uber.org/automaxprocs
6421-
Version: v1.6.0
6422-
Licence type (autodetected): MIT
6423-
--------------------------------------------------------------------------------
6424-
6425-
Contents of probable licence file $GOMODCACHE/go.uber.org/[email protected]/LICENSE:
6426-
6427-
Copyright (c) 2017 Uber Technologies, Inc.
6428-
6429-
Permission is hereby granted, free of charge, to any person obtaining a copy
6430-
of this software and associated documentation files (the "Software"), to deal
6431-
in the Software without restriction, including without limitation the rights
6432-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
6433-
copies of the Software, and to permit persons to whom the Software is
6434-
furnished to do so, subject to the following conditions:
6435-
6436-
The above copyright notice and this permission notice shall be included in
6437-
all copies or substantial portions of the Software.
6438-
6439-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
6440-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6441-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
6442-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
6443-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
6444-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
6445-
THE SOFTWARE.
6446-
64476419
--------------------------------------------------------------------------------
64486420
Dependency : go.uber.org/zap
64496421
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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/elastic/apm-server
22

3-
go 1.24.7
3+
go 1.25.1
44

55
require (
66
github.com/KimMachineGun/automemlimit v0.7.4
@@ -48,7 +48,6 @@ require (
4848
go.opentelemetry.io/otel/sdk v1.38.0
4949
go.opentelemetry.io/otel/sdk/metric v1.38.0
5050
go.opentelemetry.io/otel/trace v1.38.0
51-
go.uber.org/automaxprocs v1.6.0
5251
go.uber.org/zap v1.27.0
5352
go.uber.org/zap/exp v0.3.0
5453
golang.org/x/net v0.44.0

‎go.sum‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,6 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
542542
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
543543
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
544544
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
545-
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
546-
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
547545
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
548546
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
549547
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
@@ -728,8 +726,6 @@ go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.0.1 h1:T
728726
go.opentelemetry.io/proto/slim/otlp/collector/profiles/v1development v0.0.1/go.mod h1:riqUmAOJFDFuIAzZu/3V6cOrTyfWzpgNJnG5UwrapCk=
729727
go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.0.1 h1:z/oMlrCv3Kopwh/dtdRagJy+qsRRPA86/Ux3g7+zFXM=
730728
go.opentelemetry.io/proto/slim/otlp/profiles/v1development v0.0.1/go.mod h1:C7EHYSIiaALi9RnNORCVaPCQDuJgJEn/XxkctaTez1E=
731-
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
732-
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
733729
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
734730
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
735731
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=

‎internal/beatcmd/beat.go‎

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

384-
g.Go(func() error {
385-
return adjustMaxProcs(ctx, 30*time.Second, b.Info.Logger)
386-
})
387-
388384
slogger := slog.New(zapslog.NewHandler(b.Info.Logger.Core()))
389385
g.Go(func() error {
390386
return adjustMemlimit(ctx, 30*time.Second, slogger)

‎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) {

‎internal/beatcmd/maxprocs.go‎

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)