diff --git a/exporter/elasticsearchexporter/exporter_test.go b/exporter/elasticsearchexporter/exporter_test.go index 58cbd912c0258..15134706d4076 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/extensionauth/extensionauthtest" + "go.opentelemetry.io/collector/extension/extensionauth" "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/pmetric" @@ -40,6 +40,13 @@ import ( "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter/internal/metadata" ) +func build[T any, O any](t *testing.T, f func(...O) (T, error), opts ...O) T { + t.Helper() + v, err := f(opts...) + require.NoError(t, err) + return v +} + func TestExporterLogs(t *testing.T) { t.Run("publish with success", func(t *testing.T) { rec := newBulkRecorder() @@ -2086,15 +2093,17 @@ func TestExporterAuth(t *testing.T) { }) err := exporter.Start(context.Background(), &mockHost{ extensions: map[component.ID]component.Component{ - testauthID: &extensionauthtest.MockClient{ - ResultRoundTripper: roundTripperFunc(func(*http.Request) (*http.Response, error) { - select { - case done <- struct{}{}: - default: - } - return nil, errors.New("nope") + testauthID: build(t, extensionauth.NewClient, + extensionauth.WithClientRoundTripper(func(http.RoundTripper) (http.RoundTripper, error) { + return roundTripperFunc(func(*http.Request) (*http.Response, error) { + select { + case done <- struct{}{}: + default: + } + return nil, errors.New("nope") + }), nil }), - }, + ), }, }) require.NoError(t, err) @@ -2120,12 +2129,14 @@ func TestExporterBatcher(t *testing.T) { }) err := exporter.Start(context.Background(), &mockHost{ extensions: map[component.ID]component.Component{ - testauthID: &extensionauthtest.MockClient{ - ResultRoundTripper: roundTripperFunc(func(req *http.Request) (*http.Response, error) { - requests = append(requests, req) - return nil, errors.New("nope") + testauthID: build(t, extensionauth.NewClient, + extensionauth.WithClientRoundTripper(func(http.RoundTripper) (http.RoundTripper, error) { + return roundTripperFunc(func(req *http.Request) (*http.Response, error) { + requests = append(requests, req) + return nil, errors.New("nope") + }), nil }), - }, + ), }, }) require.NoError(t, err) diff --git a/exporter/elasticsearchexporter/go.mod b/exporter/elasticsearchexporter/go.mod index 33d38cbdb00f7..81c19c78d63e9 100644 --- a/exporter/elasticsearchexporter/go.mod +++ b/exporter/elasticsearchexporter/go.mod @@ -27,7 +27,7 @@ require ( go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.121.0 go.opentelemetry.io/collector/exporter/exportertest v0.121.0 go.opentelemetry.io/collector/exporter/xexporter v0.121.0 - go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0 + go.opentelemetry.io/collector/extension/extensionauth v0.121.0 go.opentelemetry.io/collector/pdata v1.27.0 go.opentelemetry.io/collector/pdata/pprofile v0.121.0 go.opentelemetry.io/collector/semconv v0.121.0 @@ -84,7 +84,6 @@ require ( go.opentelemetry.io/collector/consumer/consumertest v0.121.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect go.opentelemetry.io/collector/extension v1.27.0 // indirect - go.opentelemetry.io/collector/extension/extensionauth v0.121.0 // indirect go.opentelemetry.io/collector/extension/xextension v0.121.0 // indirect go.opentelemetry.io/collector/featuregate v1.27.0 // indirect go.opentelemetry.io/collector/pipeline v0.121.0 // indirect diff --git a/receiver/sshcheckreceiver/go.mod b/receiver/sshcheckreceiver/go.mod index ac1aa2639aa0f..6328fef6669bf 100644 --- a/receiver/sshcheckreceiver/go.mod +++ b/receiver/sshcheckreceiver/go.mod @@ -14,7 +14,7 @@ require ( go.opentelemetry.io/collector/consumer v1.27.0 go.opentelemetry.io/collector/consumer/consumertest v0.121.0 go.opentelemetry.io/collector/extension v1.27.0 - go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0 + go.opentelemetry.io/collector/extension/extensionauth v0.121.0 go.opentelemetry.io/collector/filter v0.121.0 go.opentelemetry.io/collector/pdata v1.27.0 go.opentelemetry.io/collector/receiver v0.121.0 @@ -43,7 +43,6 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.121.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect - go.opentelemetry.io/collector/extension/extensionauth v0.121.0 // indirect go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect go.opentelemetry.io/collector/pipeline v0.121.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect diff --git a/receiver/sshcheckreceiver/go.sum b/receiver/sshcheckreceiver/go.sum index c5d289100551d..1010c9c2382be 100644 --- a/receiver/sshcheckreceiver/go.sum +++ b/receiver/sshcheckreceiver/go.sum @@ -80,8 +80,6 @@ go.opentelemetry.io/collector/extension v1.27.0 h1:7F+O8/+bcwo3Zk3B/+H8A75cz9dhq go.opentelemetry.io/collector/extension v1.27.0/go.mod h1:Fe0nUGMcr0c6IIBD3QEa3XmdUYpfmm5wCjc3PYho8DM= go.opentelemetry.io/collector/extension/extensionauth v0.121.0 h1:LmPwZI7+OSpE4/ojGqqTU9Onxvn7Nd4JEN+YxBE5BJg= go.opentelemetry.io/collector/extension/extensionauth v0.121.0/go.mod h1:sINEH4b4YPSQJtvc/qcYTQdNRglDoKK0BUJqR+EHn94= -go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0 h1:ghfRACcBN0NaTdLOTa25d+sEOsIgvP5flzqEQcfLBYM= -go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.121.0/go.mod h1:5jAEucvzRjZ4MurcznqdaNh467KeXti0+ldkPLZmw8Y= go.opentelemetry.io/collector/filter v0.121.0 h1:hBu5OuiQbWHTBaQuVJ7pu4UTgFVCI0guFko7DiQtvyc= go.opentelemetry.io/collector/filter v0.121.0/go.mod h1:R/KD4m+wtgFcDC3JpkZXwIxKOr4ItjgTyzMo3Lvh4aI= go.opentelemetry.io/collector/pdata v1.27.0 h1:66yI7FYkUDia74h48Fd2/KG2Vk8DxZnGw54wRXykCEU= diff --git a/receiver/sshcheckreceiver/internal/configssh/configssh_test.go b/receiver/sshcheckreceiver/internal/configssh/configssh_test.go index acf49a89dd97b..4f6791249187b 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/extensionauth/extensionauthtest" + "go.opentelemetry.io/collector/extension/extensionauth" "golang.org/x/crypto/ssh" ) @@ -21,10 +21,16 @@ type mockHost struct { ext map[component.ID]extension.Extension } +func nopClient(t *testing.T) extensionauth.Client { + client, err := extensionauth.NewClient() + assert.NoError(t, err) + return client +} + func TestAllSSHClientSettings(t *testing.T) { host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &extensionauthtest.MockClient{}, + component.MustNewID("testauth"): nopClient(t), }, } @@ -127,7 +133,7 @@ func TestAllSSHClientSettings(t *testing.T) { func Test_Client_Dial(t *testing.T) { host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &extensionauthtest.MockClient{}, + component.MustNewID("testauth"): nopClient(t), }, } @@ -201,7 +207,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"): &extensionauthtest.MockClient{}, + component.MustNewID("testauth"): nopClient(t), }, } diff --git a/receiver/tcpcheckreceiver/go.mod b/receiver/tcpcheckreceiver/go.mod index 9e51194b4749b..6a1a0f57f6e8e 100644 --- a/receiver/tcpcheckreceiver/go.mod +++ b/receiver/tcpcheckreceiver/go.mod @@ -16,7 +16,7 @@ require ( go.opentelemetry.io/collector/consumer v1.27.0 go.opentelemetry.io/collector/consumer/consumertest v0.121.0 go.opentelemetry.io/collector/extension v1.27.0 - go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250224010654-18e18b21da7a + go.opentelemetry.io/collector/extension/extensionauth v0.121.0 go.opentelemetry.io/collector/pdata v1.27.0 go.opentelemetry.io/collector/receiver v0.121.0 go.opentelemetry.io/collector/receiver/receivertest v0.121.0 @@ -48,7 +48,6 @@ require ( go.opentelemetry.io/auto/sdk v1.1.0 // indirect go.opentelemetry.io/collector/consumer/consumererror v0.121.0 // indirect go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect - go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250224010654-18e18b21da7a // indirect go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect go.opentelemetry.io/collector/pipeline v0.121.0 // indirect go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect diff --git a/receiver/tcpcheckreceiver/go.sum b/receiver/tcpcheckreceiver/go.sum index fdf9bd5707f55..f74a18b16854d 100644 --- a/receiver/tcpcheckreceiver/go.sum +++ b/receiver/tcpcheckreceiver/go.sum @@ -72,10 +72,8 @@ go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 h1:/FJ7L6+G++FvktXc/aB go.opentelemetry.io/collector/consumer/xconsumer v0.121.0/go.mod h1:KKy8Qg/vOnyseoi7A9/x1a1oEqSmf0WBHkJFlnQH0Ow= go.opentelemetry.io/collector/extension v1.27.0 h1:7F+O8/+bcwo3Zk3B/+H8A75cz9dhqXUrbeiyiFajoy4= go.opentelemetry.io/collector/extension v1.27.0/go.mod h1:Fe0nUGMcr0c6IIBD3QEa3XmdUYpfmm5wCjc3PYho8DM= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250224010654-18e18b21da7a h1:B78Car//q7OLZhlCybAoWBXezYfBMi+q9a814a22IJw= -go.opentelemetry.io/collector/extension/auth v0.120.1-0.20250224010654-18e18b21da7a/go.mod h1:2DyrUZYNlO3ExAVhflUwvifpxb077Q2aLndcPfkZIzM= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250224010654-18e18b21da7a h1:Dh3hvfYyrfNNUQ+u4mb6Gi4zoGEjYBrT7uqXoxNgfbk= -go.opentelemetry.io/collector/extension/auth/authtest v0.120.1-0.20250224010654-18e18b21da7a/go.mod h1:+rtuoMo4ZEyWcoUfKQAZIT3Sx1syYRJatLMVWzDPZaE= +go.opentelemetry.io/collector/extension/extensionauth v0.121.0 h1:LmPwZI7+OSpE4/ojGqqTU9Onxvn7Nd4JEN+YxBE5BJg= +go.opentelemetry.io/collector/extension/extensionauth v0.121.0/go.mod h1:sINEH4b4YPSQJtvc/qcYTQdNRglDoKK0BUJqR+EHn94= go.opentelemetry.io/collector/pdata v1.27.0 h1:66yI7FYkUDia74h48Fd2/KG2Vk8DxZnGw54wRXykCEU= go.opentelemetry.io/collector/pdata v1.27.0/go.mod h1:18e8/xDZsqyj00h/5HM5GLdJgBzzG9Ei8g9SpNoiMtI= go.opentelemetry.io/collector/pdata/pprofile v0.121.0 h1:DFBelDRsZYxEaSoxSRtseAazsHJfqfC/Yl64uPicl2g= diff --git a/receiver/tcpcheckreceiver/internal/configtcp/configtcp_test.go b/receiver/tcpcheckreceiver/internal/configtcp/configtcp_test.go index 0cee34af31079..452ce78a5d7b2 100644 --- a/receiver/tcpcheckreceiver/internal/configtcp/configtcp_test.go +++ b/receiver/tcpcheckreceiver/internal/configtcp/configtcp_test.go @@ -8,10 +8,11 @@ import ( "time" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "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" ) type mockHost struct { @@ -20,9 +21,11 @@ type mockHost struct { } func TestAllTCPClientSettings(t *testing.T) { + client, err := extensionauth.NewClient() + require.NoError(t, err) host := &mockHost{ ext: map[component.ID]extension.Extension{ - component.MustNewID("testauth"): &authtest.MockClient{}, + component.MustNewID("testauth"): client, }, }