Merge branch 'main' into chore/rename-apm-k8s

elastic · Dec 22, 2023 · 7a50d6b · 7a50d6b
2 parents 11702a7 + 2907605
commit 7a50d6b
Show file tree

Hide file tree

Showing 40 changed files with 512 additions and 218 deletions.
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
@@ -70,7 +70,7 @@ if command -v docker &>/dev/null; then
     DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}")
-    docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY_SECRET}"
+    retry 4 docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKER_REGISTRY_SECRET}"
     unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
     export DOCKER_REGISTRY_SECRET
     retry 4 docker pull --quiet docker.elastic.co/infra/release-manager:latest
@@ -80,7 +80,7 @@ if command -v docker &>/dev/null; then
     DOCKER_USERNAME_SECRET=$(retry 5 vault kv get -field username "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKER_PASSWORD_SECRET=$(retry 5 vault kv get -field password "${DOCKER_REGISTRY_SECRET_PATH}")
     DOCKERHUB_REGISTRY_SECRET=$(retry 5 vault kv get -field registry "${DOCKER_REGISTRY_SECRET_PATH}")
-    docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}"
+    retry 4 docker login -u "${DOCKER_USERNAME_SECRET}" -p "${DOCKER_PASSWORD_SECRET}" "${DOCKERHUB_REGISTRY_SECRET}"
     unset DOCKER_USERNAME_SECRET DOCKER_PASSWORD_SECRET
 fi
 

diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -134,7 +134,7 @@ jobs:
           $PNG_REPORT_FILE
 
       - name: Upload PNG
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: kibana-png-report
           path: ${{ env.WORKING_DIRECTORY }}/${{ env.PNG_REPORT_FILE }}
@@ -150,7 +150,7 @@ jobs:
           echo "png_report_url=https://elastic-apm-server-benchmark-reports.s3.amazonaws.com/${DEST_NAME}" >> "$GITHUB_OUTPUT"
 
       - name: Upload benchmark result
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: benchmark-result

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
           go run -modfile=tools/go.mod gotest.tools/gotestsum \
           --no-color -f standard-quiet --jsonfile "$OUTPUT_JSON_FILE" --junitfile "$OUTPUT_JUNIT_FILE" \
           --raw-command -- make system-test
-      - uses: actions/upload-artifact@v3  # upload test results
+      - uses: actions/upload-artifact@v4  # upload test results
         if: ${{ always() }} # run this step even if previous step failed
         with:
           name: test-results

diff --git a/.github/workflows/opentelemetry.yml b/.github/workflows/opentelemetry.yml
@@ -3,13 +3,17 @@ name: OpenTelemetry Export Trace
 on:
   workflow_run:
     workflows:
+      - benchmarks
       - bump-elastic-stack-snapshot
       - bump-golang
       - ci
       - microbenchmark
-      - system-test-reporter
+      - run-minor-release
+      - run-patch-release
+      - smoke-tests
       - smoke-tests-os
       - smoke-tests-ess
+      - system-test-reporter
       - Terraform Format
       - update-beats
     types: [completed]

diff --git a/.github/workflows/run-minor-release.yml b/.github/workflows/run-minor-release.yml
@@ -0,0 +1,22 @@
+---
+name: run-minor-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'The version (semver format: major.minor.patch)'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+env:
+  SLACK_CHANNEL: "#apm-server-test-release"
+
+jobs:
+  run-minor:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml
@@ -0,0 +1,22 @@
+---
+name: run-patch-release
+
+on:
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'The version (semver format: major.minor.patch)'
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+env:
+  SLACK_CHANNEL: "#apm-server-test-release"
+
+jobs:
+  run-patch:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.21.4
+1.21.5
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -1,3 +1,20 @@
+// tag::list[]
+* <<release-notes-8.12>>
+* <<release-notes-8.11>>
+* <<release-notes-8.10>>
+* <<release-notes-8.9>>
+* <<release-notes-8.8>>
+* <<release-notes-8.7>>
+* <<release-notes-8.6>>
+* <<release-notes-8.5>>
+* <<release-notes-8.4>>
+* <<release-notes-8.3>>
+* <<release-notes-8.2>>
+* <<release-notes-8.1>>
+* <<release-notes-8.0>>
+// end::list[]
+
+// tag::includes[]
 include::./changelogs/head.asciidoc[]
 include::./changelogs/8.12.asciidoc[]
 include::./changelogs/8.11.asciidoc[]
@@ -12,3 +29,4 @@ include::./changelogs/8.3.asciidoc[]
 include::./changelogs/8.2.asciidoc[]
 include::./changelogs/8.1.asciidoc[]
 include::./changelogs/8.0.asciidoc[]
+// end::includes[]
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -362,11 +362,11 @@ these terms.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/apm-data
-Version: v0.1.1-0.20231019120308-82201b991ae5
+Version: v0.1.1-0.20231120111210-bd8f3ecad5bb
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231019120308-82201b991ae5/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231120111210-bd8f3ecad5bb/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20231204124921-be42a3369f94
+Version: v7.0.0-alpha2.0.20231218141841-a633696068ed
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231204124921-be42a3369f94/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231218141841-a633696068ed/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
@@ -1040,11 +1040,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-l
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-system-metrics
-Version: v0.9.0
+Version: v0.9.1
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE.txt:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1884,11 +1884,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearc
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/go-sysinfo
-Version: v1.11.1
+Version: v1.11.2
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].1/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE.txt:
 
 
                                  Apache License

diff --git a/changelogs/8.12.asciidoc b/changelogs/8.12.asciidoc
@@ -17,6 +17,9 @@ https://github.com/elastic/apm-server/compare/8.11\...8.12[View commits]
 [float]
 ==== Bug fixes
 - Switch built-in ILM rollover policies from max_size to max_primary_shard_size {pull}11729[11729].
+- Handle empty request bodies gracefully {pull}12242[12242].
+- Wrap processor errors to provide more details {pull}12242[12242].
+- Require only one of exception.{type,message} for log exceptions {pull}12242[12242].
 
 [float]
 ==== Added