Skip to content

[9.1] (backport #11120) Point beatsauth extension to beats repo #11137

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

Open
wants to merge 2 commits into
base: 9.1
Choose a base branch
from
Open

[9.1] (backport #11120) Point beatsauth extension to beats repo #11137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ee67dc
Point beatsauth extension to beats repo (#11120)
khushijain21 Nov 12, 2025
decfbfa
Merge branch '9.1' into mergify/bp/9.1/pr-11120
khushijain21 Nov 13, 2025
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
847 changes: 847 additions & 0 deletions NOTICE-fips.txt
View file
Open in desktop

Large diffs are not rendered by default.

847 changes: 847 additions & 0 deletions NOTICE.txt
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,13 @@ require (
github.com/elastic/gosigar v0.14.3 // indirect
github.com/elastic/lunes v0.1.0 // indirect
github.com/elastic/mito v1.23.0 // indirect
<<<<<<< HEAD
=======
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.20.0 // indirect
github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector v0.1.0 // indirect
github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension v0.8.0 // indirect
github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.8.0 // indirect
>>>>>>> e284aff84 (Point beatsauth extension to beats repo (#11120))
github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20250220025958-386ba0c4bced // indirect
github.com/elastic/opentelemetry-collector-components/processor/lsmintervalprocessor v0.8.0 // indirect
github.com/elastic/opentelemetry-lib v0.21.0 // indirect
Expand Down
11 changes: 11 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ github.com/elastic/mito v1.23.0 h1:V9wS2EWpKWibLP+0WE2CXr4J/Mt/IPj1G+zf/ELNp/I=
github.com/elastic/mito v1.23.0/go.mod h1:h1V+8B62+DXsu0TstJkjsTh5ewJIDJlwzxPkP3HBM9s=
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6 h1:JVNuBrmOoqLJgp9o68YBMnOrXCzQI3mCppW+suwRSlw=
github.com/elastic/mock-es v0.0.0-20250530054253-8c3b6053f9b6/go.mod h1:cXqWcLnmu5y4QveTb2hjk7rgzkHMuZsqeXtbJpNAcu0=
<<<<<<< HEAD
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.7.0 h1:3ybnA6XiknHVMvBEveg9A9EdEZdwomSPPNNMBoGJNeY=
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.7.0/go.mod h1:HPkMY+YddFD5GhpCpSNAcH7KskuiLHYNhIsFHuynb9s=
github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension v0.5.0 h1:d2EAQ8x4wsOrXG/I1+UU+/+I54Ul7XzoUZIxnqvxE/A=
Expand All @@ -549,6 +550,16 @@ github.com/elastic/opentelemetry-collector-components/extension/apmconfigextensi
github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.7.0/go.mod h1:CnfDctsjylpmo2yYJfQVZn8U7EXy7hmTnvdApiUL680=
github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension v0.3.0 h1:0+WK9lHE5HflQFUSghnpBAto7jQItDw5o+uTSGKHMlo=
github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension v0.3.0/go.mod h1:OdiJntTK9K7urGZ1hwAi2v/Ha3jsBKv8Yu2QLSCn6Yc=
=======
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.20.0 h1:UXuHrl76EUHn+PIVEiVFqdGKZwzNLLfhnoBKfmuxSrk=
github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector v0.20.0/go.mod h1:xqzGZyPd88kuaPMMayEqcJjPxJ1drpCf3yByqI8Ea+A=
github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector v0.1.0 h1:FwLd5E48oL5KpCgIspQkMZF1fLJC546rkjXWZxLJkQA=
github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector v0.1.0/go.mod h1:bLOp7d7MO7HZijUzCTWYncehrAt2aFTtciIc412oops=
github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension v0.8.0 h1:hcPCzE2cTSLn+TgyG6HSZN2fr2ynAmZVBF4nvRl/djI=
github.com/elastic/opentelemetry-collector-components/extension/apikeyauthextension v0.8.0/go.mod h1:QwZvlsuE/atVWT25NSK5HyjjSlvDtER4tw4cf7d0fv0=
github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.8.0 h1:7Pwsi9TuZGtLY5d0CuWBQs4x2PeM2QzYX/JLI8hcD3E=
github.com/elastic/opentelemetry-collector-components/extension/apmconfigextension v0.8.0/go.mod h1:dTcHKkgdlx5P0Dn05bXhS30/70iZ8AbYm6SMnXA9He0=
>>>>>>> e284aff84 (Point beatsauth extension to beats repo (#11120))
github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20250220025958-386ba0c4bced h1:XcWi/S3OoeE5Qwmj381AoO3nr3AVXl4Z4QO0mqyjlzU=
github.com/elastic/opentelemetry-collector-components/internal/sharedcomponent v0.0.0-20250220025958-386ba0c4bced/go.mod h1:8e9NcGfE2xeor8r+WV9a+hKBEkzJEDnqZN7tqb3GUe8=
github.com/elastic/opentelemetry-collector-components/internal/testutil v0.0.0-20250613082151-282de5af1c9b h1:NWuTKdMCJlU9ehRH8V0w1Kk1QI5Vn+9OcJWIO9wI+pE=
Expand Down
720 changes: 720 additions & 0 deletions internal/edot/go.mod
View file
Open in desktop

Large diffs are not rendered by default.

2,085 changes: 2,085 additions & 0 deletions internal/edot/go.sum
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 14 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 @@ -87,6 +87,7 @@ This section provides a summary of components included in the Elastic Distributi

| Component | Version |
|---|---|
<<<<<<< HEAD
| [apikeyauthextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apikeyauthextension/v0.5.0/extension/apikeyauthextension/README.md) | v0.5.0 |
| [apmconfigextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apmconfigextension/v0.7.0/extension/apmconfigextension/README.md) | v0.7.0 |
| [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/bearertokenauthextension/v0.135.0/extension/bearertokenauthextension/README.md) | v0.135.0 |
Expand All @@ -99,6 +100,19 @@ This section provides a summary of components included in the Elastic Distributi
| [k8sobserver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/observer/k8sobserver/v0.135.0/extension/observer/k8sobserver/README.md) | v0.135.0 |
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.135.0/extension/memorylimiterextension/README.md) | v0.135.0 |
| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.135.0/extension/pprofextension/README.md) | v0.135.0 |
=======
| [apikeyauthextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apikeyauthextension/v0.8.0/extension/apikeyauthextension/README.md) | v0.8.0 |
| [apmconfigextension](https://github.com/elastic/opentelemetry-collector-components/blob/extension/apmconfigextension/v0.8.0/extension/apmconfigextension/README.md) | v0.8.0 |
| [bearertokenauthextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/bearertokenauthextension/v0.137.0/extension/bearertokenauthextension/README.md) | v0.137.0 |
| [filestorage](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/storage/filestorage/v0.137.0/extension/storage/filestorage/README.md) | v0.137.0 |
| [headerssetterextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/headerssetterextension/v0.137.0/extension/headerssetterextension/README.md) | v0.137.0 |
| [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckextension/v0.137.0/extension/healthcheckextension/README.md) | v0.137.0 |
| [healthcheckv2extension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/healthcheckv2extension/v0.137.0/extension/healthcheckv2extension/README.md) | v0.137.0 |
| [k8sleaderelector](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/k8sleaderelector/v0.137.0/extension/k8sleaderelector/README.md) | v0.137.0 |
| [k8sobserver](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/observer/k8sobserver/v0.137.0/extension/observer/k8sobserver/README.md) | v0.137.0 |
| [memorylimiterextension](https://github.com/open-telemetry/opentelemetry-collector/blob/extension/memorylimiterextension/v0.137.0/extension/memorylimiterextension/README.md) | v0.137.0 |
| [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/extension/pprofextension/v0.137.0/extension/pprofextension/README.md) | v0.137.0 |
>>>>>>> e284aff84 (Point beatsauth extension to beats repo (#11120))

### Connectors

Expand Down
5 changes: 5 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 @@ -75,8 +75,13 @@ import (
spanmetricsconnector "github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
forwardconnector "go.opentelemetry.io/collector/connector/forwardconnector"

"github.com/elastic/beats/v7/x-pack/otel/extension/beatsauthextension"
elasticapmconnector "github.com/elastic/opentelemetry-collector-components/connector/elasticapmconnector"
<<<<<<< HEAD:internal/pkg/otel/components.go
beatsauthextension "github.com/elastic/opentelemetry-collector-components/extension/beatsauthextension"
=======
profilingmetricsconnector "github.com/elastic/opentelemetry-collector-components/connector/profilingmetricsconnector"
>>>>>>> e284aff84 (Point beatsauth extension to beats repo (#11120)):internal/edot/otelcol/components.go
)

func components(extensionFactories ...extension.Factory) func() (otelcol.Factories, error) {
Expand Down
Loading