[8.19] (backport #10391) feat: update OTel Collector components to v0.137.0

changelog/fragments/1759863922-update-otel-to-v0.137.0.yaml

@@ -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.137.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

internal/pkg/agent/cmd/testdata/otel/components-output-fips.yml

@@ -79,6 +79,11 @@ processors:
       logs: Undefined
       metrics: Undefined
       traces: Alpha
+  - name: elastictrace
+    stability:
+      logs: Undefined
+      metrics: Undefined
+      traces: Deprecated
   - name: filter
     stability:
       logs: Alpha

internal/pkg/agent/cmd/testdata/otel/components-output.yml

@@ -64,6 +64,11 @@ receivers:
       metrics: Undefined
       traces: Beta
 processors:
+  - name: elastictrace
+    stability:
+      logs: Undefined
+      metrics: Undefined
+      traces: Deprecated
   - name: attributes
     stability:
       logs: Beta

internal/pkg/otel/components.go

@@ -43,7 +43,8 @@ import (
 	"go.opentelemetry.io/collector/processor/batchprocessor"                                                    // for batching events
 	"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
 
-	"github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor"
+	elasticapmprocessor "github.com/elastic/opentelemetry-collector-components/processor/elasticapmprocessor"
+	elastictraceprocessor "github.com/elastic/opentelemetry-collector-components/processor/elastictraceprocessor"
 
 	"github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor"
 
@@ -124,7 +125,8 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
 			elasticinframetricsprocessor.NewFactory(),
 			resourcedetectionprocessor.NewFactory(),
 			memorylimiterprocessor.NewFactory(),
-			elastictraceprocessor.NewFactory(),
+			elasticapmprocessor.NewFactory(),
+			elastictraceprocessor.NewFactory(), // deprecated, will be removed in future
 		)
 		if err != nil {
 			return otelcol.Factories{}, err

internal/pkg/otel/manager/manager_test.go

@@ -852,7 +852,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, firstMessage, "Internal metrics telemetry disabled")
 			}, time.Second*10, time.Second)
 		})
 	}

internal/pkg/otel/translate/otelconfig_test.go

@@ -12,13 +12,12 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/elastic/elastic-agent-libs/transport/tlscommon"
-
 	"go.opentelemetry.io/collector/confmap"
 
 	"github.com/elastic/elastic-agent-client/v7/pkg/client"
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/elastic/elastic-agent-libs/mapstr"
+
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/info"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/application/paths"
 
@@ -295,23 +294,18 @@ 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{
 				"enabled": true,
 			},
-			"timeout":           90 * time.Second,
-			"idle_conn_timeout": 3 * time.Second,
 			"auth": map[string]any{
 				"authenticator": "beatsauth/_agent-component/" + outputName,
 			},
-			"tls": map[string]any{
-				"min_version": tlscommon.TLSVersionDefaultMin.Details().Version,
-				"max_version": tlscommon.TLSVersionDefaultMax.Details().Version,
-			},
 		}
 	}
 
@@ -436,7 +430,6 @@ func TestGetOtelConfig(t *testing.T) {
 				"host":    "localhost",
 			},
 		}
-
 	}
 
 	getBeatMonitoringConfig := func(_, _ string) map[string]any {

testing/integration/common_logs_ingestion.go

@@ -124,7 +124,7 @@ func StartMockES(t *testing.T, percentDuplicate, percentTooMany, percentNonIndex
 		nil,
 		time.Now().Add(time.Hour),
 		0,
-		percentDuplicate, percentTooMany, percentNonIndex, percentTooLarge))
+		percentDuplicate, percentTooMany, percentNonIndex, percentTooLarge, 0))
 
 	s := httptest.NewServer(mux)
 	t.Cleanup(s.Close)

wrapper/windows/archive-proxy/go.mod

@@ -4,6 +4,6 @@ go 1.24.7
 
 require github.com/elastic/elastic-agent v0.0.0
 
-require golang.org/x/sys v0.35.0 // indirect
+require golang.org/x/sys v0.36.0 // indirect
 
 replace github.com/elastic/elastic-agent => ../../../

wrapper/windows/archive-proxy/go.sum

@@ -1,2 +1,2 @@
-golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
-golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
+golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=