Skip to content

[chore] adding test var for convenience #10930

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 20, 2024
Merged

[chore] adding test var for convenience #10930

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions config/confighttp/confighttp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ var (
mockID = component.MustNewID("mock")
dummyID = component.MustNewID("dummy")
nonExistingID = component.MustNewID("nonexisting")
// Omit TracerProvider and MeterProvider in TelemetrySettings as otelhttp.Transport cannot be introspected
nilProvidersSettings = component.TelemetrySettings{Logger: zap.NewNop(), MetricsLevel: configtelemetry.LevelNone}
)

func TestAllHTTPClientSettings(t *testing.T) {
Expand Down Expand Up @@ -438,7 +440,7 @@ func TestHTTPClientSettingWithAuthConfig(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
// Omit TracerProvider and MeterProvider in TelemetrySettings as otelhttp.Transport cannot be introspected
client, err := test.settings.ToClient(context.Background(), test.host, component.TelemetrySettings{Logger: zap.NewNop(), MetricsLevel: configtelemetry.LevelNone})
client, err := test.settings.ToClient(context.Background(), test.host, nilProvidersSettings)
if test.shouldErr {
assert.Error(t, err)
return
Expand Down Expand Up @@ -721,7 +723,7 @@ func TestHttpReception(t *testing.T) {
TLSSetting: *tt.tlsClientCreds,
}

client, errClient := hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{})
client, errClient := hcs.ToClient(context.Background(), componenttest.NewNopHost(), nilProvidersSettings)
require.NoError(t, errClient)

if tt.forceHTTP1 {
Expand Down Expand Up @@ -1523,13 +1525,13 @@ func BenchmarkHttpRequest(b *testing.B) {
b.Run(bb.name, func(b *testing.B) {
var c *http.Client
if !bb.clientPerThread {
c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{})
c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), nilProvidersSettings)
require.NoError(b, err)

}
b.RunParallel(func(pb *testing.PB) {
if c == nil {
c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), component.TelemetrySettings{})
c, err = hcs.ToClient(context.Background(), componenttest.NewNopHost(), nilProvidersSettings)
require.NoError(b, err)
}
if bb.forceHTTP1 {
Expand Down