ntp/common
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Fatalf to standard logger-ish

Browse Source
This commit is contained in:
Ask Bjørn Hansen 2024-10-12 11:11:50 -07:00
parent d6a77f4003
commit 4367ef9c29
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logger/stdlog.go
View File

@ -34,3 +34,8 @@ func (l stdLoggerish) Println(msg ...interface{}) {
func (l stdLoggerish) Printf(msg string, args ...interface{}) { func (l stdLoggerish) Printf(msg string, args ...interface{}) {
l.f(l.key, "msg", fmt.Sprintf(msg, args...)) l.f(l.key, "msg", fmt.Sprintf(msg, args...))
} }
func (l stdLoggerish) Fatalf(msg string, args ...interface{}) {
l.log.Error(l.key, "msg", fmt.Sprintf(msg, args...))
panic("fatal error") // todo: does this make sense at all?
}

5
tracing/tracing.go
View File

@ -64,7 +64,6 @@ type TracerConfig struct {
} }
func InitTracer(ctx context.Context, cfg *TracerConfig) (TpShutdownFunc, error) { func InitTracer(ctx context.Context, cfg *TracerConfig) (TpShutdownFunc, error) {
// todo: setup environment from cfg
return SetupSDK(ctx, cfg) return SetupSDK(ctx, cfg)
} }
@ -72,6 +71,8 @@ func SetupSDK(ctx context.Context, cfg *TracerConfig) (shutdown TpShutdownFunc,
log := logger.Setup() log := logger.Setup()
log.Warn("SetupSDK")
if serviceName := os.Getenv(svcNameKey); len(serviceName) == 0 { if serviceName := os.Getenv(svcNameKey); len(serviceName) == 0 {
if len(cfg.ServiceName) > 0 { if len(cfg.ServiceName) > 0 {
os.Setenv(svcNameKey, cfg.ServiceName) os.Setenv(svcNameKey, cfg.ServiceName)
@ -199,9 +200,11 @@ func newOLTPExporter(ctx context.Context, cfg *TracerConfig) (otelsdktrace.SpanE
opts = append(opts, otlptracegrpc.WithTLSCredentials(credentials.NewTLS(tlsConfig))) opts = append(opts, otlptracegrpc.WithTLSCredentials(credentials.NewTLS(tlsConfig)))
} }
if len(cfg.Endpoint) > 0 { if len(cfg.Endpoint) > 0 {
log.Info("adding option", "Endpoint", cfg.Endpoint)
opts = append(opts, otlptracegrpc.WithEndpoint(cfg.Endpoint)) opts = append(opts, otlptracegrpc.WithEndpoint(cfg.Endpoint))
} }
if len(cfg.EndpointURL) > 0 { if len(cfg.EndpointURL) > 0 {
log.Info("adding option", "EndpointURL", cfg.EndpointURL)
opts = append(opts, otlptracegrpc.WithEndpointURL(cfg.EndpointURL)) opts = append(opts, otlptracegrpc.WithEndpointURL(cfg.EndpointURL))
} }