Skip to content

Commit ad72c12

Browse files
committed
add tests
Signed-off-by: alex boten <[email protected]>
1 parent e7172fd commit ad72c12

File tree

3 files changed

+48
-3
lines changed

3 files changed

+48
-3
lines changed

otelconf/config_test.go

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,51 @@ func TestNewSDK(t *testing.T) {
394394
wantMeterProvider: metricnoop.NewMeterProvider(),
395395
wantLoggerProvider: lognoop.NewLoggerProvider(),
396396
},
397+
{
398+
name: "invalid resource",
399+
cfg: []ConfigurationOption{
400+
WithContext(t.Context()),
401+
WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{
402+
TracerProvider: &TracerProviderJson{},
403+
MeterProvider: &MeterProviderJson{},
404+
LoggerProvider: &LoggerProviderJson{},
405+
Resource: &LoggerProviderJson{},
406+
}),
407+
},
408+
wantErr: newErrInvalid("resource"),
409+
wantTracerProvider: tracenoop.NewTracerProvider(),
410+
wantMeterProvider: metricnoop.NewMeterProvider(),
411+
wantLoggerProvider: lognoop.NewLoggerProvider(),
412+
},
413+
{
414+
name: "invalid logger provider",
415+
cfg: []ConfigurationOption{
416+
WithContext(t.Context()),
417+
WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{
418+
TracerProvider: &TracerProviderJson{},
419+
MeterProvider: &MeterProviderJson{},
420+
LoggerProvider: &ResourceJson{},
421+
Resource: &ResourceJson{},
422+
}),
423+
},
424+
wantErr: newErrInvalid("logger_provider"),
425+
wantTracerProvider: tracenoop.NewTracerProvider(),
426+
wantMeterProvider: metricnoop.NewMeterProvider(),
427+
wantLoggerProvider: lognoop.NewLoggerProvider(),
428+
},
429+
{
430+
name: "invalid tracer provider",
431+
cfg: []ConfigurationOption{
432+
WithContext(t.Context()),
433+
WithOpenTelemetryConfiguration(OpenTelemetryConfiguration{
434+
TracerProvider: &ResourceJson{},
435+
}),
436+
},
437+
wantErr: newErrInvalid("tracer_provider"),
438+
wantTracerProvider: tracenoop.NewTracerProvider(),
439+
wantMeterProvider: metricnoop.NewMeterProvider(),
440+
wantLoggerProvider: lognoop.NewLoggerProvider(),
441+
},
397442
}
398443
for _, tt := range tests {
399444
sdk, err := NewSDK(tt.cfg...)

otelconf/example_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
"go.opentelemetry.io/otel"
1313
"go.opentelemetry.io/otel/log/global"
1414

15-
otelconf "go.opentelemetry.io/contrib/otelconf/v0.3.0"
15+
"go.opentelemetry.io/contrib/otelconf"
1616
)
1717

1818
func Example() {
19-
b, err := os.ReadFile(filepath.Join("testdata", "v0.3.yaml"))
19+
b, err := os.ReadFile(filepath.Join("testdata", "v1.0.0.yaml"))
2020
if err != nil {
2121
log.Fatal(err)
2222
}

otelconf/trace.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func tracerProvider(cfg configOptions, res *resource.Resource) (trace.TracerProv
3030
}
3131
provider, ok := cfg.opentelemetryConfig.TracerProvider.(*TracerProviderJson)
3232
if !ok {
33-
return noop.NewTracerProvider(), noopShutdown, newErrInvalid("invalid tracer provider")
33+
return noop.NewTracerProvider(), noopShutdown, newErrInvalid("tracer_provider")
3434
}
3535

3636
opts := append(cfg.tracerProviderOptions, sdktrace.WithResource(res))

0 commit comments

Comments
 (0)