Merge remote-tracking branch 'upstream/main' into feature/support-8.x…

…-with-main * upstream/main: (100 commits) feat: bump beats to current main (elastic#14781) build(deps): bump github.com/elastic/elastic-agent-client/v7 from 7.16.0 to 7.17.0 (elastic#14757) PGO: Update default.pgo from benchmarks https://github.com/elastic/apm-server/actions/runs/12024199004/attempts/1. (elastic#14734) build(deps): bump slackapi/slack-github-action from 1.27.0 to 2.0.0 in the github-actions group (elastic#14656) build(deps): bump the otel group with 3 updates (elastic#14746) build(deps): bump the otel group across 1 directory with 4 updates (elastic#14681) testing: remove missing Make target dep (elastic#14523) build(deps): bump the dependencies group in /systemtest with 3 updates (elastic#14731) build(deps): bump chainguard/static in /packaging/docker (elastic#14732) build(deps): bump github.com/stretchr/testify from 1.9.0 to 1.10.0 (elastic#14733) chore: Update to elastic/beats@4278366ab032 (elastic#14725) changelog: add 8.15.5 entry (elastic#14720) chore: Update to elastic/beats@06ba17caf9ed (elastic#14711) Surface config parsing error under EA managed mode (elastic#14574) release-automation: update changelog template to add bug fixes section (elastic#14693) PGO: Update default.pgo from benchmarks https://github.com/elastic/apm-server/actions/runs/11946993444/attempts/1. (elastic#14699) changelog: add changelog entry for 8.16.1 (elastic#14690) chore: Update k8s stack yaml files (elastic#14686) docs: update release doc around documentation PR (elastic#14694) terraform: Use non-deprecated deployment template (elastic#14682) ...
v1v · Dec 3, 2024 · 845f9e0 · 845f9e0
2 parents 0ee30e2 + 80493ce
commit 845f9e0
Show file tree

Hide file tree

Showing 80 changed files with 3,580 additions and 3,262 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -68,7 +68,7 @@ jobs:
         with:
           go-version-file: 'go.mod'
 
-      - uses: rlespinasse/github-slug-action@797d68864753cbceedc271349d402da4590e6302
+      - uses: rlespinasse/github-slug-action@aba9f8db6ef36e0733227a62673d6592b1f430ea
 
       - name: Set up env
         run: |
@@ -99,7 +99,7 @@ jobs:
         with:
           role-duration-seconds: 18000 # 5 hours
 
-      - uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4
+      - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2
         with:
           export_to_environment: true
           secrets: |-
@@ -215,7 +215,7 @@ jobs:
           github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+        uses: crazy-max/ghaction-import-gpg@cb9bde2e2525e640591a934b1fd28eef1dcaf5e5  # v6.2.0
         with:
           gpg_private_key: ${{ secrets.APM_SERVER_RELEASE_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.APM_SERVER_RELEASE_PASSPHRASE }}
@@ -235,7 +235,7 @@ jobs:
       # there is a high chance things will stop working
       # This is trying to reduce the chances of that happening.
       # See https://github.com/elastic/observability-test-environments/actions/workflows/cluster-rotate-api-keys.yml
-      - uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4
+      - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2
         if: always()
         with:
           export_to_environment: true
@@ -256,13 +256,14 @@ jobs:
 
       # Notify result to Slack only on schedule (nightly run)
       - if: github.event_name == 'schedule'
-        uses: slackapi/slack-github-action@37ebaef184d7626c5f204ab8d3baff4262dd30f0 # v1.27.0
-        env:
-          SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
         with:
-          channel-id: "#apm-server"
+          method: chat.postMessage
+          token: ${{ secrets.SLACK_BOT_TOKEN }}
           payload: |
             {
+                "channel":  "#apm-server",
+                "text": "${{ github.event_name == 'schedule' && 'Nightly' || '' }} APM Server benchmarks succesfully executed!",
                 "blocks": [
                     {
                         "type": "section",

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -123,7 +123,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@c3a1bb2c992d77180ae65be6ae6c166cf40f857c # v45.0.3
+        uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf # v45.0.4
         with:
           files: .go-version
 

diff --git a/.github/workflows/run-minor-release.yml b/.github/workflows/run-minor-release.yml
@@ -83,7 +83,7 @@ jobs:
           github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+        uses: crazy-max/ghaction-import-gpg@cb9bde2e2525e640591a934b1fd28eef1dcaf5e5  # v6.2.0
         with:
           gpg_private_key: ${{ secrets.APM_SERVER_RELEASE_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.APM_SERVER_RELEASE_PASSPHRASE }}

diff --git a/.github/workflows/run-patch-release.yml b/.github/workflows/run-patch-release.yml
@@ -76,7 +76,7 @@ jobs:
           github-token: ${{ steps.get_token.outputs.token }}
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4  # v6.1.0
+        uses: crazy-max/ghaction-import-gpg@cb9bde2e2525e640591a934b1fd28eef1dcaf5e5  # v6.2.0
         with:
           gpg_private_key: ${{ secrets.APM_SERVER_RELEASE_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.APM_SERVER_RELEASE_PASSPHRASE }}

diff --git a/.github/workflows/smoke-tests-ess.yml b/.github/workflows/smoke-tests-ess.yml
@@ -64,7 +64,7 @@ jobs:
 
       - uses: elastic/oblt-actions/google/auth@v1
 
-      - uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4
+      - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2
         with:
           export_to_environment: true
           secrets: |-
@@ -77,7 +77,7 @@ jobs:
       # there is a high chance things will stop working
       # This is trying to reduce the chances of that happening.
       # See https://github.com/elastic/observability-test-environments/actions/workflows/cluster-rotate-api-keys.yml
-      - uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4
+      - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2
         if: always()
         with:
           export_to_environment: true

diff --git a/.github/workflows/smoke-tests-os.yml b/.github/workflows/smoke-tests-os.yml
@@ -59,7 +59,7 @@ jobs:
 
       - uses: elastic/oblt-actions/google/auth@v1
 
-      - uses: google-github-actions/get-secretmanager-secrets@95a0b09b8348ef3d02c68c6ba5662a037e78d713 # v2.1.4
+      - uses: google-github-actions/get-secretmanager-secrets@e5bb06c2ca53b244f978d33348d18317a7f263ce # v2.2.2
         with:
           export_to_environment: true
           secrets: |-

diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.23.2
+1.23.3
diff --git a/.mergify.yml b/.mergify.yml
@@ -389,3 +389,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.16 branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.16
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.16"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.16>>
 * <<apm-release-notes-8.15>>
 * <<apm-release-notes-8.14>>
 * <<apm-release-notes-8.13>>
@@ -19,6 +20,7 @@
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.16.asciidoc[]
 include::./changelogs/8.15.asciidoc[]
 include::./changelogs/8.14.asciidoc[]
 include::./changelogs/8.13.asciidoc[]

diff --git a/Makefile b/Makefile
@@ -185,7 +185,7 @@ update-beats: update-beats-module update
 
 .PHONY: update-beats-module
 update-beats-module:
-	go get -d $(BEATS_MODULE)@$(BEATS_VERSION) && go mod tidy
+	go get $(BEATS_MODULE)@$(BEATS_VERSION) && go mod tidy
 
 ##############################################################################
 # Linting, style-checking, license header checks, etc.