Skip to content

Commit

Permalink
[chore] adding test var for convenience (#10930)
Browse files Browse the repository at this point in the history
This is just splitting a change from #10912 to make it easier to review

Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
  • Loading branch information
codeboten committed Aug 20, 2024
1 parent f1fe602 commit 0190799
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions config/confighttp/confighttp_test.go
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

0 comments on commit 0190799

Please sign in to comment.