From 86ad4a76b73f7853e7841945476f38e081ed8b6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ask=20Bj=C3=B8rn=20Hansen?= Date: Sun, 22 Oct 2023 16:33:54 -0700 Subject: [PATCH] Use logger instance instead of default log/slog --- chdb/db.go | 9 +++++---- chdb/geoqueries.go | 12 ++++++------ ntpdb/zone_stats.go | 6 +++--- server/server.go | 12 ++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/chdb/db.go b/chdb/db.go index 9c6471c..fff08ac 100644 --- a/chdb/db.go +++ b/chdb/db.go @@ -4,11 +4,10 @@ import ( "context" "time" - "log/slog" - "github.com/ClickHouse/clickhouse-go/v2" "github.com/ClickHouse/clickhouse-go/v2/lib/driver" + "go.ntppool.org/common/logger" "go.ntppool.org/common/version" ) @@ -26,6 +25,8 @@ func New(ctx context.Context, dbConfigPath string) (*ClickHouse, error) { func setupClickhouse(ctx context.Context) (driver.Conn, error) { + log := logger.Setup() + conn, err := clickhouse.Open(&clickhouse.Options{ Addr: []string{"10.43.207.123:9000"}, Auth: clickhouse.Auth{ @@ -68,11 +69,11 @@ func setupClickhouse(ctx context.Context) (driver.Conn, error) { if err != nil { return nil, err } - slog.Info("clickhouse connection", "version", v) + log.Info("clickhouse connection", "version", v) err = conn.Ping(ctx) if err != nil { - slog.Error("clickhouse ping", "err", err) + log.Error("clickhouse ping", "err", err) return nil, err } diff --git a/chdb/geoqueries.go b/chdb/geoqueries.go index 7d01914..73f5239 100644 --- a/chdb/geoqueries.go +++ b/chdb/geoqueries.go @@ -5,12 +5,11 @@ package chdb import ( "context" "fmt" - "log" - "log/slog" "sort" "time" "github.com/ClickHouse/clickhouse-go/v2" + "go.ntppool.org/common/logger" "go.ntppool.org/common/tracing" ) @@ -33,13 +32,14 @@ func (s UserCountry) Less(i, j int) bool { } func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error) { + log := logger.Setup() ctx, span := tracing.Tracer().Start(ctx, "UserCountryData") defer span.End() rows, err := d.conn.Query(clickhouse.Context(ctx, clickhouse.WithSpan(span.SpanContext())), "select max(dt) as d,UserCC,Qtype,sum(queries) as queries from by_usercc_1d where dt > now() - INTERVAL 4 DAY group by rollup(Qtype,UserCC) order by UserCC,Qtype;") if err != nil { - slog.Error("query error", "err", err) + log.ErrorContext(ctx, "query error", "err", err) return nil, fmt.Errorf("database error") } @@ -82,7 +82,7 @@ func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error) &Qtype, &queries, ); err != nil { - log.Fatal(err) + return nil, err } // tdt, err := time.Parse(time.RFC3339, dt) @@ -108,7 +108,7 @@ func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error) c = ccs[dt].CC[UserCC] } else { - slog.Info("row", "dt", dt, "usercc", UserCC, "qtype", Qtype, "queries", queries) + log.InfoContext(ctx, "row", "dt", dt, "usercc", UserCC, "qtype", Qtype, "queries", queries) if dt.UTC().Equal(time.Unix(0, 0)) { continue // we skip the overall total @@ -143,7 +143,7 @@ func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error) totalDay, ok := totals[d] if !ok { - slog.Error("no total for day", "date", d) + log.ErrorContext(ctx, "no total for day", "date", d) continue } total4 := float64(totalDay.Count4) diff --git a/ntpdb/zone_stats.go b/ntpdb/zone_stats.go index 35303ee..da6aded 100644 --- a/ntpdb/zone_stats.go +++ b/ntpdb/zone_stats.go @@ -3,8 +3,7 @@ package ntpdb import ( "context" - "log/slog" - + "go.ntppool.org/common/logger" "go.ntppool.org/common/tracing" ) @@ -17,6 +16,7 @@ type ZoneStat struct { } func GetZoneStats(ctx context.Context, q Querier) (*ZoneStats, error) { + log := logger.Setup() ctx, span := tracing.Tracer().Start(ctx, "GetZoneStats") defer span.End() @@ -73,7 +73,7 @@ func GetZoneStats(ctx context.Context, q Querier) (*ZoneStats, error) { data := ZoneStats{} for name, cc := range ccs { - slog.Info("zone stats cc", "name", name) + log.InfoContext(ctx, "zone stats cc", "name", name) cc.PercentTotal.V4 = (100 / total4) * float64(cc.Netspeed4) cc.PercentTotal.V6 = (100 / total6) * float64(cc.Netspeed6) diff --git a/server/server.go b/server/server.go index 02a9165..dfa4b16 100644 --- a/server/server.go +++ b/server/server.go @@ -5,7 +5,6 @@ import ( "database/sql" "errors" "fmt" - "log/slog" "net/http" "golang.org/x/sync/errgroup" @@ -130,22 +129,23 @@ func (srv *Server) Shutdown(ctx context.Context) error { } func (srv *Server) userCountryData(c echo.Context) error { - - ctx := c.Request().Context() + log := logger.Setup() + ctx, span := tracing.Tracer().Start(c.Request().Context(), "userCountryData") + defer span.End() q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db)) zoneStats, err := ntpdb.GetZoneStats(ctx, q) if err != nil { - slog.Error("GetZoneStats", "err", err) + log.ErrorContext(ctx, "GetZoneStats", "err", err) return c.String(http.StatusInternalServerError, err.Error()) } if zoneStats == nil { - slog.Info("didn't get zoneStats") + log.InfoContext(ctx, "didn't get zoneStats") } data, err := srv.ch.UserCountryData(c.Request().Context()) if err != nil { - slog.Error("UserCountryData", "err", err) + log.ErrorContext(ctx, "UserCountryData", "err", err) return c.String(http.StatusInternalServerError, err.Error()) }