22105359978

Committed 17 Feb 2026 03:51PM UTC coverage: 73.777% (-0.4%) from 74.209%

Build # 22105359978

Build Type

Pull #518

github

Committed by

babyTsakhes

Commit Message

test correct with message and return deleted code

Pull Request Pull Request #518: conn: change design of tarantool.Logger

Run Details

185 of 272 new or added lines in 3 files covered. (68.01%)

28 existing lines in 2 files now uncovered.

3123 of 4233 relevant lines covered (73.78%)

9475.75 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

80.43

/logger.go

package tarantool

import (
        "context"
        "log"
        "log/slog"
)

type Logger interface {
        Report(event LogEvent, conn *Connection)
}

type SlogLogger struct {
        logger *slog.Logger
        ctx    context.Context
}

func NewSlogLogger(logger *slog.Logger) SlogLogger {
        if logger == nil {
                logger = slog.Default()
        }
        return SlogLogger{
                logger: logger,
                ctx:    context.Background(),
        }
}

func (l *SlogLogger) WithContext(ctx context.Context) SlogLogger {
        return SlogLogger{
                logger: l.logger,
                ctx:    ctx,
        }
}

func (l SlogLogger) Report(event LogEvent, conn *Connection) {
        attrs := event.LogAttrs()

        if conn != nil {
                keys := make(map[string]bool, len(attrs))
                for _, a := range attrs {
                        keys[a.Key] = true
                }

                if !keys["connection_state"] {
                        attrs = append(attrs, slog.String("connection_state", conn.stateToString()))
                }

                if conn.opts.MaxReconnects > 0 && !keys["max_reconnects"] {
                        attrs = append(attrs, slog.Uint64("max_reconnects", uint64(conn.opts.MaxReconnects)))
                }
                if conn.opts.Reconnect > 0 && !keys["reconnect_interval"] {
                        attrs = append(attrs, slog.String("reconnect_interval", conn.opts.Reconnect.String()))
                }
                if conn.opts.Timeout > 0 && !keys["request_timeout"] {
                        attrs = append(attrs, slog.String("request_timeout", conn.opts.Timeout.String()))
                }
        }

        l.logger.LogAttrs(l.ctx, event.LogLevel(), event.Message(), attrs...)
}

type SimpleLogger struct{}

func (l SimpleLogger) Report(event LogEvent, conn *Connection) {
        attrs := event.LogAttrs()

        log.Printf("[%s] %s [event=%s]", event.LogLevel(), event.Message(), event.EventName())

        for _, attr := range attrs {
                if attr.Key == "error" {
                        log.Printf("  Error: %v", attr.Value.Any())
                } else if attr.Key == "request_id" {
                        log.Printf("  Request ID: %v", attr.Value.Any())
                }
        }
}

1	package tarantool
2
3	import (
4	"context"
5	"log"
6	"log/slog"
7	)
8
9	type Logger interface {
10	Report(event LogEvent, conn *Connection)
11	}
12
13	type SlogLogger struct {
14	logger *slog.Logger
15	ctx context.Context
16	}
17
18	func NewSlogLogger(logger *slog.Logger) SlogLogger {	347✔
19	if logger == nil {	347✔
NEW 20	logger = slog.Default()	×
NEW 21	}	×
22	return SlogLogger{	347✔
23	logger: logger,	347✔
24	ctx: context.Background(),	347✔
25	}	347✔
26	}
27
NEW 28	func (l *SlogLogger) WithContext(ctx context.Context) SlogLogger {	×
NEW 29	return SlogLogger{	×
NEW 30	logger: l.logger,	×
NEW 31	ctx: ctx,	×
NEW 32	}	×
NEW 33	}	×
34
35	func (l SlogLogger) Report(event LogEvent, conn *Connection) {	783✔
36	attrs := event.LogAttrs()	783✔
37		783✔
38	if conn != nil {	1,566✔
39	keys := make(map[string]bool, len(attrs))	783✔
40	for _, a := range attrs {	4,619✔
41	keys[a.Key] = true	3,836✔
42	}	3,836✔
43
44	if !keys["connection_state"] {	1,566✔
45	attrs = append(attrs, slog.String("connection_state", conn.stateToString()))	783✔
46	}	783✔
47
48	if conn.opts.MaxReconnects > 0 && !keys["max_reconnects"] {	1,062✔
49	attrs = append(attrs, slog.Uint64("max_reconnects", uint64(conn.opts.MaxReconnects)))	279✔
50	}	279✔
51	if conn.opts.Reconnect > 0 && !keys["reconnect_interval"] {	1,150✔
52	attrs = append(attrs, slog.String("reconnect_interval", conn.opts.Reconnect.String()))	367✔
53	}	367✔
54	if conn.opts.Timeout > 0 && !keys["request_timeout"] {	1,565✔
55	attrs = append(attrs, slog.String("request_timeout", conn.opts.Timeout.String()))	782✔
56	}	782✔
57	}
58
59	l.logger.LogAttrs(l.ctx, event.LogLevel(), event.Message(), attrs...)	783✔
60	}
61
62	type SimpleLogger struct{}
63
64	func (l SimpleLogger) Report(event LogEvent, conn *Connection) {	4✔
65	attrs := event.LogAttrs()	4✔
66		4✔
67	log.Printf("[%s] %s [event=%s]", event.LogLevel(), event.Message(), event.EventName())	4✔
68		4✔
69	for _, attr := range attrs {	23✔
70	if attr.Key == "error" {	19✔
NEW 71	log.Printf(" Error: %v", attr.Value.Any())	×
72	} else if attr.Key == "request_id" {	21✔
73	log.Printf(" Request ID: %v", attr.Value.Any())	2✔
74	}	2✔
75	}
76	}

tarantool / go-tarantool / 22105359978

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous