Merge branch 'main' into feature/patch-release

.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
 

.ci/update-beats.yml

@@ -44,15 +44,14 @@ sources:
           captureindex: 1
 
 conditions:
-  is:
+  is-already-updated:
     name: Is version 'github.com/elastic/beats@{{ source "beats" }}' not updated in 'go.mod'?
-    kind: file
+    kind: shell
     disablesourceinput: true
     scmid: default
     spec:
-      file: go.mod
-      matchpattern: 'github\.com/elastic/beats.*-{{ source "beats" }}'
-    failwhen: true
+      command: grep {{ source "beats" }} go.mod && exit 1 || exit 0
+    failwhen: false
 
 targets:
   beats:
@@ -64,5 +63,4 @@ targets:
       command: .ci/scripts/update-beats.sh
       environments:
         - name: PATH
-        - name: GOPATH
         - name: HOME

.github/workflows/benchmarks.yml

@@ -50,7 +50,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
-      - uses: rlespinasse/github-slug-action@00d4236bb38fcea6fc4aa6b1dacc7187fc8e38a0
+      - uses: rlespinasse/github-slug-action@5ee5b39fa5c99792f9d15268f75694c7746408e5
 
       - name: Set up env
         run: |

NOTICE.txt

@@ -1,5 +1,5 @@
 Elastic APM Server
-Copyright 2014-2023 Elasticsearch BV
+Copyright 2014-2024 Elasticsearch BV
 
 This product includes software developed by The Apache Software 
 Foundation (http://www.apache.org/).
@@ -362,11 +362,11 @@ these terms.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/apm-data
-Version: v0.1.1-0.20231120111210-bd8f3ecad5bb
+Version: v0.1.1-0.20231212041654-b2a4dabeb6e3
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231120111210-bd8f3ecad5bb/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].20231212041654-b2a4dabeb6e3/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.20231218141841-a633696068ed
+Version: v7.0.0-alpha2.0.20240108094715-95f0f85a3edd
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20231218141841-a633696068ed/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20240108094715-95f0f85a3edd/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
@@ -596,11 +596,11 @@ License Version 2.0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-client/v7
-Version: v7.5.0
+Version: v7.6.0
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.5.0/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-client/v7@v7.6.0/LICENSE.txt:
 
 ELASTIC LICENSE AGREEMENT
 
@@ -829,11 +829,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.7.2
+Version: v0.7.3
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/[email protected].3/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -6640,11 +6640,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/net
-Version: v0.17.0
+Version: v0.19.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.17.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/net@v0.19.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -6714,11 +6714,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/term
-Version: v0.13.0
+Version: v0.15.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.13.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.15.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18332,11 +18332,11 @@ THE SOFTWARE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/crypto
-Version: v0.14.0
+Version: v0.17.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.14.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.17.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18369,11 +18369,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/exp
-Version: v0.0.0-20230713183714-613f0c0eb8a1
+Version: v0.0.0-20231127185646-65229373498e
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20230713183714-613f0c0eb8a1/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/[email protected]20231127185646-65229373498e/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18406,11 +18406,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/sys
-Version: v0.14.0
+Version: v0.15.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.14.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.15.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 
@@ -18443,11 +18443,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : golang.org/x/text
-Version: v0.13.0
+Version: v0.14.0
 Licence type (autodetected): BSD-3-Clause
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.13.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/golang.org/x/text@v0.14.0/LICENSE:
 
 Copyright (c) 2009 The Go Authors. All rights reserved.
 

README.md

@@ -11,7 +11,7 @@ For questions and feature requests, visit the [discussion forum](https://discuss
 
 ## Getting Started
 
-To get started with APM, see our [Quick start guide](https://www.elastic.co/guide/en/apm/get-started/current/install-and-run.html).
+To get started with APM, see our [Quick start guide](https://www.elastic.co/guide/en/apm/guide/current/apm-quick-start.html).
 
 ## APM Server Development
 
@@ -61,7 +61,7 @@ To run APM Server with debugging output enabled, run:
 ```
 
 APM Server expects index templates, ILM policies, and ingest pipelines to be set up externally.
-This should be done by [installing the APM integration](https://www.elastic.co/guide/en/fleet/current/fleet-quick-start-traces.html#add-apm-integration).
+This should be done by [installing the APM integration](https://www.elastic.co/guide/en/observability/current/traces-get-started.html#add-apm-integration).
 When running APM Server directly, it is only necessary to install the integration and not to run an Elastic Agent.
 
 #### Tilt
@@ -139,7 +139,7 @@ When complete, packages can be found in `build/distributions/`.
 
 ### Building docker packages
 
-To customize image configuration, see [the docs](https://www.elastic.co/guide/en/apm/server/current/running-on-docker.html).
+To customize image configuration, see [the docs](https://www.elastic.co/guide/en/apm/guide/current/running-on-docker.html).
 
 To build docker images from source, run:
 
@@ -154,5 +154,13 @@ Building pre-release images can be done by running `make package-docker-snapshot
 
 ## Documentation
 
-[Documentation](https://www.elastic.co/guide/en/apm/server/current/index.html)
-for the APM Server can be found in the `docs` and `dev_docs` folders.
+Documentation for the APM Server can be found in the [Observability guide's APM section](https://www.elastic.co/guide/en/observability/master/apm.html). Most documentation files live in the [elastic/observability-docs](https://github.com/elastic/observability-docs) repo's [`docs/en/observability/apm/` directory](https://github.com/elastic/observability-docs/tree/main/docs/en/observability/apm).
+
+However, the following content lives in this repo:
+
+* The **changelog** page listing all release notes is in [`CHANGELOG.asciidoc`](/CHANGELOG.asciidoc).
+* Each minor version's **release notes** are documented in individual files in the [`changelogs/`](/changelogs/) directory.
+* A list of all **breaking changes** are documented in [`changelogs/all-breaking-changes.asciidoc`](/changelogs/all-breaking-changes.asciidoc).
+* **Sample data sets** that are injected into the docs are in the [`docs/data/`](/docs/data/) directory.
+* **Specifications** that are injected into the docs are in the [`docs/spec/`](/docs/spec/) directory.
+

changelogs/head.asciidoc

@@ -18,3 +18,4 @@ https://github.com/elastic/apm-server/compare/8.12\...main[View commits]
 
 [float]
 ==== Added
+- map OTel's `span.Status: Unset` to `event.outcome: success` instead of `event.outcome: unknown`

dev_docs/RELEASES.md

@@ -9,7 +9,7 @@ For patch releases, only the version on the existing major and minor version bra
 
 ## Feature Freeze
 
-* For patch releases, ensure all relevant backport PRs are merged. 
+* For patch releases, ensure all relevant backport PRs are merged.
   We use backport labels on PRs and automation to ensure labels are set.
 
 * Update Changelog
@@ -30,9 +30,9 @@ For patch releases, only the version on the existing major and minor version bra
     Update versions and ensure that the `BEATS_VERSION` in the Makefile is updated,
     e.g. [#2803](https://github.com/elastic/apm-server/pull/2803/files).
     Trigger a new beats update, once the beats branch is also created.
-    Remove the [changelogs/head.asciidoc](https://github.com/elastic/apm-server/blob/main/changelogs/head.asciidoc) file from the release branch. 
+    Remove the [changelogs/head.asciidoc](https://github.com/elastic/apm-server/blob/main/changelogs/head.asciidoc) file from the release branch.
 
-  * Main branch: 
+  * Main branch:
     Update [.mergify.yml](https://github.com/elastic/apm-server/blob/main/.mergify.yml) with a new backport rule for the next version,
     and update versions to next minor version, e.g. [#2804](https://github.com/elastic/apm-server/pull/2804).
 
@@ -86,7 +86,7 @@ For patch releases, only the version on the existing major and minor version bra
 
 ## When compatibility between Agents & Server changes
 
-* Update the [agent/server compatibility matrix](https://github.com/elastic/apm-server/blob/main/docs/guide/agent-server-compatibility.asciidoc).
+* Update the [agent/server compatibility matrix](https://github.com/elastic/observability-docs/blob/main/docs/en/observability/apm/agent-server-compatibility.asciidoc) in the elastic/observability repo.
 
 ## Templates
 

docker-compose.yml

@@ -10,7 +10,7 @@ x-logging: &default-logging
     max-size: "1g"
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-h30gube9-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.13.0-8upz6ftd-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +41,7 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.13.0-h30gube9-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.13.0-8upz6ftd-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +60,7 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.13.0-h30gube9-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.13.0-8upz6ftd-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"

docs/README.md

@@ -0,0 +1,10 @@
+> [!IMPORTANT]
+> As of 8.12, most documentation source files have moved to the [elastic/observability-docs](https://github.com/elastic/observability-docs) repo and been integrated into the Observability guide ([`docs/en/observability/apm/`](https://github.com/elastic/observability-docs/tree/main/docs/en/observability/apm)).
+>
+> However, the following content still lives in this repo:
+>
+> * The **changelog** page listing all release notes is in [`CHANGELOG.asciidoc`](/CHANGELOG.asciidoc).
+> * Each minor version's **release notes** are documented in individual files in the [`changelogs/`](/changelogs/) directory.
+> * A list of all **breaking changes** are documented in [`changelogs/all-breaking-changes.asciidoc`](/changelogs/all-breaking-changes.asciidoc).
+> * **Sample data sets** that are injected into the docs are in the [`docs/data/`](/docs/data/) directory.
+> * **Specifications** that are injected into the docs are in the [`docs/spec/`](/docs/spec/) directory.