Merge remote-tracking branch 'upstream/main' into otel-adapter

Author: kruskall

.ci/scripts/bench.sh

@@ -125,6 +125,28 @@ function buildkite::download_last_artifact {
   BUILDKITE_DOWNLOAD_URL="${download_url}" buildkite::req_download_artifact
 }
 
+#######################################
+# Retry n number of times the given command
+function retry() {
+    local retries=$1
+    shift
+
+    local count=0
+    until "$@"; do
+        exit=$?
+        wait=$((2 ** count))
+        count=$((count + 1))
+        if [ $count -lt "$retries" ]; then
+            >&2 echo "Retry $count/$retries exited $exit, retrying in $wait seconds..."
+            sleep $wait
+        else
+            >&2 echo "Retry $count/$retries exited $exit, no more retries left."
+            return $exit
+        fi
+    done
+    return 0
+}
+
 ## Buildkite specific configuration
 if [ "${CI}" == "true" ] ; then
   # If HOME is not set then use the Buildkite workspace
@@ -147,17 +169,20 @@ if [ "${CI}" == "true" ] ; then
   [ -z "${REPO}" ] && echo "Environment variable 'REPO' must be defined" && exit 1;
   export BUILDKITE_TOKEN="${BUILDKITE_TOKEN_SECRET}"
 
+  echo "--- Setting up the :golang: environment..."
+  GO_VERSION=$(cat .go-version)
+  OS_NAME=linux
+  OS_ARCH=amd64
+  retry 5 curl -sL -o "${BASE_PROJECT}"/gvm "https://github.com/andrewkroh/gvm/releases/download/v0.5.2/gvm-${OS_NAME}-${OS_ARCH}"
+  chmod +x "${BASE_PROJECT}"/gvm
+  retry 5 "${BASE_PROJECT}"/gvm install "$GO_VERSION"
+  eval "$("${BASE_PROJECT}"/gvm use "$GO_VERSION")"
+  echo "Golang version:"
+  go version
+  GOPATH=$(command go env GOPATH)
   # Redirect go env to current dir
-  export GOROOT="${BASE_PROJECT}/.go"
-  export GOPATH="${BASE_PROJECT}/go"
   export PATH="${GOPATH}/bin:${PATH}"
 
-  # Install g (go version manager)
-  curl -sSL https://git.io/g-install | bash -s -- -y
-
-  # Install specific version
-  g install $(cat .go-version)
-
   # Make sure gomod can be deleted automatically as part of the CI
   function teardown {
     local arg=${?}

.ci/scripts/download-png-from-kibana.sh

@@ -35,7 +35,7 @@ JOB_PARAMS=$(echo "
 " | tr -d "[:space:]")
 
 
-png_url_path=$(curl -XPOST -v -L -u "$kibana_user:$kibana_pwd" -H 'kbn-xsrf: true' --data-urlencode "jobParams=${JOB_PARAMS}" $kibana_host/api/reporting/generate/pngV2 | jq -r '.path')
+png_url_path=$(curl -L -u "$kibana_user:$kibana_pwd" -H 'kbn-xsrf: true' --data-urlencode "jobParams=${JOB_PARAMS}" $kibana_host/api/reporting/generate/pngV2 | jq -r '.path')
 
 if [[ "$png_url_path" == "null" ]]
 then

.ci/updatecli/bump-golang.yml

@@ -106,7 +106,6 @@ targets:
       files:
         - go.mod
         - cmd/intake-receiver/go.mod
-        - internal/glog/go.mod
         - systemtest/go.mod
         - tools/go.mod
       matchpattern: 'go \d+.\d+'

.github/workflows/benchmarks.yml

@@ -8,6 +8,16 @@ on:
         required: false
         type: boolean
         default: false
+      enableTailSampling:
+        description: 'Enable tail-based sampling on the APM server'
+        required: false
+        type: boolean
+        default: false
+      tailSamplingStorageLimit:
+        description: 'Storage size limit of tail-based sampling on the APM server, defaults to 10GB'
+        required: false
+        type: string
+        default: "10GB"
       profile:
         description: 'The system profile used to run the benchmarks'
         required: false
@@ -52,12 +62,14 @@ jobs:
       TF_VAR_private_key: ./id_rsa_terraform
       TF_VAR_public_key: ./id_rsa_terraform.pub
       TF_VAR_run_standalone: ${{ inputs.runStandalone || github.event.schedule=='0 5 */5 * *' }}
+      TF_VAR_apm_server_tail_sampling: ${{ inputs.enableTailSampling || 'false' }} # set the default again otherwise schedules won't work
+      TF_VAR_apm_server_tail_sampling_storage_limit: ${{ inputs.tailSamplingStorageLimit || '10GB' }} # set the default again otherwise schedules won't work
       RUN_STANDALONE: ${{ inputs.runStandalone || github.event.schedule=='0 5 */5 * *' }}
       TFVARS_SOURCE: ${{ inputs.profile || 'system-profiles/8GBx1zone.tfvars' }} # // Default to use an 8gb profile
       TF_VAR_BUILD_ID: ${{ github.run_id }}
       TF_VAR_ENVIRONMENT: ci
       TF_VAR_REPO: ${{ github.repository }}
-      GOBENCH_TAGS: branch=${{ github.head_ref || github.ref }},commit=${{ github.sha }},target_branch=${{ github.base_ref }}
+      GOBENCH_TAGS: branch=${{ github.head_ref || github.ref }},commit=${{ github.sha }},target_branch=${{ github.base_ref }},enable_tail_sampling=${{ inputs.enableTailSampling }}
       GOBENCH_PASSWORD: ${{ secrets.GOBENCH_PASSWORD }}
       GOBENCH_USERNAME: ${{ secrets.GOBENCH_USERNAME }}
       GOBENCH_HOST: ${{ secrets.GOBENCH_HOST }}

.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@4edd678ac3f81e2dc578756871e4d00c19191daf # v45.0.4
+        uses: tj-actions/changed-files@bab30c2299617f6615ec02a68b9a40d10bd21366 # v45.0.5
         with:
           files: .go-version
 

.go-version

@@ -1 +1 @@
-1.23.3
+1.23.4

CHANGELOG.asciidoc

@@ -1,4 +1,5 @@
 // tag::list[]
+* <<apm-release-notes-8.17>>
 * <<apm-release-notes-8.16>>
 * <<apm-release-notes-8.15>>
 * <<apm-release-notes-8.14>>
@@ -20,6 +21,7 @@
 
 // tag::includes[]
 include::./changelogs/head.asciidoc[]
+include::./changelogs/8.17.asciidoc[]
 include::./changelogs/8.16.asciidoc[]
 include::./changelogs/8.15.asciidoc[]
 include::./changelogs/8.14.asciidoc[]

Makefile

@@ -180,7 +180,7 @@ BEATS_VERSION?=main
 BEATS_MODULE:=github.com/elastic/beats/v7
 
 .PHONY: update-beats
-update-beats: update-beats-module update
+update-beats: update-beats-module tidy notice
 	@echo --- Use this commit message: Update to elastic/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)
 
 .PHONY: update-beats-module