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

[chore] Migrate to extensionauth and remove more replaces #38302

Merged
merged 2 commits into from
Mar 3, 2025
Merged

[chore] Migrate to extensionauth and remove more replaces #38302

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
f903e83
[chore] Bump xprocessorhelper version
mx-psi Mar 3, 2025
aafe946
[chore] Migrate to extensionauth
mx-psi Mar 3, 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
5 changes: 1 addition & 4 deletions cmd/otelcontribcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,4 @@ providers:
# When using `make genotelcontribcol`, a `replaces` section is appended to this
# file before passing it to OCB, to ensure that local versions are used for all
# Contrib modules.
replaces:
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

4 changes: 0 additions & 4 deletions cmd/oteltestbedcol/builder-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,4 @@ providers:
# When using `make genoteltestbedcol`, a `replaces` section is appended to this
# file before passing it to OCB, to ensure that local versions are used for all
# Contrib modules.
replaces:
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

6 changes: 3 additions & 3 deletions exporter/elasticsearchexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"go.opentelemetry.io/collector/exporter/exporterbatcher"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/exporter/xexporter"
"go.opentelemetry.io/collector/extension/auth/authtest"
"go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest"
"go.opentelemetry.io/collector/pdata/pcommon"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down Expand Up @@ -2086,7 +2086,7 @@ func TestExporterAuth(t *testing.T) {
})
err := exporter.Start(context.Background(), &mockHost{
extensions: map[component.ID]component.Component{
testauthID: &authtest.MockClient{
testauthID: &extensionauthtest.MockClient{
ResultRoundTripper: roundTripperFunc(func(*http.Request) (*http.Response, error) {
select {
case done <- struct{}{}:
Expand Down Expand Up @@ -2120,7 +2120,7 @@ func TestExporterBatcher(t *testing.T) {
})
err := exporter.Start(context.Background(), &mockHost{
extensions: map[component.ID]component.Component{
testauthID: &authtest.MockClient{
testauthID: &extensionauthtest.MockClient{
ResultRoundTripper: roundTripperFunc(func(req *http.Request) (*http.Response, error) {
requests = append(requests, req)
return nil, errors.New("nope")
Expand Down
3 changes: 1 addition & 2 deletions exporter/elasticsearchexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ require (
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/exporter/exportertest v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/semconv v0.120.1-0.20250303102058-a9bca17f1a4c
Expand Down Expand Up @@ -85,7 +85,6 @@ require (
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/xextension v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/pipeline v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
Expand Down
2 changes: 0 additions & 2 deletions exporter/elasticsearchexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion exporter/elasticsearchexporter/integrationtest/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ require (
go.opentelemetry.io/collector/pipeline/xpipeline v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.0 // indirect
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/processor/processortest v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
Expand Down
7 changes: 2 additions & 5 deletions exporter/elasticsearchexporter/integrationtest/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions exporter/otelarrowexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ require (
go.opentelemetry.io/collector/exporter v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/exporter/exportertest v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/otel v1.34.0
go.opentelemetry.io/otel/trace v1.34.0
Expand Down Expand Up @@ -76,7 +76,6 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/xextension v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
Expand Down
2 changes: 0 additions & 2 deletions exporter/otelarrowexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions exporter/otelarrowexporter/otelarrow_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/exportertest"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/auth"
"go.opentelemetry.io/collector/extension/extensionauth"
"go.opentelemetry.io/collector/pdata/plog"
"go.opentelemetry.io/collector/pdata/plog/plogotlp"
"go.opentelemetry.io/collector/pdata/pmetric"
Expand Down Expand Up @@ -270,7 +270,7 @@ type testAuthExtension struct {
prc credentials.PerRPCCredentials
}

func newTestAuthExtension(t *testing.T, mdf func(ctx context.Context) map[string]string) auth.Client {
func newTestAuthExtension(t *testing.T, mdf func(ctx context.Context) map[string]string) extensionauth.Client {
ctrl := gomock.NewController(t)
prc := grpcmock.NewMockPerRPCCredentials(ctrl)
prc.EXPECT().RequireTransportSecurity().AnyTimes().Return(false)
Expand Down
1 change: 0 additions & 1 deletion exporter/sumologicexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ require (
go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/extension/xextension v0.120.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect
Expand Down
2 changes: 0 additions & 2 deletions exporter/sumologicexporter/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions extension/asapauthextension/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (

"bitbucket.org/atlassian/go-asap/v2"
"github.com/SermoDigital/jose/crypto"
"go.opentelemetry.io/collector/extension/auth"
"go.opentelemetry.io/collector/extension/extensionauth"
"google.golang.org/grpc/credentials"
)

func createASAPClientAuthenticator(cfg *Config) (auth.Client, error) {
func createASAPClientAuthenticator(cfg *Config) (extensionauth.Client, error) {
pk, err := asap.NewPrivateKey([]byte(cfg.PrivateKey))
if err != nil {
return nil, err
Expand All @@ -24,14 +24,14 @@ func createASAPClientAuthenticator(cfg *Config) (auth.Client, error) {
p := asap.NewCachingProvisioner(asap.NewProvisioner(
cfg.KeyID, cfg.TTL, cfg.Issuer, cfg.Audience, crypto.SigningMethodRS256))

return auth.NewClient(
auth.WithClientRoundTripper(func(base http.RoundTripper) (http.RoundTripper, error) {
return extensionauth.NewClient(
extensionauth.WithClientRoundTripper(func(base http.RoundTripper) (http.RoundTripper, error) {
return asap.NewTransportDecorator(p, pk)(base), nil
}),
auth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) {
extensionauth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) {
return &perRPCAuth{provisioner: p, privateKey: pk}, nil
}),
), nil
)
}

// perRPCAuth is a gRPC credentials.PerRPCCredentials implementation that returns an 'authorization' header.
Expand Down
3 changes: 1 addition & 2 deletions extension/asapauthextension/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
go.opentelemetry.io/collector/confmap v1.26.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c
go.uber.org/multierr v1.11.0
google.golang.org/grpc v1.70.0
Expand All @@ -34,7 +34,6 @@ require (
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/vincent-petithory/dataurl v1.0.0 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c // indirect
go.opentelemetry.io/otel v1.34.0 // indirect
go.opentelemetry.io/otel/metric v1.34.0 // indirect
Expand Down
2 changes: 0 additions & 2 deletions extension/asapauthextension/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 10 additions & 10 deletions extension/basicauthextension/extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"github.com/tg123/go-htpasswd"
"go.opentelemetry.io/collector/client"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension/auth"
"go.opentelemetry.io/collector/extension/extensionauth"
creds "google.golang.org/grpc/credentials"
)

Expand All @@ -33,28 +33,28 @@ type basicAuth struct {
matchFunc func(username, password string) bool
}

func newClientAuthExtension(cfg *Config) auth.Client {
func newClientAuthExtension(cfg *Config) (extensionauth.Client, error) {
ba := basicAuth{
clientAuth: cfg.ClientAuth,
}
return auth.NewClient(
auth.WithClientRoundTripper(ba.roundTripper),
auth.WithClientPerRPCCredentials(ba.perRPCCredentials),
return extensionauth.NewClient(
extensionauth.WithClientRoundTripper(ba.roundTripper),
extensionauth.WithClientPerRPCCredentials(ba.perRPCCredentials),
)
}

func newServerAuthExtension(cfg *Config) (auth.Server, error) {
func newServerAuthExtension(cfg *Config) (extensionauth.Server, error) {
if cfg.Htpasswd == nil || (cfg.Htpasswd.File == "" && cfg.Htpasswd.Inline == "") {
return nil, errNoCredentialSource
}

ba := basicAuth{
htpasswd: cfg.Htpasswd,
}
return auth.NewServer(
auth.WithServerStart(ba.serverStart),
auth.WithServerAuthenticate(ba.authenticate),
), nil
return extensionauth.NewServer(
extensionauth.WithServerStart(ba.serverStart),
extensionauth.WithServerAuthenticate(ba.authenticate),
)
}

func (ba *basicAuth) serverStart(_ context.Context, _ component.Host) error {
Expand Down
Loading
Loading