Merge branch 'elastic:main' into main

Author: alexandra5000

.buildkite/integration.pipeline.yml

@@ -4,6 +4,9 @@ env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
   ASDF_MAGE_VERSION: 1.14.0
 
+  # Make Docker builds less verbose
+  BUILDKIT_PROGRESS: plain
+
   # The following images are defined here and their values will be updated by updatecli
   # Please do not change them manually.
   IMAGE_UBUNTU_2204_X86_64: "platform-ingest-elastic-agent-ubuntu-2204-1762801856"

.buildkite/pipeline.yml

@@ -348,6 +348,19 @@ steps:
         - .buildkite/scripts/steps/beats_tests.sh
         - .buildkite/hooks/pre-command
 
+  # NOTE: This should help detecting issues earlier in the development cycle
+  # See https://github.com/elastic/elastic-agent/issues/11604
+  - label: "Trigger Elastic Agent Package"
+    if: build.pull_request.id != null
+    commands:
+      - .buildkite/scripts/steps/trigger-elastic-agent-package.sh
+      - .buildkite/scripts/steps/trigger-elastic-agent-package.sh | buildkite-agent pipeline upload
+    if_changed:
+      include:
+        - .buildkite/pipeline.elastic-agent-package.yml
+        - .buildkite/scripts/steps/package.sh
+        - .buildkite/scripts/steps/trigger-elastic-agent-package.sh
+
   # wait for CI to be done
   - wait: ~
 

.buildkite/scripts/steps/trigger-elastic-agent-package.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# Create a dynamic buildkite step for running the elastic-agent-package pipeline.
+#
+# Required environment variables:
+#  - BUILDKITE_PULL_REQUEST
+#  - BUILDKITE_COMMIT
+#  - BUILDKITE_BRANCH
+#  - BUILDKITE_PULL_REQUEST_BASE_BRANCH
+#
+
+if [ ! -f .package-version ]; then
+  echo ".package-version file not found!"
+  exit 1
+fi
+
+# No need for the snapshot but the three digits version is required
+BEAT_VERSION=$(jq -r .version .core_version)
+MANIFEST_URL=$(jq -r .manifest_url .package-version)
+
+cat << EOF
+  - label: ":pipeline: Run elastic-agent-package"
+    trigger: "elastic-agent-package"
+    build:
+      message: "#${BUILDKITE_PULL_REQUEST} - Verify elastic-agent-package works"
+      commit: "${BUILDKITE_COMMIT}"
+      branch: "${BUILDKITE_BRANCH}"
+      env:
+        DRA_VERSION: "${BEAT_VERSION}"
+        DRA_WORKFLOW: "snapshot"
+        DRA_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}"
+        DRA_DRY_RUN: "--dry-run"
+        MANIFEST_URL: "${MANIFEST_URL}"
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "false"
+EOF

.ci/updatecli/update-otel.yml

@@ -19,6 +19,7 @@ sources:
     kind: golang/gomod
     name: Get current OTel Collector core beta version in go.mod
     spec:
+      file: internal/edot/go.mod
       module: go.opentelemetry.io/collector/receiver/otlpreceiver
   latest_core_beta:
     kind: golang/module
@@ -34,6 +35,7 @@ sources:
     kind: golang/gomod
     name: Get current OTel Collector contrib version in go.mod
     spec:
+      file: internal/edot/go.mod
       module: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector
   latest_contrib:
     kind: golang/module

.ci/updatecli/updatecli-bump-kube-stack.yml

@@ -41,7 +41,11 @@ sources:
     kind: file
     spec:
       file: "testing/integration/k8s/k8s.go"
-      matchpattern: 'KubeStackChartVersion\s*=\s"(.*)"'
+    transformers:
+      - findsubmatch:
+          pattern: 'KubeStackChartVersion\s*=\s*"(.*)"'
+          # This tells Updatecli to only keep the 1st capture group
+          captureindex: 1
 
 conditions:
   is-new-version:
@@ -60,7 +64,7 @@ targets:
     sourceid: opentelemetry-kube-stack-helm
     spec:
       file: "testing/integration/k8s/k8s.go"
-      matchpattern: '(KubeStackChartVersion\s*=\s)".*"'
+      matchpattern: '(KubeStackChartVersion\s*=\s*)".*"'
       replacepattern: '$1"{{ source "opentelemetry-kube-stack-helm" }}"'
 
   update-testdata:

.github/workflows/release-notes.yml

@@ -21,6 +21,7 @@ jobs:
       bc_commit_sha: ${{ inputs.bc_commit_sha }}
       version: ${{ inputs.version }}
       release_manager: ${{ github.triggering_actor }}
+      branching_model: '`main`'
     permissions:
       contents: read
       id-token: write

.go-version

@@ -1 +1 @@
-1.24.10
+1.24.11

.package-version

@@ -1,8 +1,8 @@
 {
   "version": "9.3.0-SNAPSHOT",
-  "build_id": "9.3.0-eaf5f86d",
-  "manifest_url": "https://snapshots.elastic.co/9.3.0-eaf5f86d/manifest-9.3.0-SNAPSHOT.json",
-  "summary_url": "https://snapshots.elastic.co/9.3.0-eaf5f86d/summary-9.3.0-SNAPSHOT.html",
+  "build_id": "9.3.0-7c793a5b",
+  "manifest_url": "https://snapshots.elastic.co/9.3.0-7c793a5b/manifest-9.3.0-SNAPSHOT.json",
+  "summary_url": "https://snapshots.elastic.co/9.3.0-7c793a5b/summary-9.3.0-SNAPSHOT.html",
   "core_version": "9.3.0",
-  "stack_build_id": "9.3.0-eaf5f86d-SNAPSHOT"
+  "stack_build_id": "9.3.0-7c793a5b-SNAPSHOT"
 }

NOTICE-fips.txt

@@ -787,11 +787,11 @@ Contents of probable licence file $GOMODCACHE/github.com/dolmen-go/contextio@v0.
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/beats/v7
-Version: v7.0.0-alpha2.0.20251130155143-19eb3e615086
+Version: v7.0.0-alpha2.0.20251204214633-dd3af18220bf
 Licence type (autodetected): Elastic
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251130155143-19eb3e615086/LICENSE.txt:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/[email protected].20251204214633-dd3af18220bf/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
@@ -1254,11 +1254,11 @@ SOFTWARE
 
 --------------------------------------------------------------------------------
 Dependency : github.com/elastic/elastic-agent-libs
-Version: v0.26.2
+Version: v0.28.0
 Licence type (autodetected): Apache-2.0
 --------------------------------------------------------------------------------
 
-Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.26.2/LICENSE:
+Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.28.0/LICENSE:
 
                                  Apache License
                            Version 2.0, January 2004
@@ -66158,6 +66158,217 @@ Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentele
    limitations under the License.
 
 
+--------------------------------------------------------------------------------
+Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver
+Version: v0.139.0
+Licence type (autodetected): Apache-2.0
+--------------------------------------------------------------------------------
+
+Contents of probable licence file $GOMODCACHE/github.com/open-telemetry/opentelemetry-collector-contrib/receiver/[email protected]/LICENSE:
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
 --------------------------------------------------------------------------------
 Dependency : github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver
 Version: v0.139.0