Merge branch 'main' into feat/drop-go-elasticsearch

Author: kruskall

.github/workflows/ci.yml

@@ -54,16 +54,13 @@ jobs:
         with:
           go-version-file: go.mod
           cache: true
+      - run: go test -v -race ./...
       - env:
-          CGO_ENABLED: "0"
-        run: go test -v ./...
-      - env:
-          CGO_ENABLED: "0"
           KIBANA_URL: "https://kibana.test"
           KIBANA_APIKEY: "dummy"
         # run functionaltests internal tests
         # functionaltests themselves are run in the functional-tests pipeline
-        run: cd ./functionaltests && go test -v ./internal/...
+        run: cd ./functionaltests && go test -v -race ./internal/...
 
   test-fips:
     runs-on: ubuntu-latest
@@ -74,10 +71,9 @@ jobs:
           go-version-file: go.mod
           cache: true
       - env:
-          CGO_ENABLED: "0"
           GOFIPS140: "latest"
           GODEBUG: "fips140=only"
-        run: go test -v -tags=requirefips ./...
+        run: go test -v -race -tags=requirefips ./...
 
   system-test:
     runs-on: ubuntu-latest
@@ -92,7 +88,7 @@ jobs:
             systemtest/go.sum
       - run: docker compose up -d
       - env:
-          GOTESTFLAGS: "-v -json"
+          GOTESTFLAGS: "-v"
           GH_TOKEN: ${{ github.token }}
         run: make system-test
 

.github/workflows/comment-on-asciidoc-changes.yml

@@ -0,0 +1,19 @@
+name: docs-build
+
+on:
+  push:
+    branches:
+      - main
+  pull_request_target: ~
+  merge_group: ~
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-build.yml@main
+    with:
+      path-pattern: docs/**
+    permissions:
+      deployments: write
+      id-token: write
+      contents: read
+      pull-requests: read

.github/workflows/docs-build.yml

@@ -0,0 +1,14 @@
+name: docs-cleanup
+
+on:
+  pull_request_target:
+    types:
+      - closed
+
+jobs:
+  docs-preview:
+    uses: elastic/docs-builder/.github/workflows/preview-cleanup.yml@main
+    permissions:
+      contents: none
+      id-token: write
+      deployments: write

.github/workflows/docs-cleanup.yml

@@ -16,6 +16,7 @@
 /apm-server.keystore
 /apm-server
 /apm-server-oss
+/apm-server-fips
 **/*.test
 /docs/elastic/
 html_docs

.gitignore

@@ -1 +1 @@
-1.24.0
+1.24.1

.go-version

@@ -0,0 +1,5 @@
+# Changelog
+
+<!-- * [Elastic APM v9.x](TBD) -->
+* [Elastic APM v8.x](https://www.elastic.co/guide/en/observability/8.x/apm-release-notes.html)
+* [Elastic APM v7.x](https://www.elastic.co/guide/en/apm/guide/7.17/release-notes.html)

CHANGELOG.asciidoc

@@ -53,12 +53,20 @@ LDFLAGS := \
 # the apm-server binaries.
 .PHONY: $(APM_SERVER_BINARIES)
 $(APM_SERVER_BINARIES):
-	env CGO_ENABLED=0 GOOS=$(GOOS) GOARCH=$(GOARCH) \
-	go build -o $@ -trimpath $(GOFLAGS) $(GOMODFLAG) -ldflags "$(LDFLAGS)" ./x-pack/apm-server
+	# call make instead of using a prerequisite to force it to run the task when
+	# multiple targets are specified
+	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) PKG=$(PKG) GOTAGS=$(GOTAGS) SUFFIX=$(SUFFIX) EXTENSION=$(EXTENSION) NOCP=1 \
+		    $(MAKE) apm-server
+
+.PHONY: apm-server-build
+apm-server-build:
+	env CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) \
+	go build -o "build/apm-server-$(GOOS)-$(GOARCH)$(SUFFIX)$(EXTENSION)" -trimpath $(GOFLAGS) $(GOTAGS) $(GOMODFLAG) -ldflags "$(LDFLAGS)" $(PKG)
 
 build/apm-server-linux-%: GOOS=linux
 build/apm-server-darwin-%: GOOS=darwin
 build/apm-server-windows-%: GOOS=windows
+build/apm-server-windows-%: EXTENSION=.exe
 build/apm-server-%-amd64 build/apm-server-%-amd64.exe: GOARCH=amd64
 build/apm-server-%-arm64 build/apm-server-%-arm64.exe: GOARCH=arm64
 
@@ -70,27 +78,43 @@ 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 tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -o $@ $(GOVERSIONINFO_FLAGS) packaging/versioninfo.json
+	# this task is only used when building apm-server for windows (GOOS=windows)
+	# but it could be run from any OS so use the host os and arch.
+	GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) go tool github.com/josephspurrier/goversioninfo/cmd/goversioninfo -o $@ $(GOVERSIONINFO_FLAGS) packaging/versioninfo.json
+
+.PHONY: apm-server apm-server-oss apm-server-fips
+
+apm-server-oss: PKG=./cmd/apm-server
+apm-server apm-server-fips: PKG=./x-pack/apm-server
+
+apm-server-fips: CGO_ENABLED=1
+apm-server apm-server-oss: CGO_ENABLED=0
+
+apm-server-fips: GOTAGS=-tags=requirefips
 
-.PHONY: apm-server
-apm-server: build/apm-server-$(shell go env GOOS)-$(shell go env GOARCH)
-	@cp $^ $@
+apm-server-oss: SUFFIX=-oss
+apm-server-fips: SUFFIX=-fips
 
-.PHONY: apm-server-oss
-apm-server-oss:
-	@go build $(GOMODFLAG) -o $@ ./cmd/apm-server
+apm-server apm-server-oss apm-server-fips:
+	# call make instead of using a prerequisite to force it to run the task when
+	# multiple targets are specified
+	CGO_ENABLED=$(CGO_ENABLED) GOOS=$(GOOS) GOARCH=$(GOARCH) PKG=$(PKG) GOTAGS=$(GOTAGS) SUFFIX=$(SUFFIX) EXTENSION=$(EXTENSION) \
+		    $(MAKE) apm-server-build
+	@[ "${NOCP}" ] || cp "build/apm-server-$(GOOS)-$(GOARCH)$(SUFFIX)$(EXTENSION)" "apm-server$(SUFFIX)"
 
 .PHONY: test
 test:
-	@go test $(GOMODFLAG) $(GOTESTFLAGS) ./...
+	@go test $(GOMODFLAG) $(GOTESTFLAGS) -race ./...
 
 .PHONY: system-test
 system-test:
-	@(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -timeout=20m ./...)
+	# CGO is disabled when building APM Server binary, so the race detector in this case
+	# would only work on the parts that don't involve APM Server binary.
+	@(cd systemtest; go test $(GOMODFLAG) $(GOTESTFLAGS) -race -timeout=20m ./...)
 
 .PHONY:
 clean:
-	@rm -rf build apm-server apm-server.exe
+	@rm -rf build apm-server apm-server.exe apm-server-oss apm-server-fips
 
 ##############################################################################
 # Checks/tests.