Merge branch 'main' into update-otel-to-v0.135.0

Author: andrzej-stencel

.github/CODEOWNERS

@@ -13,6 +13,8 @@
 /deploy/helm/edot-collector @elastic/ingest-otel-data
 /deploy/kubernetes @elastic/elastic-agent-control-plane
 /dev-tools/kubernetes @elastic/elastic-agent-control-plane
+/docs/release-notes @elastic/ingest-docs
+/docs/docset.yml @elastic/ingest-docs
 /internal/pkg/composable/providers/kubernetes @elastic/elastic-agent-control-plane
 /internal/pkg/otel/samples/darwin/autoops_es.yml @elastic/opex
 /internal/pkg/otel/samples/linux/autoops_es.yml @elastic/opex

.package-version

@@ -1,8 +1,8 @@
 {
   "version": "9.2.0-SNAPSHOT",
-  "build_id": "9.2.0-ae69fe57",
-  "manifest_url": "https://snapshots.elastic.co/9.2.0-ae69fe57/manifest-9.2.0-SNAPSHOT.json",
-  "summary_url": "https://snapshots.elastic.co/9.2.0-ae69fe57/summary-9.2.0-SNAPSHOT.html",
+  "build_id": "9.2.0-a3e57754",
+  "manifest_url": "https://snapshots.elastic.co/9.2.0-a3e57754/manifest-9.2.0-SNAPSHOT.json",
+  "summary_url": "https://snapshots.elastic.co/9.2.0-a3e57754/summary-9.2.0-SNAPSHOT.html",
   "core_version": "9.2.0",
-  "stack_build_id": "9.2.0-ae69fe57-SNAPSHOT"
+  "stack_build_id": "9.2.0-a3e57754-SNAPSHOT"
 }

dev-tools/mage/settings.go

@@ -162,17 +162,18 @@ func initGlobals() {
 
 	versionQualifier, versionQualified = os.LookupEnv("VERSION_QUALIFIER")
 
-	agentPackageVersion = EnvOr(agentPackageVersionEnvVar, "")
-
-	ManifestURL = EnvOr(ManifestUrlEnvVar, "")
-	PackagingFromManifest = ManifestURL != ""
-
-	// order matters this must be called last as it will override some of the
-	// values above
+	// order matters: this will override some of the values. Those values can be used
+	// as fallback for the variables below (mainly agentPackageVersion and ManifestURL)
 	err = initPackageVersion()
 	if err != nil {
 		panic(fmt.Errorf("failed to init package version: %w", err))
 	}
+
+	agentPackageVersion = EnvOr(agentPackageVersionEnvVar, agentPackageVersion)
+
+	ManifestURL = EnvOr(ManifestUrlEnvVar, ManifestURL)
+	PackagingFromManifest = ManifestURL != ""
+
 }
 
 // ProjectType specifies the type of project (OSS vs X-Pack).

testing/integration/ess/beat_receivers_test.go

@@ -686,6 +686,9 @@ func TestBeatsReceiverLogs(t *testing.T) {
 		},
 		Stack: nil,
 	})
+
+	t.Skip("Skip this test as it's flaky. See https://github.com/elastic/elastic-agent/issues/9890")
+
 	type configOptions struct {
 		RuntimeExperimental string
 	}