Merge branch 'main' into changelog-8.15-integration-ingest-pipeline

elastic · Sep 12, 2024 · d5a5068 · d5a5068
2 parents 6c5803c + 7a39bce
commit d5a5068
Show file tree

Hide file tree

Showing 16 changed files with 137 additions and 90 deletions.
diff --git a/.buildkite/scripts/dra.sh b/.buildkite/scripts/dra.sh
@@ -34,7 +34,11 @@ DRA_BRANCH="$BUILDKITE_BRANCH"
 dra_command=collect
 BRANCHES_URL=https://storage.googleapis.com/artifacts-api/snapshots/branches.json
 curl -s "${BRANCHES_URL}" > active-branches.json
-if ! grep -q "\"$BUILDKITE_BRANCH\"" active-branches.json ; then
+# as long as `8.x` is not in the active branches, we will explicitly add the condition.
+if [ "$BUILDKITE_BRANCH" == "8.x" ] || grep -q "\"$BUILDKITE_BRANCH\"" active-branches.json ; then
+  echo "--- :arrow_right: Release Manager only supports the current active branches and 8.x, running"
+else
+  # If no active branches are found, let's see if it is a feature branch.
   echo "--- :arrow_right: Release Manager only supports the current active branches, skipping"
   echo "BUILDKITE_BRANCH=$BUILDKITE_BRANCH"
   echo "BUILDKITE_COMMIT=$BUILDKITE_COMMIT"
@@ -98,6 +102,7 @@ dra() {
 }
 
 dra "snapshot" "$dra_command"
-if [[ "${DRA_BRANCH}" != "main" ]]; then
+if [[ "${DRA_BRANCH}" != "main" && "${DRA_BRANCH}" != "8.x" ]]; then
+  echo "DRA_BRANCH is neither 'main' nor '8.x'"
   dra "staging" "$dra_command"
 fi
diff --git a/.ci/updatecli/values.d/scm.yml b/.ci/updatecli/values.d/scm.yml
@@ -6,5 +6,4 @@ scm:
   commitusingapi: true
   # begin updatecli-compose policy values
   user: obltmachine
-  email: [email protected]
   # end updatecli-compose policy values
diff --git a/.github/workflows/microbenchmark.yml b/.github/workflows/microbenchmark.yml
@@ -8,6 +8,7 @@ on:
     branches:
       - main
       - "8.[0-9]+"
+      - "8.x"
     paths-ignore:
       - '**.md'
       - '**.asciidoc'

diff --git a/.mergify.yml b/.mergify.yml
@@ -1,5 +1,6 @@
 queue_rules:
   - name: default
+    merge_method: squash
     conditions:
       - check-success=test (macos-latest)
       - check-success=test (windows-latest)
@@ -150,7 +151,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: delete updatecli branch after merging/closing it
     conditions:
@@ -174,18 +174,34 @@ pull_request_rules:
           branches, such as:
           * `backport-7.17` is the label to automatically backport to the 7.17 branch.
           * `backport-8./d` is the label to automatically backport to the `8./d` branch. `/d` is the digit.
+          * `backport-8.x` is the label to automatically backport to the `8.x` branch.
 
-          **NOTE**: `backport-skip` has been added to this pull request.
+  - name: add backport-8.x for the all the PRs targeting main if no skipped or assigned already
+    conditions:
+      - -label~=^(backport-skip|backport-8.x)$
+      - base=main
+    actions:
+      comment:
+        message: |
+          `backport-8.x` has been added to help with the transition to the new branch `8.x`.
+          If you don't need it please use `backport-skip` label.
       label:
         add:
-          - backport-skip
+          - backport-8.x
   - name: remove backport-skip label
     conditions:
       - label~=^backport-\d
     actions:
       label:
         remove:
           - backport-skip
+  - name: remove backport-8.x label if backport-skip is present
+    conditions:
+      - label~=^backport-skip
+    actions:
+      label:
+        remove:
+          - backport-8.x
   - name: notify the backport has not been merged yet
     conditions:
       - -merged
@@ -204,7 +220,6 @@ pull_request_rules:
       - -conflict
     actions:
       queue:
-        method: squash
         name: default
   - name: backport patches to 8.5 branch
     conditions:
@@ -360,3 +375,17 @@ pull_request_rules:
         labels:
           - "backport"
         title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
+  - name: backport patches to 8.x branch
+    conditions:
+      - merged
+      - base=main
+      - label=backport-8.x
+    actions:
+      backport:
+        assignees:
+          - "{{ author }}"
+        branches:
+          - "8.x"
+        labels:
+          - "backport"
+        title: "[{{ destination_branch }}] {{ title }} (backport #{{ number }})"
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -3310,11 +3310,11 @@ Contents of probable licence file $GOMODCACHE/github.com/modern-go/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger
-Version: v0.108.0
+Version: v0.109.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.108.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger@v0.109.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -5135,11 +5135,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/consumer
-Version: v0.108.1
+Version: v0.109.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.108.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/consumer@v0.109.0/LICENSE:
 
 
                                  Apache License
@@ -5347,11 +5347,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/cons
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/pdata
-Version: v1.14.1
+Version: v1.15.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.14.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdata@v1.15.0/LICENSE:
 
 
                                  Apache License
@@ -5559,11 +5559,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/pdat
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel
-Version: v1.29.0
+Version: v1.30.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.30.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -5770,11 +5770,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/[email protected]/L
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/metric
-Version: v1.29.0
+Version: v1.30.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.30.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -5981,11 +5981,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/sdk/metric
-Version: v1.29.0
+Version: v1.30.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk/metric@v1.30.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -6397,11 +6397,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/grpc
-Version: v1.66.0
+Version: v1.66.1
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].0/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/[email protected].1/LICENSE:
 
 
                                  Apache License
@@ -13417,11 +13417,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal
-Version: v0.108.0
+Version: v0.109.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.108.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal@v0.109.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -13743,11 +13743,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/prometheus/client_golang
-Version: v1.20.1
+Version: v1.20.2
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].1/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/prometheus/[email protected].2/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -14165,11 +14165,11 @@ Contents of probable licence file $GOMODCACHE/github.com/prometheus/client_model
 
 --------------------------------------------------------------------------------
 Dependency : github.com/prometheus/common
-Version: v0.55.0
+Version: v0.57.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.55.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/prometheus/common@v0.57.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -16434,11 +16434,11 @@ Contents of probable licence file $GOMODCACHE/go.elastic.co/[email protected]/LICENS
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/collector/semconv
-Version: v0.108.1
+Version: v0.109.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.108.1/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semconv@v0.109.0/LICENSE:
 
 
                                  Apache License
@@ -16646,11 +16646,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/collector/semc
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/sdk
-Version: v1.29.0
+Version: v1.30.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.30.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -16857,11 +16857,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/[email protected]
 
 --------------------------------------------------------------------------------
 Dependency : go.opentelemetry.io/otel/trace
-Version: v1.29.0
+Version: v1.30.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.29.0/LICENSE:
+Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.30.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -17245,11 +17245,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 --------------------------------------------------------------------------------
 Dependency : google.golang.org/genproto/googleapis/rpc
-Version: v0.0.0-20240730163845-b1a4ccb954bf
+Version: v0.0.0-20240822170219-fc7c04adadcd
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20240730163845-b1a4ccb954bf/LICENSE:
+Contents of probable licence file $GOMODCACHE/google.golang.org/genproto/googleapis/[email protected]20240822170219-fc7c04adadcd/LICENSE:
 
 
                                  Apache License

diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -41,7 +41,7 @@ spec:
         build_pull_requests: true
         build_tags: false
         filter_enabled: true
-        filter_condition: build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/ || build.branch =~ /^feature\//
+        filter_condition: build.branch == "main" || build.branch == "8.x" || build.branch =~ /^[0-9]+\.[0-9]+$$/ || build.branch =~ /^feature\//
       cancel_intermediate_builds: false
       skip_intermediate_builds: false
       teams:

diff --git a/cmd/intake-receiver/version.go b/cmd/intake-receiver/version.go
@@ -18,4 +18,4 @@
 package main
 
 // version matches the APM Server's version
-const version = "8.16.0"
+const version = "9.0.0"
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -10,7 +10,8 @@ x-logging: &default-logging
     max-size: "1g"
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-3a37a73c-SNAPSHOT
+    # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.16.0-2156c99d-SNAPSHOT
     ports:
       - 9200:9200
     healthcheck:
@@ -41,7 +42,8 @@ services:
     logging: *default-logging
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:8.16.0-3a37a73c-SNAPSHOT
+    # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
+    image: docker.elastic.co/kibana/kibana:8.16.0-2156c99d-SNAPSHOT
     ports:
       - 5601:5601
     healthcheck:
@@ -60,7 +62,8 @@ services:
     logging: *default-logging
 
   metricbeat:
-    image: docker.elastic.co/beats/metricbeat:8.16.0-3a37a73c-SNAPSHOT
+    # TODO: replace with a pinned version such as 9.0.0-aaaaaaaa-SNAPSHOT
+    image: docker.elastic.co/beats/metricbeat:8.16.0-2156c99d-SNAPSHOT
     environment:
       ELASTICSEARCH_HOSTS: '["http://elasticsearch:9200"]'
       ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-admin}"