Skip to content

Commit 6b2c133

Browse files
committed
Add missing tests
1 parent 20bd76a commit 6b2c133

2 files changed

Lines changed: 45 additions & 0 deletions

File tree

config/confighttp/keepalive_test.go

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"go.uber.org/zap/zaptest/observer"
1717

1818
"go.opentelemetry.io/collector/component"
19+
"go.opentelemetry.io/collector/component/componenttest"
1920
"go.opentelemetry.io/collector/config/configoptional"
2021
"go.opentelemetry.io/collector/confmap/confmaptest"
2122
)
@@ -278,3 +279,40 @@ func TestServerConfigKeepaliveDisabled(t *testing.T) {
278279

279280
assert.True(t, cfg.Keepalive.IsNone())
280281
}
282+
283+
func TestClientConfigDeprecatedDisableKeepAlives(t *testing.T) {
284+
settings := componenttest.NewNopTelemetrySettings()
285+
settings.MeterProvider = nil
286+
settings.TracerProvider = nil
287+
288+
core, observed := observer.New(zapcore.WarnLevel)
289+
settings.Logger = zap.New(core)
290+
291+
cfg := NewDefaultClientConfig()
292+
cfg.DisableKeepAlives = true
293+
client, err := cfg.ToClient(t.Context(), nil, settings)
294+
require.NoError(t, err)
295+
transport := client.Transport.(*http.Transport)
296+
assert.True(t, transport.DisableKeepAlives)
297+
298+
entries := observed.All()
299+
require.NotEmpty(t, entries)
300+
assert.Contains(t, entries[0].Message, "deprecated")
301+
}
302+
303+
func TestServerConfigDeprecatedKeepAlivesDisabled(t *testing.T) {
304+
core, observed := observer.New(zapcore.WarnLevel)
305+
settings := component.TelemetrySettings{Logger: zap.New(core)}
306+
307+
cfg := NewDefaultServerConfig()
308+
disabled := false
309+
cfg.KeepAlivesEnabled = &disabled
310+
311+
srv, err := cfg.ToServer(t.Context(), nil, settings, http.NewServeMux())
312+
require.NoError(t, err)
313+
require.NotNil(t, srv)
314+
315+
entries := observed.All()
316+
require.NotEmpty(t, entries)
317+
assert.Contains(t, entries[0].Message, "deprecated")
318+
}

config/configoptional/optional_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,13 @@ func TestNone(t *testing.T) {
154154
assert.Equal(t, &zeroVal, ret)
155155
}
156156

157+
func TestIsNone(t *testing.T) {
158+
assert.True(t, None[Sub]().IsNone())
159+
assert.True(t, (Optional[Sub]{}).IsNone()) // zero value is None
160+
assert.False(t, Some(Sub{}).IsNone())
161+
assert.False(t, Default(Sub{}).IsNone())
162+
}
163+
157164
func ExampleNone() {
158165
type Person struct {
159166
Name string

0 commit comments

Comments
 (0)