Merge branch 'main' into update-pgo-1740798953

elastic · Mar 6, 2025 · ac1f274 · ac1f274
2 parents c342afe + dd50d7a
commit ac1f274
Show file tree

Hide file tree

Showing 48 changed files with 867 additions and 1,394 deletions.
diff --git a/.ci/updatecli/bump-golang.yml b/.ci/updatecli/bump-golang.yml
@@ -107,5 +107,4 @@ targets:
         - go.mod
         - cmd/intake-receiver/go.mod
         - systemtest/go.mod
-        - tools/go.mod
       matchpattern: 'go \d+.\d+'
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -22,15 +22,6 @@ updates:
       go-agent:
         patterns:
         - "go.elastic.co/apm*"
-  # go tools
-  - package-ecosystem: "gomod"
-    directory: "tools/"
-    schedule:
-      interval: "weekly"
-    groups:
-      dependencies:
-        patterns:
-          - "*"
   # go systemtest
   - package-ecosystem: "gomod"
     directory: "systemtest/"

diff --git a/.github/workflows/check-docker-compose.yml b/.github/workflows/check-docker-compose.yml
@@ -33,10 +33,7 @@ jobs:
       - uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
-          cache: true
-          cache-dependency-path: |
-            go.sum
-            tools/go.sum
+          cache: false
       - run: make check-docker-compose
 
   all-check-docker-compose:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,7 +35,6 @@ jobs:
           cache: true
           cache-dependency-path: |
             go.sum
-            tools/go.sum
       - run: make check-full
 
   test:
@@ -72,15 +71,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          # TODO switch to go.mod once we update to 1.24+
-          go-version: 1.24
+          go-version-file: go.mod
           cache: true
       - env:
           CGO_ENABLED: "0"
           GOFIPS140: "latest"
           GODEBUG: "fips140=only"
-        # TODO remove tags once cockroachdb/swiss works on 1.24+
-        run: go test -v -tags=untested_go_version,requirefips ./...
+        run: go test -v -tags=requirefips ./...
 
   system-test:
     runs-on: ubuntu-latest
@@ -109,7 +106,6 @@ jobs:
           cache: false
           cache-dependency-path: |
             go.sum
-            tools/go.sum
       - run: make package-snapshot
         env:
           GH_TOKEN: ${{ github.token }}
@@ -128,7 +124,6 @@ jobs:
           cache: false
           cache-dependency-path: |
             go.sum
-            tools/go.sum
       - name: Log in to the Elastic Container registry
         uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
         with:

diff --git a/.github/workflows/setup-cluster-env/action.yml b/.github/workflows/setup-cluster-env/action.yml
@@ -12,4 +12,3 @@ runs:
         cache: true
         cache-dependency-path: |
           go.sum
-          tools/go.sum
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.6
+1.24.0
diff --git a/Makefile b/Makefile
@@ -70,7 +70,7 @@ GOVERSIONINFO_FLAGS := \
 build/apm-server-windows-amd64.exe: x-pack/apm-server/versioninfo_windows_amd64.syso
 x-pack/apm-server/versioninfo_windows_amd64.syso: GOVERSIONINFO_FLAGS+=-64
 x-pack/apm-server/versioninfo_%.syso: $(GITREFFILE) packaging/versioninfo.json
-	go run -modfile=tools/go.mod github.com/josephspurrier/goversioninfo/cmd/goversioninfo -o $@ $(GOVERSIONINFO_FLAGS) packaging/versioninfo.json
+	go tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -o $@ $(GOVERSIONINFO_FLAGS) packaging/versioninfo.json
 
 .PHONY: apm-server
 apm-server: build/apm-server-$(shell go env GOOS)-$(shell go env GOARCH)
@@ -101,7 +101,7 @@ check-full: update check staticcheck
 
 .PHONY: check-approvals
 check-approvals:
-	@go run -modfile=tools/go.mod github.com/elastic/apm-tools/cmd/check-approvals
+	@go tool github.com/elastic/apm-tools/cmd/check-approvals
 
 check: check-fmt check-headers check-git-diff
 
@@ -134,8 +134,8 @@ go-generate:
 .PHONY: add-headers
 add-headers:
 ifndef CHECK_HEADERS_DISABLED
-	@go run -modfile=tools/go.mod github.com/elastic/go-licenser -exclude x-pack
-	@go run -modfile=tools/go.mod github.com/elastic/go-licenser -license Elasticv2 x-pack
+	@go tool github.com/elastic/go-licenser -exclude x-pack
+	@go tool github.com/elastic/go-licenser -license Elasticv2 x-pack
 endif
 
 ## get-version : Get the apm server version
@@ -168,7 +168,7 @@ docs: tf-docs
 tf-docs: $(addsuffix /README.md,$(wildcard testing/infra/terraform/modules/*))
 
 testing/infra/terraform/modules/%/README.md: .FORCE
-	go run -modfile=tools/go.mod github.com/terraform-docs/terraform-docs markdown --hide-empty --header-from header.md --output-file=README.md --output-mode replace $(subst README.md,,$@)
+	go tool github.com/terraform-docs/terraform-docs markdown --hide-empty --header-from header.md --output-file=README.md --output-mode replace $(subst README.md,,$@)
 
 .PHONY: .FORCE
 .FORCE:
@@ -208,13 +208,13 @@ STATICCHECK_CHECKS?=all,-ST1000
 
 .PHONY: staticcheck
 staticcheck:
-	go run -modfile=tools/go.mod honnef.co/go/tools/cmd/staticcheck -checks=$(STATICCHECK_CHECKS) ./...
+	go tool honnef.co/go/tools/cmd/staticcheck -checks=$(STATICCHECK_CHECKS) ./...
 
 .PHONY: check-headers
 check-headers:
 ifndef CHECK_HEADERS_DISABLED
-	@go run -modfile=tools/go.mod github.com/elastic/go-licenser -d -exclude build -exclude x-pack
-	@go run -modfile=tools/go.mod github.com/elastic/go-licenser -d -exclude build -license Elasticv2 x-pack
+	@go tool github.com/elastic/go-licenser -d -exclude build -exclude x-pack
+	@go tool github.com/elastic/go-licenser -d -exclude build -license Elasticv2 x-pack
 endif
 
 .PHONY: check-docker-compose
@@ -238,9 +238,9 @@ MODULE_DEPS=$(sort $(shell \
   go list -deps -tags=darwin,linux,windows -f "{{with .Module}}{{if not .Main}}{{.Path}}{{end}}{{end}}" ./x-pack/apm-server))
 
 notice: NOTICE.txt
-NOTICE.txt build/dependencies-$(APM_SERVER_VERSION).csv: go.mod tools/go.mod
+NOTICE.txt build/dependencies-$(APM_SERVER_VERSION).csv: go.mod
 	mkdir -p build/
-	go list -m -json $(MODULE_DEPS) | go run -modfile=tools/go.mod go.elastic.co/go-licence-detector \
+	go list -m -json $(MODULE_DEPS) | go tool go.elastic.co/go-licence-detector \
 		-includeIndirect \
 		-overrides tools/notice/overrides.json \
 		-rules tools/notice/rules.json \

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -455,11 +455,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20250227144038-9ece1e3afcfb
+Version: v7.0.0-alpha2.0.20250305122545-0536310733fb
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250227144038-9ece1e3afcfb/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20250305122545-0536310733fb/LICENSE.txt:
 
 Source code in this repository is variously licensed under the Apache License
 Version 2.0, an Apache compatible license, or the Elastic License. Outside of
@@ -711,11 +711,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.18.6
+Version: v0.18.8
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].6/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].8/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -4415,11 +4415,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/pdata
-Version: v1.26.0
+Version: v1.27.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.26.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.27.0/LICENSE:
 
 
                                  Apache License
@@ -5346,11 +5346,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/net
-Version: v0.35.0
+Version: v0.36.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.35.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.36.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -5383,11 +5383,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sync
-Version: v0.11.0
+Version: v0.12.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.11.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/sync@v0.12.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -5420,11 +5420,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/term
-Version: v0.29.0
+Version: v0.30.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.30.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -5457,11 +5457,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/time
-Version: v0.10.0
+Version: v0.11.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.10.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/time@v0.11.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -5494,11 +5494,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/grpc
-Version: v1.70.0
+Version: v1.71.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.70.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/grpc@v1.71.0/LICENSE:
 
 
                                  Apache License
@@ -7058,11 +7058,11 @@ Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/cockroachdb/swiss
-Version: v0.0.0-20240612210725-f4de07ae6964
+Version: v0.0.0-20250228210649-a321086955f2
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20240612210725-f4de07ae6964/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/cockroachdb/[email protected]20250228210649-a321086955f2/LICENSE:
 
 Apache License
                            Version 2.0, January 2004
@@ -9255,11 +9255,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/fatih/color
-Version: v1.16.0
+Version: v1.18.0
 Licence type (autodetected): MIT
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/fatih/color@v1.16.0/LICENSE.md:
+Contents of probable licence file $GOMODCACHE/github.com/fatih/color@v1.18.0/LICENSE.md:
 
 The MIT License (MIT)
 
@@ -15675,11 +15675,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/apm/module/apmzap/v2
 
 --------------------------------------------------------------------------------
 Dependency : go.elastic.co/ecszap
-Version: v1.0.2
+Version: v1.0.3
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected].2/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected].3/LICENSE:
 
 
                                  Apache License
@@ -16309,11 +16309,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/semconv
-Version: v0.116.0
+Version: v0.119.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.116.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.119.0/LICENSE:
 
 
                                  Apache License
@@ -16972,11 +16972,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/crypto
-Version: v0.33.0
+Version: v0.35.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.33.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.35.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -17046,11 +17046,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sys
-Version: v0.30.0
+Version: v0.31.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.30.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.31.0/LICENSE:
 
 Copyright 2009 The Go Authors.
 
@@ -17120,11 +17120,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/genproto/googleapis/rpc
-Version: v0.0.0-20241209162323-e6fa225c2576
+Version: v0.0.0-20250115164207-1a7da9e5054f
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20241209162323-e6fa225c2576/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20250115164207-1a7da9e5054f/LICENSE:
 
 
                                  Apache License

diff --git a/cmd/intake-receiver/go.mod b/cmd/intake-receiver/go.mod
@@ -1,6 +1,6 @@
 module github.com/elastic/apm-server/cmd/intake-receiver
 
-go 1.23.6
+go 1.24.0
 
 require (
 	github.com/stretchr/testify v1.6.1

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -11,7 +11,7 @@ x-logging: &default-logging
 services:
   elasticsearch:
     # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-    image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-1e3dacfe-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:9.1.0-7fa66b89-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -43,7 +43,7 @@ services:
 
   kibana:
     # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-    image: docker.elastic.co/kibana/kibana:9.1.0-1e3dacfe-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:9.1.0-7fa66b89-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -63,7 +63,7 @@ services:
 
   metricbeat:
     # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
-    image: docker.elastic.co/beats/metricbeat:9.1.0-1e3dacfe-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:9.1.0-7fa66b89-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"