diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index 840c66e1ee75..2857f772ea45 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -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 + diff --git a/cmd/oteltestbedcol/builder-config.yaml b/cmd/oteltestbedcol/builder-config.yaml index cfa7c8f4f704..8bb05e9915fc 100644 --- a/cmd/oteltestbedcol/builder-config.yaml +++ b/cmd/oteltestbedcol/builder-config.yaml @@ -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 diff --git a/exporter/elasticsearchexporter/exporter_test.go b/exporter/elasticsearchexporter/exporter_test.go index 3fbfce543b61..58cbd912c025 100644 --- a/exporter/elasticsearchexporter/exporter_test.go +++ b/exporter/elasticsearchexporter/exporter_test.go @@ -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" @@ -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{}{}: @@ -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") diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 60745491c5a8..a2721debaac7 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -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 @@ -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 diff --git a/exporter/elasticsearchexporter/go.sum b/exporter/elasticsearchexporter/go.sum index 4752dc4ef82d..760d5fb651b7 100644 --- a/exporter/elasticsearchexporter/go.sum +++ b/exporter/elasticsearchexporter/go.sum @@ -166,8 +166,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c h1:eoNAkO/bTVTcZE+V2Jz/nwOxQnhreGB0ndpwUC2g2jw= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:jiPn968q3ExtWhNu8tFRcLsfhmONrlGZqFRgmaA1FOM= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/exporter/elasticsearchexporter/integrationtest/go.mod b/exporter/elasticsearchexporter/integrationtest/go.mod index e96d37916493..ea213f85a24d 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.mod +++ b/exporter/elasticsearchexporter/integrationtest/go.mod @@ -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 diff --git a/exporter/elasticsearchexporter/integrationtest/go.sum b/exporter/elasticsearchexporter/integrationtest/go.sum index f10a7a6257a6..3183da2af2be 100644 --- a/exporter/elasticsearchexporter/integrationtest/go.sum +++ b/exporter/elasticsearchexporter/integrationtest/go.sum @@ -370,9 +370,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.119.0 h1:URPkjeo3aKmlYGgeFCZK6kLK+D1XGfDUGSAwFaHn+QQ= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c h1:eoNAkO/bTVTcZE+V2Jz/nwOxQnhreGB0ndpwUC2g2jw= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:jiPn968q3ExtWhNu8tFRcLsfhmONrlGZqFRgmaA1FOM= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= @@ -413,8 +410,8 @@ go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058 go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:bX6SnsYFDltfkvQbUHszJpH0RSHk4Jdn3oM25Vdn93E= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c h1:U9SmCvcw5aZ2gcToBDp5TRUfjWoSBA/TWVRS4NY/ra8= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:9fv8vE49dKryMTY1mSY/81Z4xuSwxG0X1F/y4KLguPQ= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.0 h1:yO9QPJoYrHM62M1nUZRaAltvTZFQIYpl2V1EfBtOp3E= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.0/go.mod h1:ALMYNJNnGvGEiHrbLHzg4xV3Cjs2Y/V2C2capETsRmY= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.1-0.20250303102058-a9bca17f1a4c h1:Wbxg05L3eTQ2BqOv+TDNlzcfjqnRn3ZYEZm8naYV7/k= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:ALMYNJNnGvGEiHrbLHzg4xV3Cjs2Y/V2C2capETsRmY= go.opentelemetry.io/collector/processor/processortest v0.120.1-0.20250303102058-a9bca17f1a4c h1:75SdzhTJFITSB2vllCyTF8x8t6LwJeFie3+0iJ1cfPE= go.opentelemetry.io/collector/processor/processortest v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:me+IVxPsj4IgK99I0pgKLX34XnJtcLwqtgTuVLhhYDI= go.opentelemetry.io/collector/processor/xprocessor v0.120.1-0.20250303102058-a9bca17f1a4c h1:OD/xdUsWuQD+DIWC9tS7XOSg0FK8ogtbswMuxcfuAyE= diff --git a/exporter/otelarrowexporter/go.mod b/exporter/otelarrowexporter/go.mod index f58b21464e9c..1b939de8e2fc 100644 --- a/exporter/otelarrowexporter/go.mod +++ b/exporter/otelarrowexporter/go.mod @@ -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 @@ -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 diff --git a/exporter/otelarrowexporter/go.sum b/exporter/otelarrowexporter/go.sum index 17a09c4aab4b..cbe4845feae6 100644 --- a/exporter/otelarrowexporter/go.sum +++ b/exporter/otelarrowexporter/go.sum @@ -149,8 +149,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/exporter/otelarrowexporter/otelarrow_test.go b/exporter/otelarrowexporter/otelarrow_test.go index f33a9f1a8d86..e05b8d4b7684 100644 --- a/exporter/otelarrowexporter/otelarrow_test.go +++ b/exporter/otelarrowexporter/otelarrow_test.go @@ -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" @@ -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) diff --git a/exporter/sumologicexporter/go.mod b/exporter/sumologicexporter/go.mod index 63ebca90630b..472f2dd4f359 100644 --- a/exporter/sumologicexporter/go.mod +++ b/exporter/sumologicexporter/go.mod @@ -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 diff --git a/exporter/sumologicexporter/go.sum b/exporter/sumologicexporter/go.sum index 49112abd35dc..980b3a3f0f6e 100644 --- a/exporter/sumologicexporter/go.sum +++ b/exporter/sumologicexporter/go.sum @@ -125,8 +125,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/extension/asapauthextension/extension.go b/extension/asapauthextension/extension.go index 19f8f764c694..6f53324d3741 100644 --- a/extension/asapauthextension/extension.go +++ b/extension/asapauthextension/extension.go @@ -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 @@ -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. diff --git a/extension/asapauthextension/go.mod b/extension/asapauthextension/go.mod index 18f5cad40ce1..e1c1012c5b29 100644 --- a/extension/asapauthextension/go.mod +++ b/extension/asapauthextension/go.mod @@ -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 @@ -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 diff --git a/extension/asapauthextension/go.sum b/extension/asapauthextension/go.sum index cdd560f9a280..3b63b35cd560 100644 --- a/extension/asapauthextension/go.sum +++ b/extension/asapauthextension/go.sum @@ -66,8 +66,6 @@ go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17 go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:wkzt6fVdLqBP+ZvbJWCLbo68nedvmoK09wFpR17awgs= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/basicauthextension/extension.go b/extension/basicauthextension/extension.go index b1a24d2ab068..7d0a2b78a767 100644 --- a/extension/basicauthextension/extension.go +++ b/extension/basicauthextension/extension.go @@ -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" ) @@ -33,17 +33,17 @@ 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 } @@ -51,10 +51,10 @@ func newServerAuthExtension(cfg *Config) (auth.Server, error) { 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 { diff --git a/extension/basicauthextension/extension_test.go b/extension/basicauthextension/extension_test.go index 2dab5cc5b8c7..40ff4d2e17dd 100644 --- a/extension/basicauthextension/extension_test.go +++ b/extension/basicauthextension/extension_test.go @@ -226,12 +226,13 @@ func (m *mockRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) } func TestBasicAuth_ClientValid(t *testing.T) { - ext := newClientAuthExtension(&Config{ + ext, err := newClientAuthExtension(&Config{ ClientAuth: &ClientAuthSettings{ Username: "username", Password: "password", }, }) + require.NoError(t, err) require.NotNil(t, ext) require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost())) @@ -272,18 +273,19 @@ func TestBasicAuth_ClientValid(t *testing.T) { func TestBasicAuth_ClientInvalid(t *testing.T) { t.Run("invalid username format", func(t *testing.T) { - ext := newClientAuthExtension(&Config{ + ext, err := newClientAuthExtension(&Config{ ClientAuth: &ClientAuthSettings{ Username: "user:name", Password: "password", }, }) + require.NoError(t, err) require.NotNil(t, ext) require.NoError(t, ext.Start(context.Background(), componenttest.NewNopHost())) base := &mockRoundTripper{} - _, err := ext.RoundTripper(base) + _, err = ext.RoundTripper(base) assert.Error(t, err) _, err = ext.PerRPCCredentials() diff --git a/extension/basicauthextension/factory.go b/extension/basicauthextension/factory.go index 7e2750f56bcd..0059d0d299fa 100644 --- a/extension/basicauthextension/factory.go +++ b/extension/basicauthextension/factory.go @@ -31,5 +31,5 @@ func createExtension(_ context.Context, _ extension.Settings, cfg component.Conf if cfg.(*Config).Htpasswd != nil { return newServerAuthExtension(cfg.(*Config)) } - return newClientAuthExtension(cfg.(*Config)), nil + return newClientAuthExtension(cfg.(*Config)) } diff --git a/extension/basicauthextension/go.mod b/extension/basicauthextension/go.mod index 4ed61cb72de6..a82c0ff533bc 100644 --- a/extension/basicauthextension/go.mod +++ b/extension/basicauthextension/go.mod @@ -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/goleak v1.3.0 google.golang.org/grpc v1.70.0 @@ -33,7 +33,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/basicauthextension/go.sum b/extension/basicauthextension/go.sum index 500eb4fcf907..bb0681a093b1 100644 --- a/extension/basicauthextension/go.sum +++ b/extension/basicauthextension/go.sum @@ -67,8 +67,6 @@ go.opentelemetry.io/collector/consumer v1.26.0 h1:0MwuzkWFLOm13qJvwW85QkoavnGpR4 go.opentelemetry.io/collector/consumer v1.26.0/go.mod h1:I/ZwlWM0sbFLhbStpDOeimjtMbWpMFSoGdVmzYxLGDg= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/bearertokenauthextension/bearertokenauth.go b/extension/bearertokenauthextension/bearertokenauth.go index 28ecbf965e08..499be97bb7d2 100644 --- a/extension/bearertokenauthextension/bearertokenauth.go +++ b/extension/bearertokenauthextension/bearertokenauth.go @@ -14,7 +14,7 @@ import ( "github.com/fsnotify/fsnotify" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" "google.golang.org/grpc/credentials" ) @@ -37,11 +37,11 @@ func (c *PerRPCAuth) RequireTransportSecurity() bool { } var ( - _ auth.Server = (*BearerTokenAuth)(nil) - _ auth.Client = (*BearerTokenAuth)(nil) + _ extensionauth.Server = (*BearerTokenAuth)(nil) + _ extensionauth.Client = (*BearerTokenAuth)(nil) ) -// BearerTokenAuth is an implementation of auth.Client. It embeds a static authorization "bearer" token in every rpc call. +// BearerTokenAuth is an implementation of extensionauth.Client. It embeds a static authorization "bearer" token in every rpc call. type BearerTokenAuth struct { scheme string authorizationValueAtomic atomic.Value @@ -52,7 +52,7 @@ type BearerTokenAuth struct { logger *zap.Logger } -var _ auth.Client = (*BearerTokenAuth)(nil) +var _ extensionauth.Client = (*BearerTokenAuth)(nil) func newBearerTokenAuth(cfg *Config, logger *zap.Logger) *BearerTokenAuth { if cfg.Filename != "" && cfg.BearerToken != "" { diff --git a/extension/bearertokenauthextension/go.mod b/extension/bearertokenauthextension/go.mod index 9c4fb80f2b01..cb1ea9b9e914 100644 --- a/extension/bearertokenauthextension/go.mod +++ b/extension/bearertokenauthextension/go.mod @@ -11,7 +11,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/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -32,7 +32,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/bearertokenauthextension/go.sum b/extension/bearertokenauthextension/go.sum index a09702c61765..eab7bae09185 100644 --- a/extension/bearertokenauthextension/go.sum +++ b/extension/bearertokenauthextension/go.sum @@ -55,8 +55,6 @@ go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17 go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:wkzt6fVdLqBP+ZvbJWCLbo68nedvmoK09wFpR17awgs= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/headerssetterextension/extension.go b/extension/headerssetterextension/extension.go index f9e3118d1946..f2d910fa100e 100644 --- a/extension/headerssetterextension/extension.go +++ b/extension/headerssetterextension/extension.go @@ -9,7 +9,7 @@ import ( "fmt" "net/http" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" "google.golang.org/grpc/credentials" @@ -22,7 +22,7 @@ type Header struct { source source.Source } -func newHeadersSetterExtension(cfg *Config, logger *zap.Logger) (auth.Client, error) { +func newHeadersSetterExtension(cfg *Config, logger *zap.Logger) (extensionauth.Client, error) { if cfg == nil { return nil, errors.New("extension configuration is not provided") } @@ -63,18 +63,18 @@ func newHeadersSetterExtension(cfg *Config, logger *zap.Logger) (auth.Client, er headers = append(headers, Header{action: a, source: s}) } - return auth.NewClient( - auth.WithClientRoundTripper( + return extensionauth.NewClient( + extensionauth.WithClientRoundTripper( func(base http.RoundTripper) (http.RoundTripper, error) { return &headersRoundTripper{ base: base, headers: headers, }, nil }), - auth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) { + extensionauth.WithClientPerRPCCredentials(func() (credentials.PerRPCCredentials, error) { return &headersPerRPC{headers: headers}, nil }), - ), nil + ) } // headersPerRPC is a gRPC credentials.PerRPCCredentials implementation sets diff --git a/extension/headerssetterextension/go.mod b/extension/headerssetterextension/go.mod index 772eff21261f..e4efec1b6107 100644 --- a/extension/headerssetterextension/go.mod +++ b/extension/headerssetterextension/go.mod @@ -10,7 +10,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/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -31,7 +31,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/headerssetterextension/go.sum b/extension/headerssetterextension/go.sum index 37562bc1d43d..e3cae7fc8492 100644 --- a/extension/headerssetterextension/go.sum +++ b/extension/headerssetterextension/go.sum @@ -61,8 +61,6 @@ go.opentelemetry.io/collector/consumer v1.26.0 h1:0MwuzkWFLOm13qJvwW85QkoavnGpR4 go.opentelemetry.io/collector/consumer v1.26.0/go.mod h1:I/ZwlWM0sbFLhbStpDOeimjtMbWpMFSoGdVmzYxLGDg= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/oauth2clientauthextension/factory.go b/extension/oauth2clientauthextension/factory.go index 21510053eab8..3f0b2f0b1d87 100644 --- a/extension/oauth2clientauthextension/factory.go +++ b/extension/oauth2clientauthextension/factory.go @@ -9,7 +9,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension/internal/metadata" ) @@ -36,8 +36,8 @@ func createExtension(_ context.Context, set extension.Settings, cfg component.Co return nil, err } - return auth.NewClient( - auth.WithClientRoundTripper(ca.roundTripper), - auth.WithClientPerRPCCredentials(ca.perRPCCredentials), - ), nil + return extensionauth.NewClient( + extensionauth.WithClientRoundTripper(ca.roundTripper), + extensionauth.WithClientPerRPCCredentials(ca.perRPCCredentials), + ) } diff --git a/extension/oauth2clientauthextension/go.mod b/extension/oauth2clientauthextension/go.mod index edce07b72e4c..f20fd32e781f 100644 --- a/extension/oauth2clientauthextension/go.mod +++ b/extension/oauth2clientauthextension/go.mod @@ -11,7 +11,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/goleak v1.3.0 go.uber.org/multierr v1.11.0 @@ -36,7 +36,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/oauth2clientauthextension/go.sum b/extension/oauth2clientauthextension/go.sum index 633947cb3e3d..c71238a038aa 100644 --- a/extension/oauth2clientauthextension/go.sum +++ b/extension/oauth2clientauthextension/go.sum @@ -59,8 +59,6 @@ go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17 go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:wkzt6fVdLqBP+ZvbJWCLbo68nedvmoK09wFpR17awgs= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/oidcauthextension/extension.go b/extension/oidcauthextension/extension.go index c6d2ebeb37cb..90e7a9a2f15c 100644 --- a/extension/oidcauthextension/extension.go +++ b/extension/oidcauthextension/extension.go @@ -20,7 +20,7 @@ import ( "github.com/coreos/go-oidc/v3/oidc" "go.opentelemetry.io/collector/client" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" ) @@ -45,7 +45,7 @@ var ( errNotAuthenticated = errors.New("authentication didn't succeed") ) -func newExtension(cfg *Config, logger *zap.Logger) auth.Server { +func newExtension(cfg *Config, logger *zap.Logger) (extensionauth.Server, error) { if cfg.Attribute == "" { cfg.Attribute = defaultAttribute } @@ -54,10 +54,10 @@ func newExtension(cfg *Config, logger *zap.Logger) auth.Server { cfg: cfg, logger: logger, } - return auth.NewServer( - auth.WithServerStart(oe.start), - auth.WithServerAuthenticate(oe.authenticate), - auth.WithServerShutdown(oe.shutdown), + return extensionauth.NewServer( + extensionauth.WithServerStart(oe.start), + extensionauth.WithServerAuthenticate(oe.authenticate), + extensionauth.WithServerShutdown(oe.shutdown), ) } diff --git a/extension/oidcauthextension/extension_test.go b/extension/oidcauthextension/extension_test.go index 4a7be98fea0a..bc9ee7441eb4 100644 --- a/extension/oidcauthextension/extension_test.go +++ b/extension/oidcauthextension/extension_test.go @@ -21,9 +21,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.opentelemetry.io/collector/component/componenttest" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" ) +func newTestExtension(t *testing.T, cfg *Config) extensionauth.Server { + t.Helper() + ext, err := newExtension(cfg, zap.NewNop()) + require.NoError(t, err) + return ext +} + func TestOIDCAuthenticationSucceeded(t *testing.T) { // prepare oidcServer, err := newOIDCServer() @@ -36,7 +44,7 @@ func TestOIDCAuthenticationSucceeded(t *testing.T) { Audience: "unit-test", GroupsClaim: "memberships", } - p := newExtension(config, zap.NewNop()) + p := newTestExtension(t, config) err = p.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -200,10 +208,10 @@ func TestOIDCFailedToLoadIssuerCAFromPathInvalidContent(t *testing.T) { func TestOIDCInvalidAuthHeader(t *testing.T) { // prepare - p := newExtension(&Config{ + p := newTestExtension(t, &Config{ Audience: "some-audience", IssuerURL: "http://example.com", - }, zap.NewNop()) + }) // test ctx, err := p.Authenticate(context.Background(), map[string][]string{"authorization": {"some-value"}}) @@ -215,10 +223,10 @@ func TestOIDCInvalidAuthHeader(t *testing.T) { func TestOIDCNotAuthenticated(t *testing.T) { // prepare - p := newExtension(&Config{ + p := newTestExtension(t, &Config{ Audience: "some-audience", IssuerURL: "http://example.com", - }, zap.NewNop()) + }) // test ctx, err := p.Authenticate(context.Background(), make(map[string][]string)) @@ -230,10 +238,10 @@ func TestOIDCNotAuthenticated(t *testing.T) { func TestProviderNotReachable(t *testing.T) { // prepare - p := newExtension(&Config{ + p := newTestExtension(t, &Config{ Audience: "some-audience", IssuerURL: "http://example.com", - }, zap.NewNop()) + }) // test err := p.Start(context.Background(), componenttest.NewNopHost()) @@ -252,10 +260,10 @@ func TestFailedToVerifyToken(t *testing.T) { oidcServer.Start() defer oidcServer.Close() - p := newExtension(&Config{ + p := newTestExtension(t, &Config{ IssuerURL: oidcServer.URL, Audience: "unit-test", - }, zap.NewNop()) + }) err = p.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -309,7 +317,7 @@ func TestFailedToGetGroupsClaimFromToken(t *testing.T) { }, } { t.Run(tt.casename, func(t *testing.T) { - p := newExtension(tt.config, zap.NewNop()) + p := newTestExtension(t, tt.config) err = p.Start(context.Background(), componenttest.NewNopHost()) require.NoError(t, err) @@ -442,7 +450,7 @@ func TestShutdown(t *testing.T) { Audience: "some-audience", IssuerURL: "http://example.com/", } - p := newExtension(config, zap.NewNop()) + p := newTestExtension(t, config) require.NotNil(t, p) // test diff --git a/extension/oidcauthextension/factory.go b/extension/oidcauthextension/factory.go index 4c0f1010113f..b76430965bc9 100644 --- a/extension/oidcauthextension/factory.go +++ b/extension/oidcauthextension/factory.go @@ -33,5 +33,5 @@ func createDefaultConfig() component.Config { } func createExtension(_ context.Context, set extension.Settings, cfg component.Config) (extension.Extension, error) { - return newExtension(cfg.(*Config), set.Logger), nil + return newExtension(cfg.(*Config), set.Logger) } diff --git a/extension/oidcauthextension/go.mod b/extension/oidcauthextension/go.mod index 0f196c0a64c3..4533bb6b27a6 100644 --- a/extension/oidcauthextension/go.mod +++ b/extension/oidcauthextension/go.mod @@ -10,7 +10,7 @@ require ( go.opentelemetry.io/collector/component/componenttest v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/confmap v1.26.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/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -31,7 +31,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/oidcauthextension/go.sum b/extension/oidcauthextension/go.sum index b47029a5ea24..06e057b7c820 100644 --- a/extension/oidcauthextension/go.sum +++ b/extension/oidcauthextension/go.sum @@ -63,8 +63,6 @@ go.opentelemetry.io/collector/consumer v1.26.0 h1:0MwuzkWFLOm13qJvwW85QkoavnGpR4 go.opentelemetry.io/collector/consumer v1.26.0/go.mod h1:I/ZwlWM0sbFLhbStpDOeimjtMbWpMFSoGdVmzYxLGDg= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/opampextension/auth.go b/extension/opampextension/auth.go index b1af4b7af078..a4e9bab4ac8d 100644 --- a/extension/opampextension/auth.go +++ b/extension/opampextension/auth.go @@ -10,7 +10,7 @@ import ( "net/http" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" ) @@ -46,9 +46,9 @@ func makeHeadersFunc(logger *zap.Logger, serverCfg *OpAMPServer, host component. return nil, fmt.Errorf("could not find auth extension %q", extID) } - authExt, ok := ext.(auth.Client) + authExt, ok := ext.(extensionauth.Client) if !ok { - return nil, fmt.Errorf("auth extension %q is not an auth.Client", extID) + return nil, fmt.Errorf("auth extension %q is not an extensionauth.Client", extID) } hcrt := &headerCaptureRoundTripper{} diff --git a/extension/opampextension/auth_test.go b/extension/opampextension/auth_test.go index e8447d693b06..b058bf2a9a85 100644 --- a/extension/opampextension/auth_test.go +++ b/extension/opampextension/auth_test.go @@ -54,7 +54,7 @@ func TestMakeHeadersFunc(t *testing.T) { }, }, host) - require.EqualError(t, err, `auth extension "bearerauth" is not an auth.Client`) + require.EqualError(t, err, `auth extension "bearerauth" is not an extensionauth.Client`) require.Nil(t, headersFunc) }) diff --git a/extension/opampextension/go.mod b/extension/opampextension/go.mod index 348279975471..8c30af46ddce 100644 --- a/extension/opampextension/go.mod +++ b/extension/opampextension/go.mod @@ -17,7 +17,7 @@ require ( go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/confmap v1.26.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/extensioncapabilities v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/semconv v0.120.1-0.20250303102058-a9bca17f1a4c @@ -55,7 +55,7 @@ require ( go.opentelemetry.io/collector/exporter v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/exporter/exportertest 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/auth v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/internal/fanoutconsumer v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/internal/telemetry v0.120.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/extension/sigv4authextension/doc.go b/extension/sigv4authextension/doc.go index a906f3efe867..13d8b3552c7b 100644 --- a/extension/sigv4authextension/doc.go +++ b/extension/sigv4authextension/doc.go @@ -3,7 +3,7 @@ //go:generate mdatagen metadata.yaml -// Package sigv4authextension implements the `auth.Client` interface. +// Package sigv4authextension implements the `extensionauth.Client` interface. // This extension provides the Sigv4 process of adding authentication information to AWS API requests sent by HTTP. // As such, the extension can be used for HTTP based exporters that export to AWS services. package sigv4authextension // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension" diff --git a/extension/sigv4authextension/extension.go b/extension/sigv4authextension/extension.go index f1e3b337ba5b..d39eb440ea30 100644 --- a/extension/sigv4authextension/extension.go +++ b/extension/sigv4authextension/extension.go @@ -14,12 +14,12 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials/stscreds" "github.com/aws/aws-sdk-go-v2/service/sts" "go.opentelemetry.io/collector/component" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.uber.org/zap" grpcCredentials "google.golang.org/grpc/credentials" ) -// sigv4Auth is a struct that implements the auth.Client interface. +// sigv4Auth is a struct that implements the extensionauth.Client interface. // It provides the implementation for providing Sigv4 authentication for HTTP requests only. type sigv4Auth struct { cfg *Config @@ -29,8 +29,8 @@ type sigv4Auth struct { component.ShutdownFunc // embedded default behavior to do nothing with Shutdown() } -// compile time check that the sigv4Auth struct satisfies the auth.Client interface -var _ auth.Client = (*sigv4Auth)(nil) +// compile time check that the sigv4Auth struct satisfies the extensionauth.Client interface +var _ extensionauth.Client = (*sigv4Auth)(nil) // RoundTripper() returns a custom signingRoundTripper. func (sa *sigv4Auth) RoundTripper(base http.RoundTripper) (http.RoundTripper, error) { @@ -52,7 +52,7 @@ func (sa *sigv4Auth) RoundTripper(base http.RoundTripper) (http.RoundTripper, er return &rt, nil } -// PerRPCCredentials is implemented to satisfy the auth.Client interface but will not be implemented. +// PerRPCCredentials is implemented to satisfy the extensionauth.Client interface but will not be implemented. func (sa *sigv4Auth) PerRPCCredentials() (grpcCredentials.PerRPCCredentials, error) { return nil, errors.New("Not Implemented") } diff --git a/extension/sigv4authextension/go.mod b/extension/sigv4authextension/go.mod index c7a2efc47d86..45826d82c6c6 100644 --- a/extension/sigv4authextension/go.mod +++ b/extension/sigv4authextension/go.mod @@ -13,7 +13,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/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -43,7 +43,6 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/pmezard/go-difflib 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 diff --git a/extension/sigv4authextension/go.sum b/extension/sigv4authextension/go.sum index 8c152db9134b..7e6175d691b4 100644 --- a/extension/sigv4authextension/go.sum +++ b/extension/sigv4authextension/go.sum @@ -77,8 +77,6 @@ go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17 go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:wkzt6fVdLqBP+ZvbJWCLbo68nedvmoK09wFpR17awgs= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensiontest v0.120.1-0.20250303102058-a9bca17f1a4c h1:1fjf4TLrBOszZEbISTRgXGC3poqoANGevRT+NmNW0QM= diff --git a/extension/sumologicextension/extension.go b/extension/sumologicextension/extension.go index 2b7718654e6b..84e1112b2e59 100644 --- a/extension/sumologicextension/extension.go +++ b/extension/sumologicextension/extension.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/featuregate" "go.uber.org/zap" grpccredentials "google.golang.org/grpc/credentials" @@ -106,7 +106,7 @@ func init() { var errGRPCNotSupported = fmt.Errorf("gRPC is not supported by sumologicextension") // SumologicExtension implements ClientAuthenticator -var _ auth.Client = (*SumologicExtension)(nil) +var _ extensionauth.Client = (*SumologicExtension)(nil) func newSumologicExtension(conf *Config, logger *zap.Logger, id component.ID, buildVersion string) (*SumologicExtension, error) { if conf.Credentials.InstallationToken == "" { diff --git a/extension/sumologicextension/go.mod b/extension/sumologicextension/go.mod index 0877802def03..54c7e03af5e7 100644 --- a/extension/sumologicextension/go.mod +++ b/extension/sumologicextension/go.mod @@ -13,7 +13,7 @@ require ( go.opentelemetry.io/collector/config/configopaque 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/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 @@ -53,7 +53,6 @@ require ( go.opentelemetry.io/collector/config/configcompression v1.26.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/config/configtls v1.26.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/confmap v1.26.1-0.20250303102058-a9bca17f1a4c // 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/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect go.opentelemetry.io/otel v1.34.0 // indirect diff --git a/extension/sumologicextension/go.sum b/extension/sumologicextension/go.sum index 0c428d8baf39..de86f8ca2ec5 100644 --- a/extension/sumologicextension/go.sum +++ b/extension/sumologicextension/go.sum @@ -106,8 +106,6 @@ go.opentelemetry.io/collector/consumer v1.26.0 h1:0MwuzkWFLOm13qJvwW85QkoavnGpR4 go.opentelemetry.io/collector/consumer v1.26.0/go.mod h1:I/ZwlWM0sbFLhbStpDOeimjtMbWpMFSoGdVmzYxLGDg= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/internal/buildscripts/modules b/internal/buildscripts/modules index 03f07bf3d479..aca3d6d439d8 100644 --- a/internal/buildscripts/modules +++ b/internal/buildscripts/modules @@ -32,8 +32,8 @@ beta_modules=( "go.opentelemetry.io/collector/exporter/otlphttpexporter" "go.opentelemetry.io/collector/exporter/xexporter" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/auth" - "go.opentelemetry.io/collector/extension/auth/authtest" + "go.opentelemetry.io/collector/extension/extensionauth" + "go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest" "go.opentelemetry.io/collector/extension/extensioncapabilities" "go.opentelemetry.io/collector/extension/extensiontest" "go.opentelemetry.io/collector/extension/zpagesextension" diff --git a/internal/buildscripts/ocb-add-replaces.sh b/internal/buildscripts/ocb-add-replaces.sh index f8e980e1328f..a3d5a5ee365d 100755 --- a/internal/buildscripts/ocb-add-replaces.sh +++ b/internal/buildscripts/ocb-add-replaces.sh @@ -12,8 +12,7 @@ CONFIG_OUT="cmd/$DIR/builder-config-replaced.yaml" cp "$CONFIG_IN" "$CONFIG_OUT" local_mods=$(find . -type f -name "go.mod" -exec dirname {} \; | sort) -# TODO: Uncomment once existing replaces are removed from the builder config -# echo "replaces:" >> "$CONFIG_OUT" +echo "replaces:" >> "$CONFIG_OUT" for mod_path in $local_mods; do mod=${mod_path#"."} # remove initial dot echo " - github.com/open-telemetry/opentelemetry-collector-contrib$mod => ../..$mod" >> "$CONFIG_OUT" diff --git a/internal/otelarrow/go.mod b/internal/otelarrow/go.mod index 1097115c9376..3a2a292bddd2 100644 --- a/internal/otelarrow/go.mod +++ b/internal/otelarrow/go.mod @@ -79,7 +79,6 @@ require ( go.opentelemetry.io/collector/confmap/xconfmap v0.120.1-0.20250303102058-a9bca17f1a4c // indirect 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/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 diff --git a/internal/otelarrow/go.sum b/internal/otelarrow/go.sum index 03e47d2521f6..d09e65a333a3 100644 --- a/internal/otelarrow/go.sum +++ b/internal/otelarrow/go.sum @@ -151,8 +151,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/otelarrowreceiver/go.mod b/receiver/otelarrowreceiver/go.mod index 7d7138d4dcfc..fe4790f575ea 100644 --- a/receiver/otelarrowreceiver/go.mod +++ b/receiver/otelarrowreceiver/go.mod @@ -21,7 +21,7 @@ require ( go.opentelemetry.io/collector/consumer v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/consumer/consumertest 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/collector/receiver v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/receiver/receivertest v0.120.1-0.20250303102058-a9bca17f1a4c @@ -74,7 +74,6 @@ require ( go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/exporter 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/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pipeline v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/receiver/otelarrowreceiver/go.sum b/receiver/otelarrowreceiver/go.sum index e9ce178fc64f..2247e613c433 100644 --- a/receiver/otelarrowreceiver/go.sum +++ b/receiver/otelarrowreceiver/go.sum @@ -139,8 +139,6 @@ go.opentelemetry.io/collector/exporter v0.120.1-0.20250303102058-a9bca17f1a4c h1 go.opentelemetry.io/collector/exporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:RzGiV3YdWgj+NhlkNrm1iMCDFufyDQYMh61LJ7TaFj8= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/otelarrowreceiver/internal/arrow/arrow.go b/receiver/otelarrowreceiver/internal/arrow/arrow.go index a7f7563544ec..70f4c219bed5 100644 --- a/receiver/otelarrowreceiver/internal/arrow/arrow.go +++ b/receiver/otelarrowreceiver/internal/arrow/arrow.go @@ -19,7 +19,7 @@ import ( "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumererror" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -71,7 +71,7 @@ type Receiver struct { tracer trace.Tracer obsrecv *receiverhelper.ObsReport gsettings configgrpc.ServerConfig - authServer auth.Server + authServer extensionauth.Server newConsumer func() arrowRecord.ConsumerAPI netReporter netstats.Interface boundedQueue admission2.Queue @@ -89,7 +89,7 @@ func New( set receiver.Settings, obsrecv *receiverhelper.ObsReport, gsettings configgrpc.ServerConfig, - authServer auth.Server, + authServer extensionauth.Server, newConsumer func() arrowRecord.ConsumerAPI, bq admission2.Queue, netReporter netstats.Interface, @@ -136,7 +136,7 @@ type headerReceiver struct { tmpHdrs map[string][]string } -func newHeaderReceiver(streamCtx context.Context, as auth.Server, includeMetadata bool) *headerReceiver { +func newHeaderReceiver(streamCtx context.Context, as extensionauth.Server, includeMetadata bool) *headerReceiver { hr := &headerReceiver{ includeMetadata: includeMetadata, hasAuthServer: as != nil, diff --git a/receiver/otelarrowreceiver/internal/arrow/arrow_test.go b/receiver/otelarrowreceiver/internal/arrow/arrow_test.go index 33a8ee62768f..5dc728804fce 100644 --- a/receiver/otelarrowreceiver/internal/arrow/arrow_test.go +++ b/receiver/otelarrowreceiver/internal/arrow/arrow_test.go @@ -27,7 +27,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" @@ -366,8 +366,8 @@ func (ctc *commonTestCase) newOOMConsumer() arrowRecord.ConsumerAPI { return mock } -func (ctc *commonTestCase) start(newConsumer func() arrowRecord.ConsumerAPI, bq admission2.Queue, opts ...func(*configgrpc.ServerConfig, *auth.Server)) { - var authServer auth.Server +func (ctc *commonTestCase) start(newConsumer func() arrowRecord.ConsumerAPI, bq admission2.Queue, opts ...func(*configgrpc.ServerConfig, *extensionauth.Server)) { + var authServer extensionauth.Server var gsettings configgrpc.ServerConfig for _, gf := range opts { gf(&gsettings, &authServer) @@ -882,7 +882,7 @@ func testReceiverHeaders(t *testing.T, includeMeta bool) { ctc.stream.EXPECT().Send(gomock.Any()).Times(len(expectData)).Return(nil) - ctc.start(ctc.newRealConsumer, defaultBQ(), func(gsettings *configgrpc.ServerConfig, _ *auth.Server) { + ctc.start(ctc.newRealConsumer, defaultBQ(), func(gsettings *configgrpc.ServerConfig, _ *extensionauth.Server) { gsettings.IncludeMetadata = includeMeta }) @@ -1243,7 +1243,7 @@ func testReceiverAuthHeaders(t *testing.T, includeMeta bool, dataAuth bool) { }) var authCall *gomock.Call - ctc.start(ctc.newRealConsumer, defaultBQ(), func(gsettings *configgrpc.ServerConfig, authPtr *auth.Server) { + ctc.start(ctc.newRealConsumer, defaultBQ(), func(gsettings *configgrpc.ServerConfig, authPtr *extensionauth.Server) { gsettings.IncludeMetadata = includeMeta as := mock.NewMockServer(ctc.ctrl) diff --git a/receiver/otelarrowreceiver/otelarrow.go b/receiver/otelarrowreceiver/otelarrow.go index b91a60d3d93d..6556368cdff6 100644 --- a/receiver/otelarrowreceiver/otelarrow.go +++ b/receiver/otelarrowreceiver/otelarrow.go @@ -14,7 +14,7 @@ import ( "go.opentelemetry.io/collector/component/componentstatus" "go.opentelemetry.io/collector/config/configgrpc" "go.opentelemetry.io/collector/consumer" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/pdata/plog/plogotlp" "go.opentelemetry.io/collector/pdata/pmetric/pmetricotlp" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" @@ -127,7 +127,7 @@ func (r *otelArrowReceiver) startProtocolServers(ctx context.Context, host compo return err } - var authServer auth.Server + var authServer extensionauth.Server if r.cfg.GRPC.Auth != nil { authServer, err = r.cfg.GRPC.Auth.GetServerAuthenticator(ctx, host.GetExtensions()) if err != nil { diff --git a/receiver/otelarrowreceiver/otelarrow_test.go b/receiver/otelarrowreceiver/otelarrow_test.go index f5eb9077de47..24e6b06c7572 100644 --- a/receiver/otelarrowreceiver/otelarrow_test.go +++ b/receiver/otelarrowreceiver/otelarrow_test.go @@ -28,7 +28,7 @@ import ( "go.opentelemetry.io/collector/config/configtls" "go.opentelemetry.io/collector/consumer" "go.opentelemetry.io/collector/consumer/consumertest" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/pdata/pmetric" "go.opentelemetry.io/collector/pdata/ptrace" "go.opentelemetry.io/collector/pdata/ptrace/ptraceotlp" @@ -675,7 +675,7 @@ func (h *hostWithExtensions) GetExtensions() map[component.ID]component.Componen return h.exts } -func newTestAuthExtension(t *testing.T, authFunc func(ctx context.Context, hdrs map[string][]string) (context.Context, error)) auth.Server { +func newTestAuthExtension(t *testing.T, authFunc func(ctx context.Context, hdrs map[string][]string) (context.Context, error)) extensionauth.Server { ctrl := gomock.NewController(t) as := mock.NewMockServer(ctrl) as.EXPECT().Authenticate(gomock.Any(), gomock.Any()).AnyTimes().DoAndReturn(authFunc) diff --git a/receiver/purefareceiver/go.mod b/receiver/purefareceiver/go.mod index 0d01c713ea7c..776db7e88603 100644 --- a/receiver/purefareceiver/go.mod +++ b/receiver/purefareceiver/go.mod @@ -151,7 +151,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250303102058-a9bca17f1a4c // indirect 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/auth v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/receiver/purefareceiver/go.sum b/receiver/purefareceiver/go.sum index 85070aaaab6b..637d72f21e89 100644 --- a/receiver/purefareceiver/go.sum +++ b/receiver/purefareceiver/go.sum @@ -624,8 +624,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/purefbreceiver/go.mod b/receiver/purefbreceiver/go.mod index ecb0d809feb9..cf2d74e71c4c 100644 --- a/receiver/purefbreceiver/go.mod +++ b/receiver/purefbreceiver/go.mod @@ -151,7 +151,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250303102058-a9bca17f1a4c // indirect 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/auth v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/featuregate v1.26.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/receiver/purefbreceiver/go.sum b/receiver/purefbreceiver/go.sum index 85070aaaab6b..637d72f21e89 100644 --- a/receiver/purefbreceiver/go.sum +++ b/receiver/purefbreceiver/go.sum @@ -624,8 +624,6 @@ go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/exporter/xexporter v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:3t5BS0bNgM5z9OurhSUX76+umLJ3RqRV0FmhBWjSmyo= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/splunkenterprisereceiver/client_test.go b/receiver/splunkenterprisereceiver/client_test.go index 981e8d9bb828..245d148e759f 100644 --- a/receiver/splunkenterprisereceiver/client_test.go +++ b/receiver/splunkenterprisereceiver/client_test.go @@ -17,7 +17,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/scraper/scraperhelper" ) @@ -32,6 +32,13 @@ func (m *mockHost) GetExtensions() map[component.ID]component.Component { return m.extensions } +func newAuthClient(t *testing.T, opts ...extensionauth.ClientOption) extensionauth.Client { + t.Helper() + client, err := extensionauth.NewClient(opts...) + require.NoError(t, err) + return client +} + func TestClientCreation(t *testing.T) { cfg := &Config{ IdxEndpoint: confighttp.ClientConfig{ @@ -47,7 +54,7 @@ func TestClientCreation(t *testing.T) { host := &mockHost{ extensions: map[component.ID]component.Component{ - component.MustNewIDWithName("basicauth", "client"): auth.NewClient(), + component.MustNewIDWithName("basicauth", "client"): newAuthClient(t), }, } // create a client from an example config @@ -76,7 +83,7 @@ func TestClientCreateRequest(t *testing.T) { host := &mockHost{ extensions: map[component.ID]component.Component{ - component.MustNewIDWithName("basicauth", "client"): auth.NewClient(), + component.MustNewIDWithName("basicauth", "client"): newAuthClient(t), }, } // create a client from an example config @@ -157,7 +164,7 @@ func TestAPIRequestCreate(t *testing.T) { host := &mockHost{ extensions: map[component.ID]component.Component{ - component.MustNewIDWithName("basicauth", "client"): auth.NewClient(), + component.MustNewIDWithName("basicauth", "client"): newAuthClient(t), }, } // create a client from an example config diff --git a/receiver/splunkenterprisereceiver/go.mod b/receiver/splunkenterprisereceiver/go.mod index 114554ab9d25..b7759a1c921d 100644 --- a/receiver/splunkenterprisereceiver/go.mod +++ b/receiver/splunkenterprisereceiver/go.mod @@ -15,7 +15,7 @@ require ( go.opentelemetry.io/collector/confmap v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/consumer v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/consumer/consumertest 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/collector/receiver v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/receiver/receivertest v0.120.1-0.20250303102058-a9bca17f1a4c @@ -57,7 +57,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250303102058-a9bca17f1a4c // indirect 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/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pipeline v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/receiver/splunkenterprisereceiver/go.sum b/receiver/splunkenterprisereceiver/go.sum index f871f253e401..59a514ff75bf 100644 --- a/receiver/splunkenterprisereceiver/go.sum +++ b/receiver/splunkenterprisereceiver/go.sum @@ -94,8 +94,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:eOf7RX9CYC7bTZQFg0z2GHdATpQDxI0DP36F9gsvXOQ= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c h1:MSZyfNEEhYhz3ZvXYd/e9LXWsyc9Eq7L7O/hQWfnFBQ= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:tYAxnDfQfuaDctONV7cVsQJiYYNimMuD9J8UXyfGiEQ= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/splunkenterprisereceiver/scraper_test.go b/receiver/splunkenterprisereceiver/scraper_test.go index 3aa7555eb5d6..607a07c02d85 100644 --- a/receiver/splunkenterprisereceiver/scraper_test.go +++ b/receiver/splunkenterprisereceiver/scraper_test.go @@ -16,7 +16,7 @@ import ( "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/config/configauth" "go.opentelemetry.io/collector/config/confighttp" - "go.opentelemetry.io/collector/extension/auth" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/receiver/receivertest" "go.opentelemetry.io/collector/scraper/scraperhelper" @@ -112,9 +112,11 @@ func TestScraper(t *testing.T) { MetricsBuilderConfig: metricsettings, } + authClient, err := extensionauth.NewClient() + require.NoError(t, err) host := &mockHost{ extensions: map[component.ID]component.Component{ - component.MustNewIDWithName("basicauth", "client"): auth.NewClient(), + component.MustNewIDWithName("basicauth", "client"): authClient, }, } diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index 3a4e00f51a5c..f31dd19893f2 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -14,7 +14,7 @@ require ( go.opentelemetry.io/collector/consumer v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/consumer/consumertest v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/extension 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/filter v0.120.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/pdata v1.26.1-0.20250303102058-a9bca17f1a4c go.opentelemetry.io/collector/receiver v0.120.1-0.20250303102058-a9bca17f1a4c @@ -44,7 +44,6 @@ require ( go.opentelemetry.io/collector/consumer/consumererror v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/consumer/xconsumer 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/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pipeline v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.120.1-0.20250303102058-a9bca17f1a4c // indirect diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index 208fe54b4337..2e5d5e2dabe0 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -78,8 +78,6 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca go.opentelemetry.io/collector/consumer/xconsumer v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:eOf7RX9CYC7bTZQFg0z2GHdATpQDxI0DP36F9gsvXOQ= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c h1:pAc8NWgFS7a+kV4vq8oMZvEE515+pR+2rwk7Q88g47k= go.opentelemetry.io/collector/extension v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:o2/Kk61I1G9XOdD8W4Tbrg05jD4P/QF0ecxYTcT8OZ8= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c h1:eoNAkO/bTVTcZE+V2Jz/nwOxQnhreGB0ndpwUC2g2jw= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:jiPn968q3ExtWhNu8tFRcLsfhmONrlGZqFRgmaA1FOM= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c h1:oEMkxXiYhYgMixie9HX8wrNrHSm0ltrjkt/bNGpqouY= go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c/go.mod h1:LGgYWKt7fuTR8iHbioI6huT1EiC04I8hbZCz/ODDrkw= go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c h1:iD7x/vLxAIMaJjtd7C3ja3g9f63hDZxE7386S4fKN4Y= diff --git a/receiver/sshcheckreceiver/internal/configssh/configssh_test.go b/receiver/sshcheckreceiver/internal/configssh/configssh_test.go index 07c7e5c9f4ba..acf49a89dd97 100644 --- a/receiver/sshcheckreceiver/internal/configssh/configssh_test.go +++ b/receiver/sshcheckreceiver/internal/configssh/configssh_test.go @@ -12,7 +12,7 @@ import ( "go.opentelemetry.io/collector/component" "go.opentelemetry.io/collector/component/componenttest" "go.opentelemetry.io/collector/extension" - "go.opentelemetry.io/collector/extension/auth/authtest" + "go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest" "golang.org/x/crypto/ssh" ) @@ -24,7 +24,7 @@ type mockHost struct { func TestAllSSHClientSettings(t *testing.T) { host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &authtest.MockClient{}, + component.MustNewID("testauth"): &extensionauthtest.MockClient{}, }, } @@ -127,7 +127,7 @@ func TestAllSSHClientSettings(t *testing.T) { func Test_Client_Dial(t *testing.T) { host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &authtest.MockClient{}, + component.MustNewID("testauth"): &extensionauthtest.MockClient{}, }, } @@ -201,7 +201,7 @@ func Test_Client_Dial(t *testing.T) { func Test_Client_ToSFTPClient(t *testing.T) { host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &authtest.MockClient{}, + component.MustNewID("testauth"): &extensionauthtest.MockClient{}, }, } diff --git a/testbed/go.mod b/testbed/go.mod index 82907969f845..62ec81b7de00 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -291,7 +291,7 @@ require ( go.opentelemetry.io/collector/pdata/pprofile v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pdata/testdata v0.120.1-0.20250303102058-a9bca17f1a4c // indirect go.opentelemetry.io/collector/pipeline/xpipeline 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 diff --git a/testbed/go.sum b/testbed/go.sum index 687bb6d5c331..22ded0487ed4 100644 --- a/testbed/go.sum +++ b/testbed/go.sum @@ -866,8 +866,8 @@ go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058 go.opentelemetry.io/collector/processor/batchprocessor v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:bX6SnsYFDltfkvQbUHszJpH0RSHk4Jdn3oM25Vdn93E= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c h1:U9SmCvcw5aZ2gcToBDp5TRUfjWoSBA/TWVRS4NY/ra8= go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:9fv8vE49dKryMTY1mSY/81Z4xuSwxG0X1F/y4KLguPQ= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.0 h1:yO9QPJoYrHM62M1nUZRaAltvTZFQIYpl2V1EfBtOp3E= -go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.0/go.mod h1:ALMYNJNnGvGEiHrbLHzg4xV3Cjs2Y/V2C2capETsRmY= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.1-0.20250303102058-a9bca17f1a4c h1:Wbxg05L3eTQ2BqOv+TDNlzcfjqnRn3ZYEZm8naYV7/k= +go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:ALMYNJNnGvGEiHrbLHzg4xV3Cjs2Y/V2C2capETsRmY= go.opentelemetry.io/collector/processor/processortest v0.120.1-0.20250303102058-a9bca17f1a4c h1:75SdzhTJFITSB2vllCyTF8x8t6LwJeFie3+0iJ1cfPE= go.opentelemetry.io/collector/processor/processortest v0.120.1-0.20250303102058-a9bca17f1a4c/go.mod h1:me+IVxPsj4IgK99I0pgKLX34XnJtcLwqtgTuVLhhYDI= go.opentelemetry.io/collector/processor/xprocessor v0.120.1-0.20250303102058-a9bca17f1a4c h1:OD/xdUsWuQD+DIWC9tS7XOSg0FK8ogtbswMuxcfuAyE=