Skip to content

Commit 6ff606f

Browse files
committed
add one more test
Signed-off-by: alex boten <[email protected]>
1 parent 495b51a commit 6ff606f

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

otelconf/log.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
)
2424

2525
func loggerProvider(cfg configOptions, res *resource.Resource) (log.LoggerProvider, shutdownFunc, error) {
26-
provider, ok := cfg.opentelemetryConfig.LoggerProvider.(*LoggerProviderJson)
27-
if provider == nil {
26+
if cfg.opentelemetryConfig.LoggerProvider == nil {
2827
return noop.NewLoggerProvider(), noopShutdown, nil
2928
}
29+
provider, ok := cfg.opentelemetryConfig.LoggerProvider.(*LoggerProviderJson)
3030
if !ok {
3131
return noop.NewLoggerProvider(), noopShutdown, newErrInvalid("logger_provider")
3232
}

otelconf/log_test.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,18 @@ func TestLoggerProvider(t *testing.T) {
4646
name: "no-logger-provider-configured",
4747
wantProvider: noop.NewLoggerProvider(),
4848
},
49+
{
50+
name: "invalid-provider",
51+
cfg: configOptions{
52+
opentelemetryConfig: OpenTelemetryConfiguration{
53+
LoggerProvider: &MeterProviderJson{
54+
Readers: []MetricReader{},
55+
},
56+
},
57+
},
58+
wantProvider: noop.NewLoggerProvider(),
59+
wantErr: newErrInvalid("logger_provider"),
60+
},
4961
{
5062
name: "error-in-config",
5163
cfg: configOptions{
@@ -65,10 +77,12 @@ func TestLoggerProvider(t *testing.T) {
6577
},
6678
}
6779
for _, tt := range tests {
68-
mp, shutdown, err := loggerProvider(tt.cfg, resource.Default())
69-
require.Equal(t, tt.wantProvider, mp)
70-
assert.ErrorIs(t, err, tt.wantErr)
71-
require.NoError(t, shutdown(t.Context()))
80+
t.Run(tt.name, func(t *testing.T) {
81+
mp, shutdown, err := loggerProvider(tt.cfg, resource.Default())
82+
require.Equal(t, tt.wantProvider, mp)
83+
assert.ErrorIs(t, err, tt.wantErr)
84+
require.NoError(t, shutdown(t.Context()))
85+
})
7286
}
7387
}
7488

0 commit comments

Comments
 (0)