Skip to content

Commit 176f6e8

Browse files
Add receivercreator and k8sobserver otel components (#6561)
* Add receivercreator and k8sobserver otel components Signed-off-by: ChrsMark <[email protected]> * mage update Signed-off-by: ChrsMark <[email protected]> --------- Signed-off-by: ChrsMark <[email protected]> Co-authored-by: Michal Pristas <[email protected]>
1 parent 6d9b1fc commit 176f6e8

File tree

6 files changed

+1099
-419
lines changed

6 files changed

+1099
-419
lines changed

NOTICE.txt

Lines changed: 1049 additions & 416 deletions
Large diffs are not rendered by default.
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Kind can be one of:
2+
# - breaking-change: a change to previously-documented behavior
3+
# - deprecation: functionality that is being removed in a later release
4+
# - bug-fix: fixes a problem in a previous version
5+
# - enhancement: extends functionality but does not break or fix existing behavior
6+
# - feature: new functionality
7+
# - known-issue: problems that we are aware of in a given version
8+
# - security: impacts on the security of a product or a user’s deployment.
9+
# - upgrade: important information for someone upgrading from a prior version
10+
# - other: does not fit into any of the other categories
11+
kind: feature
12+
13+
# Change summary; a 80ish characters long description of the change.
14+
summary: Add receivercreator and k8sobserver to EDOT collector
15+
16+
# Long description; in case the summary is not enough to describe the change
17+
# this field accommodate a description without length limits.
18+
# NOTE: This field will be rendered only for breaking-change and known-issue kinds at the moment.
19+
#description:
20+
21+
# Affected component; usually one of "elastic-agent", "fleet-server", "filebeat", "metricbeat", "auditbeat", "all", etc.
22+
component: elastic-agent
23+
24+
# PR URL; optional; the PR number that added the changeset.
25+
# If not present is automatically filled by the tooling finding the PR where this changelog fragment has been added.
26+
# NOTE: the tooling supports backports, so it's able to fill the original PR number instead of the backport PR number.
27+
# Please provide it if you are adding a fragment for a different PR.
28+
#pr: https://github.com/owner/repo/1234
29+
30+
# Issue URL; optional; the GitHub issue related to this changeset (either closes or is part of).
31+
# If not present is automatically filled by the tooling with the issue linked to the PR number.
32+
#issue: https://github.com/owner/repo/1234

go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,12 @@ require (
4646
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.117.0
4747
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.117.0
4848
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.117.0
49+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.117.0
4950
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0
5051
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/status v0.117.0
5152
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.117.0
5253
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.117.0
54+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.117.0
5355
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.117.0
5456
github.com/otiai10/copy v1.14.0
5557
github.com/rednafi/link-patrol v0.0.0-20240826150821-057643e74d4d
@@ -430,6 +432,7 @@ require (
430432
github.com/nxadm/tail v1.4.11 // indirect
431433
github.com/onsi/ginkgo/v2 v2.20.0 // indirect
432434
github.com/onsi/gomega v1.34.1 // indirect
435+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.117.0 // indirect
433436
github.com/open-telemetry/opentelemetry-collector-contrib/internal/aws/ecsutil v0.117.0 // indirect
434437
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.117.0 // indirect
435438
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.117.0 // indirect
@@ -480,7 +483,7 @@ require (
480483
github.com/shirou/gopsutil/v4 v4.24.12 // indirect
481484
github.com/shopspring/decimal v1.3.1 // indirect
482485
github.com/sirupsen/logrus v1.9.3 // indirect
483-
github.com/spf13/cast v1.6.0 // indirect
486+
github.com/spf13/cast v1.7.1 // indirect
484487
github.com/stoewer/go-strcase v1.2.0 // indirect
485488
github.com/stretchr/objx v0.5.2 // indirect
486489
github.com/tklauser/go-sysconf v0.3.12 // indirect

go.sum

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,10 @@ github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otl
11341134
github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/otlpencodingextension v0.117.0/go.mod h1:aciOawCoydp9lNAw9/jaSZXWiswE7wdcmBEaBf5fPQc=
11351135
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.117.0 h1:Voy2gnN4x/DcTJSvILddotoZl6K5rHhAJC7msKLBl24=
11361136
github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.117.0/go.mod h1:SGSLpR8qh1Oi2ME45jJaQayspKBer8HupJoFnuHNQaw=
1137+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.117.0 h1:ufDupkC25Ok0d50FqfiyKQGqf67SfwWGIWqsYSBJg80=
1138+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.117.0/go.mod h1:+GPzqBFeqV90U4/bntDRPMxo/i/12lxH7GyPJmqz4ls=
1139+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.117.0 h1:0KoWMGmHYlpoPwaRwnF3OeiQl0y35hSmTVd+JDLNpSY=
1140+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.117.0/go.mod h1:jyepqHvP5D5/a4M+c10obO2aqai92bHSUHleXkHiw+k=
11371141
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0 h1:j4AYS+tiQQ9BVrP7sb8qppT+saixHNg2tS9EOLounMw=
11381142
github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.117.0/go.mod h1:mxgN0tP1CroT0muDDKLmIxHT75aAkeC3QeGNcwbkCyo=
11391143
github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.117.0 h1:SbD/rcj6VQ59QutRM8Kfw+36s8Z/U0p/tcrQCLaji0s=
@@ -1218,6 +1222,8 @@ github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsr
12181222
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.117.0/go.mod h1:1ELm4C0E0On6u7hwVqVJymwmfx8NhfgAwZNb/g/IN00=
12191223
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.117.0 h1:ZukmPvZSJnDPvUH0ECDliYxyRgSMs6mWXnX70uGnhvk=
12201224
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.117.0/go.mod h1:aZzeEf3lN/i6gH5vVGzLdzH6JO2r6xwep0S0fvW8iMI=
1225+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.117.0 h1:fHQzeVV8uMHApo9tBtxSXocv2IcCeswFPZwjvOAkDrc=
1226+
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.117.0/go.mod h1:0HQuGsZePaLKa1dOhvSqP1aV36j/cnT7i536TEJV1R8=
12211227
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.117.0 h1:ZzESLZAIBZ3Z7e33WCUCdX2tDjxD1/A748aTmqReEvo=
12221228
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.117.0/go.mod h1:zClB9Yr77xTGG2b2g4+EGpzdW84lPCTPemFWjsyJFMw=
12231229
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -1372,8 +1378,8 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd
13721378
github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
13731379
github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
13741380
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
1375-
github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
1376-
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
1381+
github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
1382+
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
13771383
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
13781384
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
13791385
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=

internal/pkg/otel/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ This section provides a summary of components included in the Elastic Distributi
3131
|---|---|
3232
| [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/jaegerreceiver/v0.117.0/receiver/jaegerreceiver/README.md) | v0.117.0 |
3333
| [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/prometheusreceiver/v0.117.0/receiver/prometheusreceiver/README.md) | v0.117.0 |
34+
| [receivercreator](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/receivercreator/v0.117.0/receiver/receivercreator/README.md) | v0.117.0 |
3435
| [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/zipkinreceiver/v0.117.0/receiver/zipkinreceiver/README.md) | v0.117.0 |
3536
| [filelogreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/filelogreceiver/v0.117.0/receiver/filelogreceiver/README.md) | v0.117.0 |
3637
| [hostmetricsreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/receiver/hostmetricsreceiver/v0.117.0/receiver/hostmetricsreceiver/README.md) | v0.117.0 |
@@ -72,6 +73,7 @@ This section provides a summary of components included in the Elastic Distributi
7273
| Component | Version |
7374
|---|---|
7475
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.117.0/extension/healthcheckextension/README.md) | v0.117.0 |
76+
| [k8sobserver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/observer/k8sobserver/v0.117.0/extension/observer/k8sobserver/README.md) | v0.117.0 |
7577
| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.117.0/extension/pprofextension/README.md) | v0.117.0 |
7678
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.117.0/extension/storage/filestorage/README.md) | v0.117.0 |
7779
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.117.0/extension/memorylimiterextension/README.md) | v0.117.0 |

internal/pkg/otel/components.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
k8sobjectsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver"
2222
kubeletstatsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"
2323
prometheusreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
24+
receivercreator "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
2425
zipkinreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"
2526
otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver"
2627

@@ -52,6 +53,7 @@ import (
5253

5354
// Extensions
5455
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
56+
k8sobserver "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver"
5557
pprofextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
5658
filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
5759
"go.opentelemetry.io/collector/extension/memorylimiterextension" // for putting backpressure when approach a memory limit
@@ -78,6 +80,7 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
7880
httpcheckreceiver.NewFactory(),
7981
k8sobjectsreceiver.NewFactory(),
8082
prometheusreceiver.NewFactory(),
83+
receivercreator.NewFactory(),
8184
jaegerreceiver.NewFactory(),
8285
zipkinreceiver.NewFactory(),
8386
fbreceiver.NewFactory(),
@@ -132,6 +135,7 @@ func components(extensionFactories ...extension.Factory) func() (otelcol.Factori
132135
filestorage.NewFactory(),
133136
healthcheckextension.NewFactory(),
134137
pprofextension.NewFactory(),
138+
k8sobserver.NewFactory(),
135139
}
136140
extensions = append(extensions, extensionFactories...)
137141
factories.Extensions, err = extension.MakeFactoryMap(extensions...)

0 commit comments

Comments
 (0)