Merge branch 'main' into add-receivers-v130

Author: mykola-elastic

.ci/scripts/update-otel.sh

@@ -52,6 +52,6 @@ else
 fi
 elastic-agent-changelog-tool new "$changelog_fragment_name"
 sed -i.bak "s/^kind:.*$/kind: enhancement/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
-sed -i.bak "s/^summary:.*$/summary: Update OTel components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
+sed -i.bak "s/^summary:.*$/summary: Update OTel Collector components to ${next_contrib}/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
 sed -i.bak "s/^component:.*$/component: elastic-agent/" ./changelog/fragments/*-"${changelog_fragment_name}".yaml
 rm ./changelog/fragments/*-"${changelog_fragment_name}".yaml.bak

.golangci.yml

@@ -59,6 +59,7 @@ linters:
         - github.com/google/gopacket
         - github.com/insomniacslk/dhcp
         - github.com/meraki/dashboard-api-go/v3
+        - go.opentelemetry.io/otel/exporters/prometheus
       replace-local: false
     gomodguard:
       blocked:

NOTICE-fips.txt

@@ -0,0 +1,32 @@
+# Kind can be one of:
+# - breaking-change: a change to previously-documented behavior
+# - deprecation: functionality that is being removed in a later release
+# - bug-fix: fixes a problem in a previous version
+# - enhancement: extends functionality but does not break or fix existing behavior
+# - feature: new functionality
+# - known-issue: problems that we are aware of in a given version
+# - security: impacts on the security of a product or a user’s deployment.
+# - upgrade: important information for someone upgrading from a prior version
+# - other: does not fit into any of the other categories
+kind: enhancement
+
+# Change summary; a 80ish characters long description of the change.
+summary: Update OTel Collector components to v0.135.0
+
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
+#description:
+
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# PR URL; optional; the PR number that added the changeset.
+# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
+# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
+# Please provide it if you are adding a fragment for a different PR.
+#pr: https://github.com/owner/repo/1234
+
+# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
+# If not present is automatically filled by the tooling with the issue linked to the PR number.
+#issue: https://github.com/owner/repo/1234

NOTICE.txt

@@ -772,7 +772,7 @@ func TestOTelManager_Logging(t *testing.T) {
 		logs := obs.All()
 		require.NotEmpty(collect, logs, "Logs should not be empty")
 		firstMessage := logs[0].Message
-		assert.Equal(collect, firstMessage, "Setting up own telemetry...")
+		assert.Equal(collect, "Internal metrics telemetry disabled", firstMessage)
 	}, time.Second*10, time.Second)
 }
 

changelog/fragments/1757406841-update-otel-components-to-v0.135.0.yaml

@@ -294,9 +294,10 @@ func TestGetOtelConfig(t *testing.T) {
 				"block_on_overflow": true,
 				"wait_for_result":   true,
 				"batch": map[string]any{
-					"max_size": 1600,
-					"min_size": 0,
-					"sizer":    "items",
+					"flush_timeout": "10s",
+					"max_size":      1600,
+					"min_size":      0,
+					"sizer":         "items",
 				},
 			},
 			"logs_dynamic_id": map[string]any{