[8.19] (backport #11418) [edot] add windowsperfcounters receiver

changelog/fragments/1764082001-add-winperf.yaml

@@ -0,0 +1,45 @@
+# REQUIRED
+# 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: feature
+
+# REQUIRED for all kinds
+# Change summary; a 80ish characters long description of the change.
+summary: Add windowseventlogreceiver to EDOT
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# Long description; in case the summary is not enough to describe the change
+# this field accommodate a description without length limits.
+# description:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# impact:
+
+# REQUIRED for breaking-change, deprecation, known-issue
+# action:
+
+# REQUIRED for all kinds
+# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
+component: elastic-agent
+
+# AUTOMATED
+# OPTIONAL to manually add other PR URLs
+# PR URL: A link the PR 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/elastic/elastic-agent/pull/11418
+
+# AUTOMATED
+# OPTIONAL to manually add other issue URLs
+# 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

go.mod

@@ -550,6 +550,12 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.139.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0 // indirect
+<<<<<<< HEAD
+=======
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0 // indirect
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0 // indirect
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.1 // indirect

go.sum

@@ -1330,6 +1330,15 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreat
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0/go.mod h1:LQO4Ed9FFeKURlq1cLsTThd/526lJKRNvTbB8+HFAvg=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0 h1:xbh/KQO+Ed/absJfMnS0yr10Pv93D9OvvAPVljC7vfE=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0/go.mod h1:63xoHn0RIkxvX5mgwj/bgGiRuwgPOhLroN1c34ywvsk=
+<<<<<<< HEAD
+=======
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0 h1:KYZ4QXpoVLnCdey+7UjYcb3J5jmIVEjjwKW1MrQC7JM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0/go.mod h1:ZnoQNt1oRAWLngoYWLbFUdrr1m8UcXZxEDg/W6+JrOY=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0 h1:0M9E1AlRyUWXzRQIerGw0et3pdItIfZhaNFX6Y+EXzg=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0/go.mod h1:C2wYuBBlYaWuFQP+elufZGZrlj7GyeCdzroEZYlV5os=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0 h1:d3gfDFoyCGpLrOba4WezCr4mN0tFQuchP2lG0c5Iwp0=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0/go.mod h1:rzONCE55PRW+ogXOMavHrWi/H6uBzNAGGJzL1fRLs+I=
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0 h1:uq3xrmeDzIfwXHB5BCC/BAOO/ZIrexi+hDbRcd3DrNg=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0/go.mod h1:C89wYTePUCuLie/te7LW8KYuN07EVf9HLxiJEzjcQgY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

internal/edot/go.mod

@@ -32,6 +32,12 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.139.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0
+<<<<<<< HEAD
+=======
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0
+	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 	github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.9

internal/edot/go.sum

@@ -1181,6 +1181,15 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreat
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.139.0/go.mod h1:LQO4Ed9FFeKURlq1cLsTThd/526lJKRNvTbB8+HFAvg=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0 h1:xbh/KQO+Ed/absJfMnS0yr10Pv93D9OvvAPVljC7vfE=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver v0.139.0/go.mod h1:63xoHn0RIkxvX5mgwj/bgGiRuwgPOhLroN1c34ywvsk=
+<<<<<<< HEAD
+=======
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0 h1:KYZ4QXpoVLnCdey+7UjYcb3J5jmIVEjjwKW1MrQC7JM=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver v0.139.0/go.mod h1:ZnoQNt1oRAWLngoYWLbFUdrr1m8UcXZxEDg/W6+JrOY=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0 h1:0M9E1AlRyUWXzRQIerGw0et3pdItIfZhaNFX6Y+EXzg=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver v0.139.0/go.mod h1:C2wYuBBlYaWuFQP+elufZGZrlj7GyeCdzroEZYlV5os=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0 h1:d3gfDFoyCGpLrOba4WezCr4mN0tFQuchP2lG0c5Iwp0=
+github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.139.0/go.mod h1:rzONCE55PRW+ogXOMavHrWi/H6uBzNAGGJzL1fRLs+I=
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0 h1:uq3xrmeDzIfwXHB5BCC/BAOO/ZIrexi+hDbRcd3DrNg=
 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.139.0/go.mod h1:C89wYTePUCuLie/te7LW8KYuN07EVf9HLxiJEzjcQgY=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=

internal/edot/otelcol/components.go

@@ -24,6 +24,12 @@ import (
 	nginxreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver"
 	receivercreator "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
 	redisreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver"
+<<<<<<< HEAD
+=======
+	sqlserverreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver"
+	windowsperfcountersreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver"
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 	zipkinreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
 	nopreceiver "go.opentelemetry.io/collector/receiver/nopreceiver"
 	otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver"
@@ -105,6 +111,17 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
 			mbreceiver.NewFactory(),
 			jmxreceiver.NewFactory(),
 			nopreceiver.NewFactory(),
+<<<<<<< HEAD
+=======
+			apachereceiver.NewFactory(),
+			iisreceiver.NewFactory(),
+			mysqlreceiver.NewFactory(),
+			postgresqlreceiver.NewFactory(),
+			sqlserverreceiver.NewFactory(),
+			windowseventlogreceiver.NewFactory(),
+			awss3receiver.NewFactory(),
+			windowsperfcountersreceiver.NewFactory(),
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 		}
 		// some receivers should only be available when
 		// not in fips mode due to restrictions on crypto usage

internal/pkg/otel/README.md

@@ -50,6 +50,12 @@ This section provides a summary of components included in the Elastic Distributi
 | [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.139.0/receiver/prometheusreceiver/README.md) | v0.139.0 |
 | [receivercreator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/receivercreator/v0.139.0/receiver/receivercreator/README.md) | v0.139.0 |
 | [redisreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/redisreceiver/v0.139.0/receiver/redisreceiver/README.md) | v0.139.0 |
+<<<<<<< HEAD
+=======
+| [sqlserverreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/sqlserverreceiver/v0.139.0/receiver/sqlserverreceiver/README.md) | v0.139.0 |
+| [windowseventlogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/windowseventlogreceiver/v0.139.0/receiver/windowseventlogreceiver/README.md) | v0.139.0 |
+| [windowsperfcountersreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/windowsperfcountersreceiver/v0.139.0/receiver/windowsperfcountersreceiver/README.md) | v0.139.0 |
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))
 | [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.139.0/receiver/zipkinreceiver/README.md) | v0.139.0 |
 
 ### Exporters

internal/pkg/otel/testdata/all-components.windows.yml

@@ -1,3 +1,28 @@
 exporters:
   file:
-    path: ${env:TMP}\file-exporter-output.json
+<<<<<<< HEAD
+    path: ${env:TMP}\file-exporter-output.json
+=======
+    path: ${env:TMP}\file-exporter-output.json
+receivers:
+  windowseventlog:
+    channel: "Application"
+  windowsperfcounters:
+    perfcounters:
+      - object: Memory
+        counters:
+          - name: Committed Bytes
+            metric: bytes.committed
+service:
+  pipelines:
+    logs/windows:
+      receivers:
+        - windowseventlog
+      exporters:
+        - nop
+    metrics/windows:
+      receivers:
+        - windowsperfcounters
+      exporters:
+        - nop
+>>>>>>> 097f2b381 ([edot] add windowsperfcounters receiver (#11418))