Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(otel): add integrations components #5608

Closed
wants to merge 6 commits into from
Closed

feat(otel): add integrations components #5608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ef7a2ec
feat(otel): add Config Integration extension
andrzej-stencel Sep 24, 2024
9272e69
feat: add File Integrations extension
andrzej-stencel Sep 24, 2024
0b2c45c
feat: add Integration receiver
andrzej-stencel Sep 24, 2024
4fbe697
feat: add Integration processor
andrzej-stencel Sep 24, 2024
0b80b22
refactor: change replace directive from local path to the remote branch
andrzej-stencel Sep 25, 2024
6522c96
go mod tidy
andrzej-stencel Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ require (
github.com/elastic/go-sysinfo v1.14.1
github.com/elastic/go-ucfg v0.8.8
github.com/elastic/mock-es v0.0.0-20240712014503-e5b47ece0015
github.com/elastic/opentelemetry-collector-components/extension/configintegrationextension v0.0.0
github.com/elastic/opentelemetry-collector-components/extension/fileintegrationextension v0.0.0
github.com/elastic/opentelemetry-collector-components/processor/elasticinframetricsprocessor v0.11.0
github.com/elastic/opentelemetry-collector-components/processor/integrationprocessor v0.0.0
github.com/elastic/opentelemetry-collector-components/receiver/integrationreceiver v0.0.0
github.com/fatih/color v1.16.0
github.com/fsnotify/fsnotify v1.7.0
github.com/go-viper/mapstructure/v2 v2.1.0
Expand Down Expand Up @@ -182,6 +186,7 @@ require (
github.com/elastic/go-windows v1.0.2 // indirect
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/lunes v0.1.0 // indirect
github.com/elastic/opentelemetry-collector-components/internal/integrations v0.0.0 // indirect
github.com/elastic/opentelemetry-lib v0.9.0 // indirect
github.com/elastic/pkcs8 v1.0.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
Expand Down Expand Up @@ -455,6 +460,11 @@ replace (
github.com/Shopify/sarama => github.com/elastic/sarama v1.19.1-0.20220310193331-ebc2b0d8eef3
github.com/dop251/goja => github.com/andrewkroh/goja v0.0.0-20190128172624-dd2ac4456e20
github.com/dop251/goja_nodejs => github.com/dop251/goja_nodejs v0.0.0-20171011081505-adff31b136e6
github.com/elastic/opentelemetry-collector-components/extension/configintegrationextension => github.com/jsoriano/opentelemetry-collector-components/extension/configintegrationextension v0.0.0-20240924085621-781f96f74764
github.com/elastic/opentelemetry-collector-components/extension/fileintegrationextension => github.com/jsoriano/opentelemetry-collector-components/extension/fileintegrationextension v0.0.0-20240924085621-781f96f74764
github.com/elastic/opentelemetry-collector-components/internal/integrations => github.com/jsoriano/opentelemetry-collector-components/internal/integrations v0.0.0-20240924085621-781f96f74764
github.com/elastic/opentelemetry-collector-components/processor/integrationprocessor => github.com/jsoriano/opentelemetry-collector-components/processor/integrationprocessor v0.0.0-20240924085621-781f96f74764
github.com/elastic/opentelemetry-collector-components/receiver/integrationreceiver => github.com/jsoriano/opentelemetry-collector-components/receiver/integrationreceiver v0.0.0-20240924085621-781f96f74764
// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/12d41f40b0d408b0167633d8095160d3343d46ac/go.mod#L38
github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api v0.0.0-20180801171038-322a19404e37
Expand Down
10 changes: 10 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -624,6 +624,16 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jsoriano/opentelemetry-collector-components/extension/configintegrationextension v0.0.0-20240924085621-781f96f74764 h1:Q7tI/8Jcf6dpRLalyJ4MgIte/VI20CFcb16WiKwoXps=
github.com/jsoriano/opentelemetry-collector-components/extension/configintegrationextension v0.0.0-20240924085621-781f96f74764/go.mod h1:SROaTDvX0LohbvGvt4m7Iwj48tOgZ06mhYUOKlhoLHs=
github.com/jsoriano/opentelemetry-collector-components/extension/fileintegrationextension v0.0.0-20240924085621-781f96f74764 h1:/4sNs8Lli3UxwdHa19lEHSSF4Uy4e/pKmBJQWhQZIK0=
github.com/jsoriano/opentelemetry-collector-components/extension/fileintegrationextension v0.0.0-20240924085621-781f96f74764/go.mod h1:BJqkIlUI80X91A5ByYzFno9CuH2tG/AdvmF5sKIkMuM=
github.com/jsoriano/opentelemetry-collector-components/internal/integrations v0.0.0-20240924085621-781f96f74764 h1:Y/x3h2O2MscazdZxBs0aFlPa+kXfBoAJseqXIqAMsiU=
github.com/jsoriano/opentelemetry-collector-components/internal/integrations v0.0.0-20240924085621-781f96f74764/go.mod h1:MuHMRusvNxwy6QxRkoFbqwahR0pMj62125mThAX1JT0=
github.com/jsoriano/opentelemetry-collector-components/processor/integrationprocessor v0.0.0-20240924085621-781f96f74764 h1:/AiWKmhQnbo+EWQgkrYyJQ05nOzbfundngdO30HxsF8=
github.com/jsoriano/opentelemetry-collector-components/processor/integrationprocessor v0.0.0-20240924085621-781f96f74764/go.mod h1:pmUnpSrMZSLwu9EnvPStSL2jAnD1gkmlFKiFymOwEF8=
github.com/jsoriano/opentelemetry-collector-components/receiver/integrationreceiver v0.0.0-20240924085621-781f96f74764 h1:XQ02Q3slbbruAoRY/P/ULM3H1Wmiv3K0y3eVtoFTfLI=
github.com/jsoriano/opentelemetry-collector-components/receiver/integrationreceiver v0.0.0-20240924085621-781f96f74764/go.mod h1:QKv/oumN1ZIDJtUjBnWXPvhq/VqqSOuNkNMewv0MiUQ=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
Expand Down
2 changes: 2 additions & 0 deletions internal/pkg/otel/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
| [configintegrationextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/configintegrationextension/v0.0.0/extension/configintegrationextension/README.md) | v0.0.0 |
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.109.0/extension/healthcheckextension/README.md) | v0.109.0 |
| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.109.0/extension/pprofextension/README.md) | v0.109.0 |
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.109.0/extension/storage/filestorage/README.md) | v0.109.0 |
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.109.0/extension/memorylimiterextension/README.md) | v0.109.0 |
| [configintegrationextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/configintegrationextension/=> ../../../opentelemetry-collector-components/extension/configintegrationextension/extension/configintegrationextension/README.md) | => ../../../opentelemetry-collector-components/extension/configintegrationextension |

### Connectors

Expand Down
8 changes: 8 additions & 0 deletions internal/pkg/otel/components.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"go.opentelemetry.io/collector/receiver"

// Receivers:
"github.com/elastic/opentelemetry-collector-components/receiver/integrationreceiver"
filelogreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver" // for collecting log files
hostmetricsreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver"
httpcheckreceiver "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver"
Expand All @@ -27,6 +28,7 @@ import (
otlpreceiver "go.opentelemetry.io/collector/receiver/otlpreceiver"

// Processors:
"github.com/elastic/opentelemetry-collector-components/processor/integrationprocessor"
attributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor" // for modifying signal attributes
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
k8sattributesprocessor "github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor" // for adding k8s metadata
Expand All @@ -46,6 +48,8 @@ import (
otlphttpexporter "go.opentelemetry.io/collector/exporter/otlphttpexporter"

// Extensions
"github.com/elastic/opentelemetry-collector-components/extension/configintegrationextension"
"github.com/elastic/opentelemetry-collector-components/extension/fileintegrationextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
pprofextension "github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension"
filestorage "github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"
Expand All @@ -67,6 +71,7 @@ func components() (otelcol.Factories, error) {
k8sclusterreceiver.NewFactory(),
hostmetricsreceiver.NewFactory(),
httpcheckreceiver.NewFactory(),
integrationreceiver.NewFactory(),
k8sobjectsreceiver.NewFactory(),
prometheusreceiver.NewFactory(),
jaegerreceiver.NewFactory(),
Expand All @@ -84,6 +89,7 @@ func components() (otelcol.Factories, error) {
transformprocessor.NewFactory(),
filterprocessor.NewFactory(),
k8sattributesprocessor.NewFactory(),
integrationprocessor.NewFactory(),
elasticinframetricsprocessor.NewFactory(),
resourcedetectionprocessor.NewFactory(),
memorylimiterprocessor.NewFactory(),
Expand Down Expand Up @@ -116,6 +122,8 @@ func components() (otelcol.Factories, error) {
filestorage.NewFactory(),
healthcheckextension.NewFactory(),
pprofextension.NewFactory(),
configintegrationextension.NewFactory(),
fileintegrationextension.NewFactory(),
)
if err != nil {
return otelcol.Factories{}, err
Expand Down
Loading