build: update goreleaser to 2.7.0

(somewhat inefficient, but for now rarely used ...)

.drone.yml

@@ -21,7 +21,8 @@ steps:
         memory: 100MiB
 
   - name: test
-    image: golang:1.21.5
+    image: golang:1.23
+    pull: always
     volumes:
       - name: go
         path: /go
@@ -32,7 +33,8 @@ steps:
       - go build ./...
 
   - name: goreleaser
-    image: golang:1.21.5
+    image: golang:1.23
+    pull: always
     resources:
       requests:
         cpu: 6000
@@ -81,6 +83,6 @@ volumes:
 
 ---
 kind: signature
-hmac: c18ddc535490a0402d8eb78dcdeb66ae54feea7b54eee677180d36128f593c98
+hmac: c3cf7118bd6e9a6310b792f9cb9a3a146416123528cf41d2e5ccb9c23786d02b
 
 ...

.goreleaser.yml

@@ -1,3 +1,5 @@
+version: 2
+
 before:
   # we don't want this in the CI environment
   #hooks:

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.18.5
+FROM alpine:3.21
 
 RUN apk --no-cache upgrade
 RUN apk --no-cache add ca-certificates tzdata zsh jq tmux curl

Makefile

@@ -2,7 +2,7 @@ generate: sqlc
 	go generate ./...
 
 sqlc:
-	@which gowrap  >& /dev/null || (echo "Run 'go install github.com/hexdigest/gowrap/cmd/gowrap@v1.3.2'" && exit 1)
+	@which gowrap  >& /dev/null || (echo "Run 'go install github.com/hexdigest/gowrap/cmd/gowrap@v1.4.1'" && exit 1)
 	@which mockery >& /dev/null || (echo "Run 'go install github.com/vektra/mockery/v2@v2.35.4'" && exit 1)
 	sqlc compile
 	sqlc generate

chdb/chdnsanswers.go

@@ -36,7 +36,7 @@ func (d *ClickHouse) ServerAnswerCounts(ctx context.Context, serverIP string, da
 	ctx, span := tracing.Tracer().Start(ctx, "ServerAnswerCounts")
 	defer span.End()
 
-	conn := d.conn
+	conn := d.Logs
 
 	log := logger.Setup().With("server", serverIP)
 
@@ -100,7 +100,7 @@ func (d *ClickHouse) AnswerTotals(ctx context.Context, qtype string, days int) (
 	defer span.End()
 
 	// queries by UserCC / Qtype for the ServerIP
-	rows, err := d.conn.Query(clickhouse.Context(ctx,
+	rows, err := d.Logs.Query(clickhouse.Context(ctx,
 		clickhouse.WithSpan(span.SpanContext()),
 	), `
 	select UserCC,Qtype,sum(queries) as queries

chdb/db.go

@@ -2,53 +2,97 @@ package chdb
 
 import (
 	"context"
+	"os"
+	"strings"
 	"time"
 
+	"dario.cat/mergo"
 	"github.com/ClickHouse/clickhouse-go/v2"
-	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
+	"gopkg.in/yaml.v3"
 
 	"go.ntppool.org/common/logger"
 	"go.ntppool.org/common/version"
 )
 
+type Config struct {
+	ClickHouse struct {
+		Scores DBConfig `yaml:"scores"`
+		Logs   DBConfig `yaml:"logs"`
+	} `yaml:"clickhouse"`
+}
+
+type DBConfig struct {
+	DSN string
+
+	Host     string
+	Database string
+
+	User     string
+	Password string
+}
+
 type ClickHouse struct {
-	conn clickhouse.Conn
+	Logs   clickhouse.Conn
+	Scores clickhouse.Conn
 }
 
 func New(ctx context.Context, dbConfigPath string) (*ClickHouse, error) {
-	conn, err := setupClickhouse(ctx)
+	ch, err := setupClickhouse(ctx, dbConfigPath)
 	if err != nil {
 		return nil, err
 	}
-	return &ClickHouse{conn: conn}, nil
+	return ch, nil
 }
 
-func setupClickhouse(ctx context.Context) (driver.Conn, error) {
+func setupClickhouse(ctx context.Context, configFile string) (*ClickHouse, error) {
+	log := logger.FromContext(ctx)
 
+	log.DebugContext(ctx, "opening ch config", "file", configFile)
+
+	dbFile, err := os.Open(configFile)
+	if err != nil {
+		return nil, err
+	}
+
+	dec := yaml.NewDecoder(dbFile)
+
+	cfg := Config{}
+
+	err = dec.Decode(&cfg)
+	if err != nil {
+		return nil, err
+	}
+
+	ch := &ClickHouse{}
+
+	ch.Logs, err = open(ctx, cfg.ClickHouse.Logs)
+	if err != nil {
+		return nil, err
+	}
+	ch.Scores, err = open(ctx, cfg.ClickHouse.Scores)
+	if err != nil {
+		return nil, err
+	}
+
+	return ch, nil
+}
+
+func open(ctx context.Context, cfg DBConfig) (clickhouse.Conn, error) {
 	log := logger.Setup()
 
-	conn, err := clickhouse.Open(&clickhouse.Options{
-		Addr: []string{"10.43.207.123:9000"},
-		Auth: clickhouse.Auth{
-			Database: "geodns3",
-			Username: "default",
-			Password: "",
-		},
-		// Debug: true,
-		// Debugf: func(format string, v ...interface{}) {
-		// 	slog.Info("debug format", "format", format)
-		// 	fmt.Printf(format+"\n", v)
-		// },
+	options := &clickhouse.Options{
+		Protocol: clickhouse.Native,
 		Settings: clickhouse.Settings{
 			"max_execution_time": 60,
 		},
+
 		Compression: &clickhouse.Compression{
 			Method: clickhouse.CompressionLZ4,
 		},
 		DialTimeout:          time.Second * 5,
-		MaxOpenConns:         5,
-		MaxIdleConns:         5,
-		ConnMaxLifetime:      time.Duration(10) * time.Minute,
+		MaxOpenConns:         8,
+		MaxIdleConns:         3,
+		ConnMaxLifetime:      5 * time.Minute,
 		ConnOpenStrategy:     clickhouse.ConnOpenInOrder,
 		BlockBufferSize:      10,
 		MaxCompressionBuffer: 10240,
@@ -60,7 +104,49 @@ func setupClickhouse(ctx context.Context) (driver.Conn, error) {
 				{Name: "data-api", Version: version.Version()},
 			},
 		},
-	})
+		// Debug: true,
+		// Debugf: func(format string, v ...interface{}) {
+		// 	slog.Info("debug format", "format", format)
+		// 	fmt.Printf(format+"\n", v)
+		// },
+
+	}
+
+	if cfg.DSN != "" {
+		dsnOptions, err := clickhouse.ParseDSN(cfg.DSN)
+		if err != nil {
+			return nil, err
+		}
+		err = mergo.Merge(options, dsnOptions)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if cfg.Host != "" {
+		options.Addr = []string{cfg.Host}
+	}
+
+	if len(options.Addr) > 0 {
+		// todo: support literal ipv6; or just require port to be configured explicitly
+		if !strings.Contains(options.Addr[0], ":") {
+			options.Addr[0] += ":9000"
+		}
+	}
+
+	if cfg.Database != "" {
+		options.Auth.Database = cfg.Database
+	}
+
+	if cfg.User != "" {
+		options.Auth.Username = cfg.User
+	}
+
+	if cfg.Password != "" {
+		options.Auth.Password = cfg.Password
+	}
+
+	conn, err := clickhouse.Open(options)
 	if err != nil {
 		return nil, err
 	}

chdb/geoqueries.go

@@ -24,9 +24,11 @@ type UserCountry []flatAPI
 func (s UserCountry) Len() int {
 	return len(s)
 }
+
 func (s UserCountry) Swap(i, j int) {
 	s[i], s[j] = s[j], s[i]
 }
+
 func (s UserCountry) Less(i, j int) bool {
 	return s[i].IPv4 > s[j].IPv4
 }
@@ -36,7 +38,7 @@ func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error)
 	ctx, span := tracing.Tracer().Start(ctx, "UserCountryData")
 	defer span.End()
 
-	rows, err := d.conn.Query(clickhouse.Context(ctx, clickhouse.WithSpan(span.SpanContext())),
+	rows, err := d.Logs.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 {
 		log.ErrorContext(ctx, "query error", "err", err)
@@ -183,3 +185,55 @@ func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error)
 
 	return nil, nil
 }
+
+type DNSQueryCounts struct {
+	T   uint32  `json:"t"`
+	Avg float64 `json:"avg"`
+	Max uint64  `json:"max"`
+}
+
+func (d *ClickHouse) DNSQueries(ctx context.Context) ([]DNSQueryCounts, error) {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "DNSQueries")
+	defer span.End()
+
+	startUnix := time.Now().Add(2 * time.Hour * -1).Unix()
+	startUnix -= startUnix % (60 * 5)
+
+	log.InfoContext(ctx, "start time", "start", startUnix)
+
+	rows, err := d.Logs.Query(clickhouse.Context(ctx, clickhouse.WithSpan(span.SpanContext())),
+		`
+	select toUnixTimestamp(toStartOfFiveMinute(t)) as t,
+  sum(q)/300 as avg, max(q) as max
+from (
+ select window as t, sumSimpleState(queries) as q
+ from geodns.by_origin_1s
+ where
+   window > FROM_UNIXTIME(?)
+   and Origin IN ('pool.ntp.org', 'g.ntpns.org')
+ group by t order by t
+)
+group by t order by t
+`, startUnix)
+	if err != nil {
+		log.ErrorContext(ctx, "query error", "err", err)
+		return nil, fmt.Errorf("database error")
+	}
+
+	var t uint32
+	var avg float64
+	var max uint64
+
+	r := []DNSQueryCounts{}
+
+	for rows.Next() {
+		if err := rows.Scan(&t, &avg, &max); err != nil {
+			return nil, err
+		}
+		log.InfoContext(ctx, "data", "t", t, "avg", avg, "max", max)
+		r = append(r, DNSQueryCounts{t, avg, max})
+	}
+
+	return r, nil
+}

chdb/logscores.go

@@ -0,0 +1,107 @@
+package chdb
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	"github.com/ClickHouse/clickhouse-go/v2"
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/ntpdb"
+)
+
+func (d *ClickHouse) Logscores(ctx context.Context, serverID, monitorID int, since time.Time, limit int, fullHistory bool) ([]ntpdb.LogScore, error) {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "CH Logscores")
+	defer span.End()
+
+	recentFirst := true
+
+	if since.IsZero() && !fullHistory {
+		since = time.Now().Add(4 * -24 * time.Hour)
+	} else {
+		recentFirst = false
+	}
+
+	args := []interface{}{serverID}
+	query := `select id,monitor_id,server_id,ts,
+                toFloat64(score),toFloat64(step),offset,
+                rtt,leap,warning,error
+              from log_scores
+              where
+                server_id = ?`
+
+	if monitorID > 0 {
+		query = `select id,monitor_id,server_id,ts,
+                toFloat64(score),toFloat64(step),offset,
+                rtt,leap,warning,error
+              from log_scores
+              where
+                server_id = ?
+                and monitor_id = ?`
+		args = []interface{}{serverID, monitorID}
+	}
+
+	if fullHistory {
+		query += " order by ts"
+		if recentFirst {
+			query += " desc"
+		}
+	} else {
+		query += " and ts > ? order by ts "
+		if recentFirst {
+			query += "desc "
+		}
+		query += "limit ?"
+		args = append(args, since, limit)
+	}
+
+	log.DebugContext(ctx, "clickhouse query", "query", query, "args", args)
+
+	rows, err := d.Scores.Query(
+		clickhouse.Context(
+			ctx, clickhouse.WithSpan(span.SpanContext()),
+		),
+		query, args...,
+	)
+	if err != nil {
+		log.ErrorContext(ctx, "query error", "err", err)
+		return nil, fmt.Errorf("database error")
+	}
+
+	rv := []ntpdb.LogScore{}
+
+	for rows.Next() {
+
+		row := ntpdb.LogScore{}
+
+		var leap uint8
+
+		if err := rows.Scan(
+			&row.ID,
+			&row.MonitorID,
+			&row.ServerID,
+			&row.Ts,
+			&row.Score,
+			&row.Step,
+			&row.Offset,
+			&row.Rtt,
+			&leap,
+			&row.Attributes.Warning,
+			&row.Attributes.Error,
+		); err != nil {
+			log.Error("could not parse row", "err", err)
+			continue
+		}
+
+		row.Attributes.Leap = int8(leap)
+
+		rv = append(rv, row)
+
+	}
+
+	// log.InfoContext(ctx, "returning data", "rv", rv)
+
+	return rv, nil
+}

go.mod

@@ -1,81 +1,100 @@
 module go.ntppool.org/data-api
 
-go 1.21.3
+go 1.23.5
+
+toolchain go1.24.0
 
 // replace github.com/samber/slog-echo => github.com/abh/slog-echo v0.0.0-20231024051244-af740639893e
 
 require (
-	github.com/ClickHouse/clickhouse-go/v2 v2.17.0
-	github.com/go-sql-driver/mysql v1.7.1
-	github.com/hashicorp/go-retryablehttp v0.7.5
-	github.com/labstack/echo/v4 v4.11.4
-	github.com/samber/slog-echo v1.9.1
-	github.com/spf13/cobra v1.8.0
-	github.com/stretchr/testify v1.8.4
-	go.ntppool.org/api v0.1.8-0.20231210025001-f2c143296511
-	go.ntppool.org/common v0.2.6-0.20231211044338-5c7ae6ab8ac9
-	go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.1
-	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
-	go.opentelemetry.io/otel v1.21.0
-	go.opentelemetry.io/otel/trace v1.21.0
-	golang.org/x/sync v0.5.0
+	dario.cat/mergo v1.0.1
+	github.com/ClickHouse/clickhouse-go/v2 v2.32.2
+	github.com/go-sql-driver/mysql v1.9.0
+	github.com/hashicorp/go-retryablehttp v0.7.7
+	github.com/labstack/echo-contrib v0.17.2
+	github.com/labstack/echo/v4 v4.13.3
+	github.com/samber/slog-echo v1.15.1
+	github.com/spf13/cobra v1.9.1
+	github.com/stretchr/testify v1.10.0
+	go.ntppool.org/api v0.3.4
+	go.ntppool.org/common v0.3.2-0.20250126190844-e5836a8b97f6
+	go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.59.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
+	go.opentelemetry.io/otel v1.34.0
+	go.opentelemetry.io/otel/trace v1.34.0
+	golang.org/x/sync v0.11.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/ClickHouse/ch-go v0.61.0 // indirect
-	github.com/andybalholm/brotli v1.0.6 // indirect
+	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/ClickHouse/ch-go v0.65.1 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-faster/city v1.0.1 // indirect
 	github.com/go-faster/errors v0.7.1 // indirect
-	github.com/go-logr/logr v1.4.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.5.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/klauspost/compress v1.17.4 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/labstack/gommon v0.4.2 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
-	github.com/paulmach/orb v0.10.0 // indirect
-	github.com/pierrec/lz4/v4 v4.1.19 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/paulmach/orb v0.11.1 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.17.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
-	github.com/prometheus/common v0.45.0 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/remychantenay/slog-otel v1.2.3 // indirect
-	github.com/samber/lo v1.39.0 // indirect
+	github.com/prometheus/client_golang v1.21.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/remychantenay/slog-otel v1.3.3 // indirect
+	github.com/samber/lo v1.49.1 // indirect
+	github.com/samber/slog-multi v1.4.0 // indirect
 	github.com/segmentio/asm v1.2.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.5.1 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasttemplate v1.2.2 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
-	go.opentelemetry.io/otel/metric v1.21.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/bridges/otelslog v0.9.0 // indirect
+	go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 // indirect
+	go.opentelemetry.io/contrib/exporters/autoexport v0.59.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/prometheus v0.56.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/log v0.10.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/log v0.10.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	golang.org/x/crypto v0.34.0 // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/net v0.35.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
+	golang.org/x/time v0.10.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 // indirect
+	google.golang.org/grpc v1.70.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
 )

go.sum

@@ -1,68 +1,64 @@
-github.com/ClickHouse/ch-go v0.61.0 h1:22JYeFJoFNAU/Vod4etAeUEY28cYt7Ixnwqj1+EUfro=
-github.com/ClickHouse/ch-go v0.61.0/go.mod h1:POJBl0MxEMS91Zd0uTgDDt05KfXEjf5KIwW6lNhje9Y=
-github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0=
-github.com/ClickHouse/clickhouse-go/v2 v2.16.0 h1:rhMfnPewXPnY4Q4lQRGdYuTLRBRKJEIEYHtbUMrzmvI=
-github.com/ClickHouse/clickhouse-go/v2 v2.16.0/go.mod h1:J7SPfIxwR+x4mQ+o8MLSe0oY50NNntEqCIjFe/T1VPM=
-github.com/ClickHouse/clickhouse-go/v2 v2.17.0 h1:xvsVYxOWb2obaIwL9NJZSZ3T/umJSh9P1gf1dfMFlI8=
-github.com/ClickHouse/clickhouse-go/v2 v2.17.0/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ=
-github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
-github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
+github.com/ClickHouse/ch-go v0.65.1 h1:SLuxmLl5Mjj44/XbINsK2HFvzqup0s6rwKLFH347ZhU=
+github.com/ClickHouse/ch-go v0.65.1/go.mod h1:bsodgURwmrkvkBe5jw1qnGDgyITsYErfONKAHn05nv4=
+github.com/ClickHouse/clickhouse-go/v2 v2.32.2 h1:Y8fAXt0CpLhqNXMLlSddg+cMfAr7zHBWqXLpih6ozCY=
+github.com/ClickHouse/clickhouse-go/v2 v2.32.2/go.mod h1:/vE8N/+9pozLkIiTMWbNUGviccDv/czEGS1KACvpXIk=
+github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
+github.com/andybalholm/brotli v1.1.1/go.mod h1:05ib4cKhjx3OQYUY22hTVd34Bc8upXjOLL2rKwwZBoA=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
-github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
+github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw=
 github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw=
-github.com/go-faster/errors v0.7.0 h1:UnD/xusnfUgtEYkgRZohqL2AfmPTwv13NAJwwFFaNYc=
-github.com/go-faster/errors v0.7.0/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
 github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
 github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
-github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/logr v1.4.0 h1:wx+BduGRXjIL6VPeeb7DRX+ii7sR/ch8DlRifHR589o=
-github.com/go-logr/logr v1.4.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
+github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
-github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 h1:6UKoz5ujsI55KNpsJH3UwCq3T8kKbZwNZBNPuTTje8U=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1/go.mod h1:YvJ2f6MplWDhfxiUC3KpyTy76kYUZA4W3pTv/wdKQ9Y=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1 h1:e9Rjr40Z98/clHv5Yg79Is0NtosR5LXRvdr7o/6NwbA=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.1/go.mod h1:tIxuGz/9mpox++sgp9fJjHO0+q1X9/UOWd798aAm22M=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-retryablehttp v0.7.5 h1:bJj+Pj19UZMIweq/iie+1u5YCdGrnxCT9yvm0e+Nd5M=
-github.com/hashicorp/go-retryablehttp v0.7.5/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
+github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
+github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
+github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
-github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -70,73 +66,63 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.11.3 h1:Upyu3olaqSHkCjs1EJJwQ3WId8b8b1hxbogyommKktM=
-github.com/labstack/echo/v4 v4.11.3/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
-github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8=
-github.com/labstack/echo/v4 v4.11.4/go.mod h1:noh7EvLwqDsmh/X/HWKPUl1AjzJrhyptRyEbQJfxen8=
-github.com/labstack/gommon v0.4.1 h1:gqEff0p/hTENGMABzezPoPSRtIh1Cvw0ueMOe0/dfOk=
-github.com/labstack/gommon v0.4.1/go.mod h1:TyTrpPqxR5KMk8LKVtLmfMjeQ5FEkBYdxLYPw/WfrOM=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/labstack/echo-contrib v0.17.2 h1:K1zivqmtcC70X9VdBFdLomjPDEVHlrcAObqmuFj1c6w=
+github.com/labstack/echo-contrib v0.17.2/go.mod h1:NeDh3PX7j/u+jR4iuDt1zHmWZSCz9c/p9mxXcDpyS8E=
+github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY=
+github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g=
 github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
 github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg=
-github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k=
 github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
-github.com/paulmach/orb v0.10.0 h1:guVYVqzxHE/CQ1KpfGO077TR0ATHSNjp4s6XGLn3W9s=
-github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/paulmach/orb v0.11.1 h1:3koVegMC4X/WeiXYz9iswopaTwMem53NzTJuTF20JzU=
+github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/EnuLaLU=
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
-github.com/pierrec/lz4/v4 v4.1.18 h1:xaKrnTkyoqfh1YItXl56+6KJNVYWlEEPuAQW9xsplYQ=
-github.com/pierrec/lz4/v4 v4.1.18/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pierrec/lz4/v4 v4.1.19 h1:tYLzDnjDXh9qIxSTKHwXwOYmm9d887Y7Y1ZkyXYHAN4=
-github.com/pierrec/lz4/v4 v4.1.19/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
+github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU=
+github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
-github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM=
-github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/remychantenay/slog-otel v1.2.3 h1:uJKRE7vhBEZmJcNyPl2HEI789D8BlgN+ppoEr+UogjY=
-github.com/remychantenay/slog-otel v1.2.3/go.mod h1:Ar2ZBcRfIPyoKV/3Xq4oHmNgKc69juGB0QMUzo1vJOc=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
-github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
+github.com/prometheus/client_golang v1.21.0 h1:DIsaGmiaBkSangBgMtWdNfxbMNdku5IK6iNhrEqWvdA=
+github.com/prometheus/client_golang v1.21.0/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/remychantenay/slog-otel v1.3.3 h1:Atk1p630QPgYFW4/YEyBuObNmwrYpx5Tglnl1sdhSVA=
+github.com/remychantenay/slog-otel v1.3.3/go.mod h1:OMdQAB/S2341nbz2Ramh3+RH2yYGLJLspTaghiCToTU=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
-github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/samber/slog-echo v1.9.0 h1:1Cvn2/JXAM2ki26uBMbbk0jB9UxZgaE9xM1DVZvLAlo=
-github.com/samber/slog-echo v1.9.0/go.mod h1:0ab2AwcciQXNAXEcjkHwD9okOh9vEHEYn8xP97ocuhM=
-github.com/samber/slog-echo v1.9.1 h1:QEzOuZtZiXe0/60bmfcVZdwYzq1T6SCBC4RiMfg9Riw=
-github.com/samber/slog-echo v1.9.1/go.mod h1:/f78pHjVxGrIlHlS5fzWiW+BxkWltQ+SWKk8LKMjAMQ=
+github.com/samber/lo v1.49.1 h1:4BIFyVfuQSEpluc7Fua+j1NolZHiEHEpaSEKdsH0tew=
+github.com/samber/lo v1.49.1/go.mod h1:dO6KHFzUKXgP8LDhU0oI8d2hekjXnGOu0DB8Jecxd6o=
+github.com/samber/slog-echo v1.15.1 h1:mzeQNPYPxmpehIRtgQJRgJMVvrRbZHp5D2maxSljTBw=
+github.com/samber/slog-echo v1.15.1/go.mod h1:K21nbusPmai/MYm8PFactmZoFctkMmkeaTdXXyvhY1c=
+github.com/samber/slog-multi v1.4.0 h1:pwlPMIE7PrbTHQyKWDU+RIoxP1+HKTNOujk3/kdkbdg=
+github.com/samber/slog-multi v1.4.0/go.mod h1:FsQ4Uv2L+E/8TZt+/BVgYZ1LoDWCbfCU21wVIoMMrO8=
 github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
 github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
+github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
-github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
@@ -145,93 +131,113 @@ github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=
+github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
+github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g=
-go.ntppool.org/api v0.1.7/go.mod h1:PFWNS+pjJx+gnRphEZiyTCr1XnISZrn6ZBXv1C8Eqa4=
-go.ntppool.org/api v0.1.8-0.20231209235224-e3d38c8b1c15 h1:xzvsIUwRajlVQsRRrXjklhj63fsw2B83LZ3gbfhGFsk=
-go.ntppool.org/api v0.1.8-0.20231209235224-e3d38c8b1c15/go.mod h1:9FKbwWfF7eRU7GZVEI3wUYv71ZKt16cLCGfxLayzS2Q=
-go.ntppool.org/api v0.1.8-0.20231210025001-f2c143296511 h1:ilTOX5NQcdDiNohhDexUevUrhDFDOrlB7uCM0ilQsLs=
-go.ntppool.org/api v0.1.8-0.20231210025001-f2c143296511/go.mod h1:9FKbwWfF7eRU7GZVEI3wUYv71ZKt16cLCGfxLayzS2Q=
-go.ntppool.org/common v0.2.5 h1:fvuFrCCbmaRzZOSwv71+yhqVLOTDB/fD7YlscdGa6qs=
-go.ntppool.org/common v0.2.5/go.mod h1:Cw8mq8jd2sLCxbTNzYXKXn3qKo2ZLERZ6V/eLcSgDHw=
-go.ntppool.org/common v0.2.6-0.20231211031613-608f05d39551 h1:kJdF3U4KBuJJtbF04d5OA/QttxDY/fOgHe1oUDEgLGA=
-go.ntppool.org/common v0.2.6-0.20231211031613-608f05d39551/go.mod h1:Cw8mq8jd2sLCxbTNzYXKXn3qKo2ZLERZ6V/eLcSgDHw=
-go.ntppool.org/common v0.2.6-0.20231211044338-5c7ae6ab8ac9 h1:5NHaULU9+qu6hA/teqYSfPag4Mkozt0baIb3DP9Hcng=
-go.ntppool.org/common v0.2.6-0.20231211044338-5c7ae6ab8ac9/go.mod h1:Cw8mq8jd2sLCxbTNzYXKXn3qKo2ZLERZ6V/eLcSgDHw=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.1 h1:yJWyqeE+8jdOJpt+ZFn7sX05EJAK/9C4jjNZyb61xZg=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.1/go.mod h1:tlgpIvi6LCv4QIZQyBc8Gkr6HDxbJLTh9eQPNZAaljE=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 h1:gbhw/u49SS3gkPWiYweQNJGm/uJN5GkI/FrosxSHT7A=
-go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1/go.mod h1:GnOaBaFQ2we3b9AGWJpsBa7v1S5RlQzlC3O7dRMxZhM=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
-go.opentelemetry.io/contrib/propagators/b3 v1.21.1 h1:WPYiUgmw3+b7b3sQ1bFBFAf0q+Di9dvNc3AtYfnT4RQ=
-go.opentelemetry.io/contrib/propagators/b3 v1.21.1/go.mod h1:EmzokPoSqsYMBVK4nRnhsfm5mbn8J1eDuz/U1UaQaWg=
-go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
-go.opentelemetry.io/otel v1.21.0/go.mod h1:QZzNPQPm1zLX4gZK4cMi+71eaorMSGT3A4znnUvNNEo=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 h1:cl5P5/GIfFh4t6xyruOgJP5QiA1pw4fYYdv6nc6CBWw=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0/go.mod h1:zgBdWWAu7oEEMC06MMKc5NLbA/1YDXV1sMpSqEeLQLg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I=
-go.opentelemetry.io/otel/metric v1.21.0 h1:tlYWfeo+Bocx5kLEloTjbcDwBuELRrIFxwdQ36PlJu4=
-go.opentelemetry.io/otel/metric v1.21.0/go.mod h1:o1p3CA8nNHW8j5yuQLdc1eeqEaPfzug24uvsyIEJRWM=
-go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8=
-go.opentelemetry.io/otel/sdk v1.21.0/go.mod h1:Nna6Yv7PWTdgJHVRD9hIYywQBRx7pbox6nwBnZIxl/E=
-go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
-go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
-go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
-go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
+go.ntppool.org/api v0.3.4 h1:KeRyFhIRkjJwZif7hkpqEDEBmukyYGiOi2Fd6j3UzQ0=
+go.ntppool.org/api v0.3.4/go.mod h1:LFLAwnrc/JyjzKnjgf8tCOJhps6oFIjuledS3PCx7xc=
+go.ntppool.org/common v0.3.2-0.20250126190844-e5836a8b97f6 h1:Lef+V8gAGHMYj/oc91A384d7wzIVPk6k3VNbNlRsSEc=
+go.ntppool.org/common v0.3.2-0.20250126190844-e5836a8b97f6/go.mod h1:8ILmR3KxpUSNofcw9EBG42HNf81Z9iu9Fg1Cj0f/WP0=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/bridges/otelslog v0.9.0 h1:N+78eXSlu09kii5nkiM+01YbtWe01oZLPPLhNlEKhus=
+go.opentelemetry.io/contrib/bridges/otelslog v0.9.0/go.mod h1:/2KhfLAhtQpgnhIk1f+dftA3fuuMcZjiz//Dc9yfaEs=
+go.opentelemetry.io/contrib/bridges/prometheus v0.59.0 h1:HY2hJ7yn3KuEBBBsKxvF3ViSmzLwsgeNvD+0utRMgzc=
+go.opentelemetry.io/contrib/bridges/prometheus v0.59.0/go.mod h1:H4H7vs8766kwFnOZVEGMJFVF+phpBSmTckvvNRdJeDI=
+go.opentelemetry.io/contrib/exporters/autoexport v0.59.0 h1:dKhAFwh7SSoOw+gwMtSv+XLkUGTFAwAGMT3X3XSE4FA=
+go.opentelemetry.io/contrib/exporters/autoexport v0.59.0/go.mod h1:fPl+qlrhRdRntIpPs9JoQ0iBKAsnH5VkgppU1f9kyF4=
+go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.59.0 h1:I8k9HW4yl8SRYNmECKKtjhcOvq9lAP9riqYPixBU3qw=
+go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.59.0/go.mod h1:/vTiuiSKBQAerQeMB3CsVJbXd+cvTbhcdOk5AV5Z5R0=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0 h1:iQZYNQ7WwIcYXzOPR46FQv9O0dS1PW16RjvR0TjDOe8=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.59.0/go.mod h1:54CaSNqYEXvpzDh8KPjiMVoWm60t5R0dZRt0leEPgAs=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/contrib/propagators/b3 v1.34.0 h1:9pQdCEvV/6RWQmag94D6rhU+A4rzUhYBEJ8bpscx5p8=
+go.opentelemetry.io/contrib/propagators/b3 v1.34.0/go.mod h1:FwM71WS8i1/mAK4n48t0KU6qUS/OZRBgDrHZv3RlJ+w=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0 h1:5dTKu4I5Dn4P2hxyW3l3jTaZx9ACgg0ECos1eAVrheY=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.10.0/go.mod h1:P5HcUI8obLrCCmM3sbVBohZFH34iszk/+CPWuakZWL8=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0 h1:q/heq5Zh8xV1+7GoMGJpTxM2Lhq5+bFxB29tshuRuw0=
+go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.10.0/go.mod h1:leO2CSTg0Y+LyvmR7Wm4pUxE8KAmaM2GCVx7O+RATLA=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0 h1:ajl4QczuJVA2TU9W9AGw++86Xga/RKt//16z/yxPgdk=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.34.0/go.mod h1:Vn3/rlOJ3ntf/Q3zAI0V5lDnTbHGaUsNUeF6nZmm7pA=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0 h1:opwv08VbCZ8iecIWs+McMdHRcAXzjAeda3uG2kI/hcA=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.34.0/go.mod h1:oOP3ABpW7vFHulLpE8aYtNBodrHhMTrvfxUXGvqm7Ac=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 h1:tgJ0uaNS4c98WRNUEx5U3aDlrDOI5Rs+1Vifcw4DJ8U=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0/go.mod h1:U7HYyW0zt/a9x5J1Kjs+r1f/d4ZHnYFclhYY2+YbeoE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0/go.mod h1:9cKLGBDzI/F3NoHLQGm4ZrYdIHsvGt6ej6hUowxY0J4=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0 h1:GnCIi0QyG0yy2MrJLzVrIM7laaJstj//flf1zEJCG+E=
+go.opentelemetry.io/otel/exporters/prometheus v0.56.0/go.mod h1:JQcVZtbIIPM+7SWBB+T6FK+xunlyidwLp++fN0sUaOk=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0 h1:GKCEAZLEpEf78cUvudQdTg0aET2ObOZRB2HtXA0qPAI=
+go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.10.0/go.mod h1:9/zqSWLCmHT/9Jo6fYeUDRRogOLL60ABLsHWS99lF8s=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0 h1:czJDQwFrMbOr9Kk+BPo1y8WZIIFIK58SA1kykuVeiOU=
+go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.34.0/go.mod h1:lT7bmsxOe58Tq+JIOkTQMCGXdu47oA+VJKLZHbaBKbs=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0 h1:jBpDk4HAUsrnVO1FsfCfCOTEc/MkInJmvfCHYLFiT80=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.34.0/go.mod h1:H9LUIM1daaeZaz91vZcfeM0fejXPmgCYE8ZhzqfJuiU=
+go.opentelemetry.io/otel/log v0.10.0 h1:1CXmspaRITvFcjA4kyVszuG4HjA61fPDxMb7q3BuyF0=
+go.opentelemetry.io/otel/log v0.10.0/go.mod h1:PbVdm9bXKku/gL0oFfUF4wwsQsOPlpo4VEqjvxih+FM=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/log v0.10.0 h1:lR4teQGWfeDVGoute6l0Ou+RpFqQ9vaPdrNJlST0bvw=
+go.opentelemetry.io/otel/sdk/log v0.10.0/go.mod h1:A+V1UTWREhWAittaQEG4bYm4gAZa6xnvVu+xKrIRkzo=
+go.opentelemetry.io/otel/sdk/metric v1.34.0 h1:5CeK9ujjbFVL5c1PhLuStg1wxA7vQv7ce1EK0Gyvahk=
+go.opentelemetry.io/otel/sdk/metric v1.34.0/go.mod h1:jQ/r8Ze28zRKoNRdkjCZxfs6YvBTG1+YIqyFVFYec5w=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
-golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
-golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4=
-golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
-golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 h1:+iq7lrkxmFNBM7xx+Rae2W6uyPfhPeDWD+n+JgppptE=
-golang.org/x/exp v0.0.0-20231219180239-dc181d75b848/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
+golang.org/x/crypto v0.34.0 h1:+/C6tk6rf/+t5DhUketUbD1aNGqiSX3j15Z6xuIDlBA=
+golang.org/x/crypto v0.34.0/go.mod h1:dy7dXNW32cAb/6/PRuTNsix8T+vJAqvuIy5Bli/x0YQ=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
-golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
+golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -240,27 +246,16 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
-google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
-google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4/go.mod h1:k2dtGpRrbsSyKcNPKKI5sstZkrNCZwpU/ns96JoHbGg=
-google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o=
-google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4/go.mod h1:eJVxU6o+4G1PSczBr85xmyvSNYAKvAYgkub40YGomFM=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA=
-google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
-google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
-google.golang.org/grpc v1.60.0 h1:6FQAR0kM31P6MRdeluor2w2gPaS4SVNrD/DNTxrQ15k=
-google.golang.org/grpc v1.60.0/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
-google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
-google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
+google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2 h1:35ZFtrCgaAjF7AFAK0+lRSf+4AyYnWRbH7og13p7rZ4=
+google.golang.org/genproto/googleapis/api v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:W9ynFDP/shebLB1Hl/ESTOap2jHd6pmLXPNZC7SVDbA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2 h1:DMTIbak9GhdaSxEjvVzAeNZvyc03I61duqNbnm3SU0M=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250219182151-9fdb1cabc7b2/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
+google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
+google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

logscores/history.go

@@ -7,31 +7,62 @@ import (
 
 	"go.ntppool.org/common/logger"
 	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/chdb"
 	"go.ntppool.org/data-api/ntpdb"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 type LogScoreHistory struct {
 	LogScores []ntpdb.LogScore
 	Monitors  map[int]string
-	MonitorIDs []uint32
+	// MonitorIDs []uint32
 }
 
-func GetHistory(ctx context.Context, db *sql.DB, serverID, monitorID uint32, since time.Time, count int) (*LogScoreHistory, error) {
-	log := logger.Setup()
-	ctx, span := tracing.Tracer().Start(ctx, "logscores.GetHistory")
+func GetHistoryClickHouse(ctx context.Context, ch *chdb.ClickHouse, db *sql.DB, serverID, monitorID uint32, since time.Time, count int, fullHistory bool) (*LogScoreHistory, error) {
+	log := logger.FromContext(ctx)
+	ctx, span := tracing.Tracer().Start(ctx, "logscores.GetHistoryClickHouse",
+		trace.WithAttributes(
+			attribute.Int("server", int(serverID)),
+			attribute.Int("monitor", int(monitorID)),
+			attribute.Bool("full_history", fullHistory),
+		),
+	)
 	defer span.End()
 
-	if count == 0 {
-		count = 200
+	log.DebugContext(ctx, "GetHistoryCH", "server", serverID, "monitor", monitorID, "since", since, "count", count, "full_history", fullHistory)
+
+	ls, err := ch.Logscores(ctx, int(serverID), int(monitorID), since, count, fullHistory)
+
+	if err != nil {
+		log.ErrorContext(ctx, "clickhouse logscores", "err", err)
+		return nil, err
 	}
 
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(db))
+
+	monitors, err := getMonitorNames(ctx, ls, q)
+	if err != nil {
+		return nil, err
+	}
+
+	return &LogScoreHistory{
+		LogScores: ls,
+		Monitors:  monitors,
+	}, nil
+}
+
+func GetHistoryMySQL(ctx context.Context, db *sql.DB, serverID, monitorID uint32, since time.Time, count int) (*LogScoreHistory, error) {
+	log := logger.FromContext(ctx)
+	ctx, span := tracing.Tracer().Start(ctx, "logscores.GetHistoryMySQL")
+	defer span.End()
+
 	span.SetAttributes(
 		attribute.Int("server", int(serverID)),
 		attribute.Int("monitor", int(monitorID)),
 	)
 
-	log.Debug("GetHistory", "server", serverID, "monitor", monitorID, "since", since, "count", count)
+	log.Debug("GetHistoryMySQL", "server", serverID, "monitor", monitorID, "since", since, "count", count)
 
 	q := ntpdb.NewWrappedQuerier(ntpdb.New(db))
 
@@ -53,6 +84,19 @@ func GetHistory(ctx context.Context, db *sql.DB, serverID, monitorID uint32, sin
 		return nil, err
 	}
 
+	monitors, err := getMonitorNames(ctx, ls, q)
+	if err != nil {
+		return nil, err
+	}
+
+	return &LogScoreHistory{
+		LogScores: ls,
+		Monitors:  monitors,
+		// MonitorIDs: monitorIDs,
+	}, nil
+}
+
+func getMonitorNames(ctx context.Context, ls []ntpdb.LogScore, q ntpdb.QuerierTx) (map[int]string, error) {
 	monitors := map[int]string{}
 	monitorIDs := []uint32{}
 	for _, l := range ls {
@@ -73,10 +117,5 @@ func GetHistory(ctx context.Context, db *sql.DB, serverID, monitorID uint32, sin
 	for _, m := range dbmons {
 		monitors[int(m.ID)] = m.DisplayName()
 	}
-
-	return &LogScoreHistory{
-		LogScores:  ls,
-		Monitors:   monitors,
-		MonitorIDs: monitorIDs,
-	}, nil
+	return monitors, nil
 }

ntpdb/db.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.24.0
+//   sqlc v1.28.0
 
 package ntpdb
 

ntpdb/dbconn.go

@@ -1,14 +1,15 @@
 package ntpdb
 
 import (
+	"context"
 	"database/sql"
 	"database/sql/driver"
 	"fmt"
-	"log"
 	"os"
 	"time"
 
 	"github.com/go-sql-driver/mysql"
+	"go.ntppool.org/common/logger"
 	"gopkg.in/yaml.v3"
 )
 
@@ -22,27 +23,28 @@ type DBConfig struct {
 	Pass string `default:"" flag:"pass"`
 }
 
-func OpenDB(configFile string) (*sql.DB, error) {
+func OpenDB(ctx context.Context, configFile string) (*sql.DB, error) {
+	log := logger.FromContext(ctx)
 
-	dbconn := sql.OpenDB(Driver{CreateConnectorFunc: createConnector(configFile)})
+	dbconn := sql.OpenDB(Driver{CreateConnectorFunc: createConnector(ctx, configFile)})
 
 	dbconn.SetConnMaxLifetime(time.Minute * 3)
-	dbconn.SetMaxOpenConns(10)
-	dbconn.SetMaxIdleConns(5)
+	dbconn.SetMaxOpenConns(8)
+	dbconn.SetMaxIdleConns(3)
 
 	err := dbconn.Ping()
 	if err != nil {
-		log.Printf("Could not connect to database: %s", err)
+		log.DebugContext(ctx, "could not connect to database: %s", "err", err)
 		return nil, err
 	}
 
 	return dbconn, nil
 }
 
-func createConnector(configFile string) CreateConnectorFunc {
+func createConnector(ctx context.Context, configFile string) CreateConnectorFunc {
+	log := logger.FromContext(ctx)
 	return func() (driver.Connector, error) {
-
-		log.Printf("opening config file %s", configFile)
+		log.DebugContext(ctx, "opening db config file", "filename", configFile)
 
 		dbFile, err := os.Open(configFile)
 		if err != nil {
@@ -70,11 +72,11 @@ func createConnector(configFile string) CreateConnectorFunc {
 			return nil, err
 		}
 
-		if user := cfg.MySQL.User; len(user) > 0 && err == nil {
+		if user := cfg.MySQL.User; len(user) > 0 {
 			dbcfg.User = user
 		}
 
-		if pass := cfg.MySQL.Pass; len(pass) > 0 && err == nil {
+		if pass := cfg.MySQL.Pass; len(pass) > 0 {
 			dbcfg.Passwd = pass
 		}
 

ntpdb/models.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.24.0
+//   sqlc v1.28.0
 
 package ntpdb
 
@@ -304,16 +304,36 @@ type Server struct {
 	ID             uint32           `db:"id" json:"id"`
 	Ip             string           `db:"ip" json:"ip"`
 	IpVersion      ServersIpVersion `db:"ip_version" json:"ip_version"`
-	UserID       uint32           `db:"user_id" json:"user_id"`
+	UserID         sql.NullInt32    `db:"user_id" json:"user_id"`
 	AccountID      sql.NullInt32    `db:"account_id" json:"account_id"`
 	Hostname       sql.NullString   `db:"hostname" json:"hostname"`
-	Stratum      sql.NullInt32    `db:"stratum" json:"stratum"`
-	InPool       uint32           `db:"in_pool" json:"in_pool"`
-	InServerList uint32           `db:"in_server_list" json:"in_server_list"`
+	Stratum        sql.NullInt16    `db:"stratum" json:"stratum"`
+	InPool         uint8            `db:"in_pool" json:"in_pool"`
+	InServerList   uint8            `db:"in_server_list" json:"in_server_list"`
 	Netspeed       uint32           `db:"netspeed" json:"netspeed"`
+	NetspeedTarget uint32           `db:"netspeed_target" json:"netspeed_target"`
 	CreatedOn      time.Time        `db:"created_on" json:"created_on"`
 	UpdatedOn      time.Time        `db:"updated_on" json:"updated_on"`
 	ScoreTs        sql.NullTime     `db:"score_ts" json:"score_ts"`
 	ScoreRaw       float64          `db:"score_raw" json:"score_raw"`
 	DeletionOn     sql.NullTime     `db:"deletion_on" json:"deletion_on"`
+	Flags          string           `db:"flags" json:"flags"`
+}
+
+type Zone struct {
+	ID          uint32         `db:"id" json:"id"`
+	Name        string         `db:"name" json:"name"`
+	Description sql.NullString `db:"description" json:"description"`
+	ParentID    sql.NullInt32  `db:"parent_id" json:"parent_id"`
+	Dns         bool           `db:"dns" json:"dns"`
+}
+
+type ZoneServerCount struct {
+	ID              uint32                    `db:"id" json:"id"`
+	ZoneID          uint32                    `db:"zone_id" json:"zone_id"`
+	IpVersion       ZoneServerCountsIpVersion `db:"ip_version" json:"ip_version"`
+	Date            time.Time                 `db:"date" json:"date"`
+	CountActive     uint32                    `db:"count_active" json:"count_active"`
+	CountRegistered uint32                    `db:"count_registered" json:"count_registered"`
+	NetspeedActive  uint32                    `db:"netspeed_active" json:"netspeed_active"`
 }

ntpdb/otel.go

@@ -263,6 +263,52 @@ func (_d QuerierTxWithTracing) GetServerScores(ctx context.Context, arg GetServe
 	return _d.QuerierTx.GetServerScores(ctx, arg)
 }
 
+// GetZoneByName implements QuerierTx
+func (_d QuerierTxWithTracing) GetZoneByName(ctx context.Context, name string) (z1 Zone, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetZoneByName")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx":  ctx,
+				"name": name}, map[string]interface{}{
+				"z1":  z1,
+				"err": err})
+		} else if err != nil {
+			_span.RecordError(err)
+			_span.SetAttributes(
+				attribute.String("event", "error"),
+				attribute.String("message", err.Error()),
+			)
+		}
+
+		_span.End()
+	}()
+	return _d.QuerierTx.GetZoneByName(ctx, name)
+}
+
+// GetZoneCounts implements QuerierTx
+func (_d QuerierTxWithTracing) GetZoneCounts(ctx context.Context, zoneID uint32) (za1 []ZoneServerCount, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetZoneCounts")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx":    ctx,
+				"zoneID": zoneID}, map[string]interface{}{
+				"za1": za1,
+				"err": err})
+		} else if err != nil {
+			_span.RecordError(err)
+			_span.SetAttributes(
+				attribute.String("event", "error"),
+				attribute.String("message", err.Error()),
+			)
+		}
+
+		_span.End()
+	}()
+	return _d.QuerierTx.GetZoneCounts(ctx, zoneID)
+}
+
 // GetZoneStatsData implements QuerierTx
 func (_d QuerierTxWithTracing) GetZoneStatsData(ctx context.Context) (ga1 []GetZoneStatsDataRow, err error) {
 	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetZoneStatsData")

ntpdb/querier.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.24.0
+//   sqlc v1.28.0
 
 package ntpdb
 
@@ -18,6 +18,8 @@ type Querier interface {
 	GetServerLogScoresByMonitorID(ctx context.Context, arg GetServerLogScoresByMonitorIDParams) ([]LogScore, error)
 	GetServerNetspeed(ctx context.Context, ip string) (uint32, error)
 	GetServerScores(ctx context.Context, arg GetServerScoresParams) ([]GetServerScoresRow, error)
+	GetZoneByName(ctx context.Context, name string) (Zone, error)
+	GetZoneCounts(ctx context.Context, zoneID uint32) ([]ZoneServerCount, error)
 	GetZoneStatsData(ctx context.Context) ([]GetZoneStatsDataRow, error)
 	GetZoneStatsV2(ctx context.Context, ip string) ([]GetZoneStatsV2Row, error)
 }

ntpdb/query.sql.go

@@ -1,6 +1,6 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.24.0
+//   sqlc v1.28.0
 // source: query.sql
 
 package ntpdb
@@ -100,7 +100,7 @@ func (q *Queries) GetMonitorsByID(ctx context.Context, monitorids []uint32) ([]M
 }
 
 const getServerByID = `-- name: GetServerByID :one
-select id, ip, ip_version, user_id, account_id, hostname, stratum, in_pool, in_server_list, netspeed, created_on, updated_on, score_ts, score_raw, deletion_on from servers
+select id, ip, ip_version, user_id, account_id, hostname, stratum, in_pool, in_server_list, netspeed, netspeed_target, created_on, updated_on, score_ts, score_raw, deletion_on, flags from servers
 where
   id = ?
 `
@@ -119,17 +119,19 @@ func (q *Queries) GetServerByID(ctx context.Context, id uint32) (Server, error)
 		&i.InPool,
 		&i.InServerList,
 		&i.Netspeed,
+		&i.NetspeedTarget,
 		&i.CreatedOn,
 		&i.UpdatedOn,
 		&i.ScoreTs,
 		&i.ScoreRaw,
 		&i.DeletionOn,
+		&i.Flags,
 	)
 	return i, err
 }
 
 const getServerByIP = `-- name: GetServerByIP :one
-select id, ip, ip_version, user_id, account_id, hostname, stratum, in_pool, in_server_list, netspeed, created_on, updated_on, score_ts, score_raw, deletion_on from servers
+select id, ip, ip_version, user_id, account_id, hostname, stratum, in_pool, in_server_list, netspeed, netspeed_target, created_on, updated_on, score_ts, score_raw, deletion_on, flags from servers
 where
   ip = ?
 `
@@ -148,11 +150,13 @@ func (q *Queries) GetServerByIP(ctx context.Context, ip string) (Server, error)
 		&i.InPool,
 		&i.InServerList,
 		&i.Netspeed,
+		&i.NetspeedTarget,
 		&i.CreatedOn,
 		&i.UpdatedOn,
 		&i.ScoreTs,
 		&i.ScoreRaw,
 		&i.DeletionOn,
+		&i.Flags,
 	)
 	return i, err
 }
@@ -333,6 +337,62 @@ func (q *Queries) GetServerScores(ctx context.Context, arg GetServerScoresParams
 	return items, nil
 }
 
+const getZoneByName = `-- name: GetZoneByName :one
+select id, name, description, parent_id, dns from zones
+where
+  name = ?
+`
+
+func (q *Queries) GetZoneByName(ctx context.Context, name string) (Zone, error) {
+	row := q.db.QueryRowContext(ctx, getZoneByName, name)
+	var i Zone
+	err := row.Scan(
+		&i.ID,
+		&i.Name,
+		&i.Description,
+		&i.ParentID,
+		&i.Dns,
+	)
+	return i, err
+}
+
+const getZoneCounts = `-- name: GetZoneCounts :many
+select id, zone_id, ip_version, date, count_active, count_registered, netspeed_active from zone_server_counts
+  where zone_id = ?
+  order by date
+`
+
+func (q *Queries) GetZoneCounts(ctx context.Context, zoneID uint32) ([]ZoneServerCount, error) {
+	rows, err := q.db.QueryContext(ctx, getZoneCounts, zoneID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []ZoneServerCount
+	for rows.Next() {
+		var i ZoneServerCount
+		if err := rows.Scan(
+			&i.ID,
+			&i.ZoneID,
+			&i.IpVersion,
+			&i.Date,
+			&i.CountActive,
+			&i.CountRegistered,
+			&i.NetspeedActive,
+		); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
+
 const getZoneStatsData = `-- name: GetZoneStatsData :many
 SELECT zc.date, z.name, zc.ip_version, count_active, count_registered, netspeed_active
 FROM zone_server_counts zc USE INDEX (date_idx)

query.sql

@@ -83,3 +83,13 @@ where
   monitor_id = ?
   order by ts desc
   limit ?;
+
+-- name: GetZoneByName :one
+select * from zones
+where
+  name = sqlc.arg(name);
+
+-- name: GetZoneCounts :many
+select * from zone_server_counts
+  where zone_id = ?
+  order by date;

schema.sql

@@ -1,8 +1,9 @@
--- MariaDB dump 10.19  Distrib 10.6.12-MariaDB, for Linux (x86_64)
+/*M!999999\- enable the sandbox mode */ 
+-- MariaDB dump 10.19-11.4.4-MariaDB, for Linux (x86_64)
 --
--- Host: ntp-db-mysql-master.ntpdb.svc.cluster.local    Database: askntp
+-- Host: ntpdb-haproxy.ntpdb.svc.cluster.local    Database: askntp
 -- ------------------------------------------------------
--- Server version	5.7.35-38-log
+-- Server version	8.0.40-31
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -13,7 +14,7 @@
 /*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+/*M!100616 SET @OLD_NOTE_VERBOSITY=@@NOTE_VERBOSITY, NOTE_VERBOSITY=0 */;
 
 --
 -- Table structure for table `account_invites`
@@ -23,12 +24,12 @@ DROP TABLE IF EXISTS `account_invites`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `account_invites` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `account_id` int(10) unsigned NOT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `account_id` int unsigned NOT NULL,
   `email` varchar(255) NOT NULL,
   `status` enum('pending','accepted','expired') DEFAULT NULL,
-  `user_id` int(10) unsigned DEFAULT NULL,
-  `sent_by_id` int(10) unsigned NOT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `sent_by_id` int unsigned NOT NULL,
   `code` varchar(25) NOT NULL,
   `expires_on` datetime NOT NULL,
   `created_on` datetime NOT NULL,
@@ -41,7 +42,7 @@ CREATE TABLE `account_invites` (
   CONSTRAINT `account_invites_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
   CONSTRAINT `account_invites_sent_by_fk` FOREIGN KEY (`sent_by_id`) REFERENCES `users` (`id`),
   CONSTRAINT `account_invites_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -52,13 +53,13 @@ DROP TABLE IF EXISTS `account_subscriptions`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `account_subscriptions` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `account_id` int(10) unsigned NOT NULL,
-  `stripe_subscription_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `account_id` int unsigned NOT NULL,
+  `stripe_subscription_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   `status` enum('incomplete','incomplete_expired','trialing','active','past_due','canceled','unpaid','ended') DEFAULT NULL,
   `name` varchar(255) NOT NULL,
-  `max_zones` int(10) unsigned NOT NULL,
-  `max_devices` int(10) unsigned NOT NULL,
+  `max_zones` int unsigned NOT NULL,
+  `max_devices` int unsigned NOT NULL,
   `created_on` datetime NOT NULL,
   `ended_on` datetime DEFAULT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@@ -66,7 +67,7 @@ CREATE TABLE `account_subscriptions` (
   UNIQUE KEY `stripe_subscription_id` (`stripe_subscription_id`),
   KEY `account_subscriptions_account_fk` (`account_id`),
   CONSTRAINT `account_subscriptions_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -77,13 +78,13 @@ DROP TABLE IF EXISTS `account_users`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `account_users` (
-  `account_id` int(10) unsigned NOT NULL,
-  `user_id` int(10) unsigned NOT NULL,
+  `account_id` int unsigned NOT NULL,
+  `user_id` int unsigned NOT NULL,
   PRIMARY KEY (`account_id`,`user_id`),
   KEY `account_users_user_fk` (`user_id`),
   CONSTRAINT `account_users_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
   CONSTRAINT `account_users_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -94,19 +95,20 @@ DROP TABLE IF EXISTS `accounts`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `accounts` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(255) DEFAULT NULL,
   `organization_name` varchar(150) DEFAULT NULL,
   `organization_url` varchar(150) DEFAULT NULL,
   `public_profile` tinyint(1) NOT NULL DEFAULT '0',
   `url_slug` varchar(150) DEFAULT NULL,
+  `flags` varchar(4096) NOT NULL DEFAULT '{}',
   `created_on` datetime NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `stripe_customer_id` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `stripe_customer_id` varchar(255) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `url_slug_idx` (`url_slug`),
   UNIQUE KEY `stripe_customer_id` (`stripe_customer_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -117,14 +119,20 @@ DROP TABLE IF EXISTS `api_keys`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `api_keys` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `account_id` int unsigned DEFAULT NULL,
+  `user_id` int unsigned DEFAULT NULL,
   `api_key` varchar(255) DEFAULT NULL,
   `grants` text,
+  `audience` text NOT NULL,
+  `token_lookup` varchar(16) NOT NULL,
+  `token_hashed` varchar(256) NOT NULL,
+  `last_seen` datetime DEFAULT NULL,
   `created_on` datetime NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `api_key` (`api_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -146,7 +154,7 @@ CREATE TABLE `combust_cache` (
   PRIMARY KEY (`id`,`type`),
   KEY `expire_idx` (`expire`),
   KEY `purge_idx` (`purge_key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -157,8 +165,8 @@ DROP TABLE IF EXISTS `combust_secrets`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `combust_secrets` (
-  `secret_ts` int(10) unsigned NOT NULL,
-  `expires_ts` int(10) unsigned NOT NULL,
+  `secret_ts` int unsigned NOT NULL,
+  `expires_ts` int unsigned NOT NULL,
   `type` varchar(32) NOT NULL,
   `secret` char(32) DEFAULT NULL,
   PRIMARY KEY (`type`,`secret_ts`),
@@ -174,14 +182,14 @@ DROP TABLE IF EXISTS `dns_roots`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `dns_roots` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `origin` varchar(255) NOT NULL,
-  `vendor_available` tinyint(4) NOT NULL DEFAULT '0',
-  `general_use` tinyint(4) NOT NULL DEFAULT '0',
+  `vendor_available` tinyint NOT NULL DEFAULT '0',
+  `general_use` tinyint NOT NULL DEFAULT '0',
   `ns_list` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `origin` (`origin`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -192,14 +200,14 @@ DROP TABLE IF EXISTS `log_scores`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log_scores` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `monitor_id` int(10) unsigned DEFAULT NULL,
-  `server_id` int(10) unsigned NOT NULL,
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `monitor_id` int unsigned DEFAULT NULL,
+  `server_id` int unsigned NOT NULL,
   `ts` datetime NOT NULL,
   `score` double NOT NULL DEFAULT '0',
   `step` double NOT NULL DEFAULT '0',
   `offset` double DEFAULT NULL,
-  `rtt` mediumint(9) DEFAULT NULL,
+  `rtt` mediumint DEFAULT NULL,
   `attributes` text,
   PRIMARY KEY (`id`),
   KEY `log_scores_server_ts_idx` (`server_id`,`ts`),
@@ -207,7 +215,7 @@ CREATE TABLE `log_scores` (
   KEY `log_score_monitor_id_fk` (`monitor_id`),
   CONSTRAINT `log_score_monitor_id_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`),
   CONSTRAINT `log_scores_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -218,33 +226,15 @@ DROP TABLE IF EXISTS `log_scores_archive_status`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `log_scores_archive_status` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `archiver` varchar(255) NOT NULL,
-  `log_score_id` bigint(20) unsigned DEFAULT NULL,
+  `log_score_id` bigint unsigned DEFAULT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `archiver` (`archiver`),
   KEY `log_score_id` (`log_score_id`),
   CONSTRAINT `log_score_id` FOREIGN KEY (`log_score_id`) REFERENCES `log_scores` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Table structure for table `log_status`
---
-
-DROP TABLE IF EXISTS `log_status`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `log_status` (
-  `server_id` int(10) unsigned NOT NULL,
-  `last_check` datetime NOT NULL,
-  `ts_archived` datetime NOT NULL,
-  PRIMARY KEY (`server_id`),
-  KEY `log_scores_server_ts_idx` (`server_id`,`last_check`),
-  KEY `last_check_idx` (`last_check`),
-  CONSTRAINT `log_status_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -255,11 +245,11 @@ DROP TABLE IF EXISTS `logs`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `logs` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `account_id` int(10) unsigned DEFAULT NULL,
-  `server_id` int(10) unsigned DEFAULT NULL,
-  `user_id` int(10) unsigned DEFAULT NULL,
-  `vendor_zone_id` int(10) unsigned DEFAULT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `account_id` int unsigned DEFAULT NULL,
+  `server_id` int unsigned DEFAULT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `vendor_zone_id` int unsigned DEFAULT NULL,
   `type` varchar(50) DEFAULT NULL,
   `message` text,
   `changes` text,
@@ -273,7 +263,38 @@ CREATE TABLE `logs` (
   CONSTRAINT `logs_vendor_zone_id` FOREIGN KEY (`vendor_zone_id`) REFERENCES `vendor_zones` (`id`) ON DELETE CASCADE,
   CONSTRAINT `server_logs_server_id` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
   CONSTRAINT `server_logs_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `monitor_registrations`
+--
+
+DROP TABLE IF EXISTS `monitor_registrations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `monitor_registrations` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `monitor_id` int unsigned DEFAULT NULL,
+  `request_token` varchar(128) NOT NULL,
+  `verification_token` varchar(32) NOT NULL,
+  `ip4` varchar(15) NOT NULL DEFAULT '',
+  `ip6` varchar(39) NOT NULL DEFAULT '',
+  `name` varchar(256) NOT NULL DEFAULT '',
+  `location_code` varchar(5) NOT NULL DEFAULT '',
+  `account_id` int unsigned DEFAULT NULL,
+  `client` varchar(256) NOT NULL DEFAULT '',
+  `status` enum('pending','accepted','completed','rejected','cancelled') NOT NULL,
+  `last_seen` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `created_on` datetime NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `request_token` (`request_token`),
+  UNIQUE KEY `verification_token` (`verification_token`),
+  KEY `monitor_registrations_monitor_id_fk` (`monitor_id`),
+  KEY `monitor_registrations_account_fk` (`account_id`),
+  CONSTRAINT `monitor_registrations_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
+  CONSTRAINT `monitor_registrations_monitor_id_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -284,10 +305,10 @@ DROP TABLE IF EXISTS `monitors`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `monitors` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `type` enum('monitor','score') NOT NULL DEFAULT 'monitor',
-  `user_id` int(10) unsigned DEFAULT NULL,
-  `account_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `account_id` int unsigned DEFAULT NULL,
   `name` varchar(30) NOT NULL,
   `location` varchar(255) NOT NULL DEFAULT '',
   `ip` varchar(40) DEFAULT NULL,
@@ -303,12 +324,13 @@ CREATE TABLE `monitors` (
   PRIMARY KEY (`id`),
   UNIQUE KEY `ip` (`ip`,`ip_version`),
   UNIQUE KEY `api_key` (`api_key`),
-  UNIQUE KEY `monitors_tls_name` (`tls_name`),
+  UNIQUE KEY `monitors_tls_name` (`tls_name`,`ip_version`),
   KEY `monitors_user_id` (`user_id`),
   KEY `monitors_account_fk` (`account_id`),
+  KEY `type_status` (`type`,`status`),
   CONSTRAINT `monitors_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
   CONSTRAINT `monitors_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -340,10 +362,10 @@ DROP TABLE IF EXISTS `schema_revision`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `schema_revision` (
-  `revision` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `revision` smallint unsigned NOT NULL DEFAULT '0',
   `schema_name` varchar(30) NOT NULL,
   PRIMARY KEY (`schema_name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -354,16 +376,16 @@ DROP TABLE IF EXISTS `scorer_status`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `scorer_status` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `scorer_id` int(10) unsigned NOT NULL,
-  `log_score_id` bigint(20) unsigned DEFAULT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `scorer_id` int unsigned NOT NULL,
+  `log_score_id` bigint unsigned NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   KEY `scorer_log_score_id` (`log_score_id`),
   KEY `scores_status_monitor_id_fk` (`scorer_id`),
   CONSTRAINT `scorer_log_score_id` FOREIGN KEY (`log_score_id`) REFERENCES `log_scores` (`id`),
   CONSTRAINT `scores_status_monitor_id_fk` FOREIGN KEY (`scorer_id`) REFERENCES `monitors` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -374,13 +396,13 @@ DROP TABLE IF EXISTS `server_alerts`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `server_alerts` (
-  `server_id` int(10) unsigned NOT NULL,
+  `server_id` int unsigned NOT NULL,
   `last_score` double NOT NULL,
   `first_email_time` datetime NOT NULL,
   `last_email_time` datetime DEFAULT NULL,
   PRIMARY KEY (`server_id`),
   CONSTRAINT `server_alerts_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -391,8 +413,8 @@ DROP TABLE IF EXISTS `server_notes`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `server_notes` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `server_id` int(10) unsigned NOT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `server_id` int unsigned NOT NULL,
   `name` varchar(255) NOT NULL DEFAULT '',
   `note` text NOT NULL,
   `created_on` datetime NOT NULL,
@@ -401,7 +423,7 @@ CREATE TABLE `server_notes` (
   UNIQUE KEY `server` (`server_id`,`name`),
   KEY `name` (`name`),
   CONSTRAINT `server_notes_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -412,13 +434,14 @@ DROP TABLE IF EXISTS `server_scores`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `server_scores` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `monitor_id` int(10) unsigned NOT NULL,
-  `server_id` int(10) unsigned NOT NULL,
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
+  `monitor_id` int unsigned NOT NULL,
+  `server_id` int unsigned NOT NULL,
   `score_ts` datetime DEFAULT NULL,
   `score_raw` double NOT NULL DEFAULT '0',
-  `stratum` tinyint(3) unsigned DEFAULT NULL,
+  `stratum` tinyint unsigned DEFAULT NULL,
   `status` enum('new','testing','active') NOT NULL DEFAULT 'new',
+  `queue_ts` datetime DEFAULT NULL,
   `created_on` datetime NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
@@ -427,7 +450,7 @@ CREATE TABLE `server_scores` (
   KEY `monitor_id_2` (`monitor_id`,`score_ts`),
   CONSTRAINT `server_score_monitor_fk` FOREIGN KEY (`monitor_id`) REFERENCES `monitors` (`id`),
   CONSTRAINT `server_score_server_id` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -438,13 +461,63 @@ DROP TABLE IF EXISTS `server_urls`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `server_urls` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `server_id` int(10) unsigned NOT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `server_id` int unsigned NOT NULL,
   `url` varchar(255) NOT NULL,
   PRIMARY KEY (`id`),
   KEY `server` (`server_id`),
   CONSTRAINT `server_urls_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `server_verifications`
+--
+
+DROP TABLE IF EXISTS `server_verifications`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `server_verifications` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `server_id` int unsigned NOT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `user_ip` varchar(45) NOT NULL DEFAULT '',
+  `indirect_ip` varchar(45) NOT NULL DEFAULT '',
+  `verified_on` datetime DEFAULT NULL,
+  `token` varchar(36) DEFAULT NULL,
+  `created_on` datetime NOT NULL,
+  `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `server` (`server_id`),
+  UNIQUE KEY `token` (`token`),
+  KEY `server_verifications_ibfk_2` (`user_id`),
+  CONSTRAINT `server_verifications_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `server_verifications_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `server_verifications_history`
+--
+
+DROP TABLE IF EXISTS `server_verifications_history`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `server_verifications_history` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `server_id` int unsigned NOT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `user_ip` varchar(45) NOT NULL DEFAULT '',
+  `indirect_ip` varchar(45) NOT NULL DEFAULT '',
+  `verified_on` datetime DEFAULT NULL,
+  `created_on` datetime NOT NULL,
+  `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `server_verifications_history_ibfk_1` (`server_id`),
+  KEY `server_verifications_history_ibfk_2` (`user_id`),
+  CONSTRAINT `server_verifications_history_ibfk_1` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
+  CONSTRAINT `server_verifications_history_ibfk_2` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -455,13 +528,13 @@ DROP TABLE IF EXISTS `server_zones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `server_zones` (
-  `server_id` int(10) unsigned NOT NULL,
-  `zone_id` int(10) unsigned NOT NULL,
+  `server_id` int unsigned NOT NULL,
+  `zone_id` int unsigned NOT NULL,
   PRIMARY KEY (`server_id`,`zone_id`),
   KEY `locations_zone` (`zone_id`),
   CONSTRAINT `locations_server` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE,
   CONSTRAINT `locations_zone` FOREIGN KEY (`zone_id`) REFERENCES `zones` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -472,21 +545,23 @@ DROP TABLE IF EXISTS `servers`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `servers` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `ip` varchar(40) NOT NULL,
   `ip_version` enum('v4','v6') NOT NULL DEFAULT 'v4',
-  `user_id` int(10) unsigned NOT NULL,
-  `account_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int unsigned DEFAULT NULL,
+  `account_id` int unsigned DEFAULT NULL,
   `hostname` varchar(255) DEFAULT NULL,
-  `stratum` tinyint(3) unsigned DEFAULT NULL,
-  `in_pool` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `in_server_list` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `netspeed` mediumint(8) unsigned NOT NULL DEFAULT '1000',
+  `stratum` tinyint unsigned DEFAULT NULL,
+  `in_pool` tinyint unsigned NOT NULL DEFAULT '0',
+  `in_server_list` tinyint unsigned NOT NULL DEFAULT '0',
+  `netspeed` int unsigned NOT NULL DEFAULT '10000',
+  `netspeed_target` int unsigned NOT NULL DEFAULT '10000',
   `created_on` datetime NOT NULL,
   `updated_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   `score_ts` datetime DEFAULT NULL,
   `score_raw` double NOT NULL DEFAULT '0',
   `deletion_on` date DEFAULT NULL,
+  `flags` varchar(4096) NOT NULL DEFAULT '{}',
   PRIMARY KEY (`id`),
   UNIQUE KEY `ip` (`ip`),
   KEY `admin` (`user_id`),
@@ -495,7 +570,7 @@ CREATE TABLE `servers` (
   KEY `server_account_fk` (`account_id`),
   CONSTRAINT `server_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
   CONSTRAINT `servers_user_ibfk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -506,7 +581,7 @@ DROP TABLE IF EXISTS `servers_monitor_review`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `servers_monitor_review` (
-  `server_id` int(10) unsigned NOT NULL,
+  `server_id` int unsigned NOT NULL,
   `last_review` datetime DEFAULT NULL,
   `next_review` datetime DEFAULT NULL,
   `last_change` datetime DEFAULT NULL,
@@ -514,7 +589,7 @@ CREATE TABLE `servers_monitor_review` (
   PRIMARY KEY (`server_id`),
   KEY `next_review` (`next_review`),
   CONSTRAINT `server_monitor_review_server_id_fk` FOREIGN KEY (`server_id`) REFERENCES `servers` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -525,14 +600,14 @@ DROP TABLE IF EXISTS `system_settings`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `system_settings` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `key` varchar(255) DEFAULT NULL,
-  `value` text,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `key` varchar(255) NOT NULL,
+  `value` text NOT NULL,
   `created_on` datetime NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `key` (`key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -543,15 +618,15 @@ DROP TABLE IF EXISTS `user_equipment_applications`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user_equipment_applications` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `user_id` int(10) unsigned NOT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int unsigned NOT NULL,
   `application` text,
   `contact_information` text,
   `status` enum('New','Pending','Maybe','No','Approved') NOT NULL DEFAULT 'New',
   PRIMARY KEY (`id`),
   KEY `user_equipment_applications_user_id` (`user_id`),
   CONSTRAINT `user_equipment_applications_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -562,17 +637,19 @@ DROP TABLE IF EXISTS `user_identities`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user_identities` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `profile_id` varchar(255) NOT NULL,
-  `user_id` int(10) unsigned NOT NULL,
+  `user_id` int unsigned NOT NULL,
   `provider` varchar(255) NOT NULL,
   `data` text,
   `email` varchar(255) DEFAULT NULL,
+  `created_on` datetime NOT NULL DEFAULT '2003-01-27 00:00:00',
+  `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   PRIMARY KEY (`id`),
   UNIQUE KEY `profile_id` (`profile_id`),
   KEY `user_identities_user_id` (`user_id`),
   CONSTRAINT `user_identities_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -583,14 +660,57 @@ DROP TABLE IF EXISTS `user_privileges`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `user_privileges` (
-  `user_id` int(10) unsigned NOT NULL,
+  `user_id` int unsigned NOT NULL,
   `see_all_servers` tinyint(1) NOT NULL DEFAULT '0',
-  `vendor_admin` tinyint(4) NOT NULL DEFAULT '0',
-  `equipment_admin` tinyint(4) NOT NULL DEFAULT '0',
-  `support_staff` tinyint(4) NOT NULL DEFAULT '0',
+  `vendor_admin` tinyint NOT NULL DEFAULT '0',
+  `equipment_admin` tinyint NOT NULL DEFAULT '0',
+  `support_staff` tinyint NOT NULL DEFAULT '0',
   PRIMARY KEY (`user_id`),
   CONSTRAINT `user_privileges_user` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `user_sessions`
+--
+
+DROP TABLE IF EXISTS `user_sessions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_sessions` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int unsigned NOT NULL,
+  `token_lookup` varchar(16) NOT NULL,
+  `token_hashed` varchar(256) NOT NULL,
+  `last_seen` datetime DEFAULT NULL,
+  `created_on` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `user_sessions_user_fk` (`user_id`),
+  KEY `token_lookup` (`token_lookup`),
+  CONSTRAINT `user_sessions_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `user_tasks`
+--
+
+DROP TABLE IF EXISTS `user_tasks`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `user_tasks` (
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int unsigned DEFAULT NULL,
+  `task` enum('download','delete') NOT NULL,
+  `status` text NOT NULL,
+  `traceid` varchar(32) NOT NULL DEFAULT '',
+  `execute_on` datetime DEFAULT NULL,
+  `created_on` datetime NOT NULL,
+  `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `user_tasks_user_fk` (`user_id`),
+  CONSTRAINT `user_tasks_user_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -601,15 +721,16 @@ DROP TABLE IF EXISTS `users`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `users` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `email` varchar(255) NOT NULL,
   `name` varchar(255) DEFAULT NULL,
   `username` varchar(40) DEFAULT NULL,
   `public_profile` tinyint(1) NOT NULL DEFAULT '0',
+  `deletion_on` datetime DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `email` (`email`),
   UNIQUE KEY `username` (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -620,23 +741,24 @@ DROP TABLE IF EXISTS `vendor_zones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `vendor_zones` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `zone_name` varchar(90) NOT NULL,
   `status` enum('New','Pending','Approved','Rejected') NOT NULL DEFAULT 'New',
-  `user_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int unsigned DEFAULT NULL,
   `organization_name` varchar(255) DEFAULT NULL,
   `client_type` enum('ntp','sntp','legacy') NOT NULL DEFAULT 'sntp',
   `contact_information` text,
   `request_information` text,
-  `device_count` int(10) unsigned DEFAULT NULL,
+  `device_information` text,
+  `device_count` int unsigned DEFAULT NULL,
   `opensource` tinyint(1) NOT NULL DEFAULT '0',
   `opensource_info` text,
-  `rt_ticket` smallint(5) unsigned DEFAULT NULL,
+  `rt_ticket` smallint unsigned DEFAULT NULL,
   `approved_on` datetime DEFAULT NULL,
   `created_on` datetime NOT NULL,
   `modified_on` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `dns_root_id` int(10) unsigned NOT NULL,
-  `account_id` int(10) unsigned DEFAULT NULL,
+  `dns_root_id` int unsigned NOT NULL,
+  `account_id` int unsigned DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `zone_name` (`zone_name`,`dns_root_id`),
   KEY `vendor_zones_user_id` (`user_id`),
@@ -645,7 +767,7 @@ CREATE TABLE `vendor_zones` (
   CONSTRAINT `dns_root_fk` FOREIGN KEY (`dns_root_id`) REFERENCES `dns_roots` (`id`),
   CONSTRAINT `vendor_zone_account_fk` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`),
   CONSTRAINT `vendor_zones_user_id` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -656,17 +778,18 @@ DROP TABLE IF EXISTS `zone_server_counts`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `zone_server_counts` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `zone_id` int(10) unsigned NOT NULL,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
+  `zone_id` int unsigned NOT NULL,
   `ip_version` enum('v4','v6') NOT NULL,
   `date` date NOT NULL,
-  `count_active` mediumint(8) unsigned NOT NULL,
-  `count_registered` mediumint(8) unsigned NOT NULL,
-  `netspeed_active` int(10) unsigned NOT NULL,
+  `count_active` mediumint unsigned NOT NULL,
+  `count_registered` mediumint unsigned NOT NULL,
+  `netspeed_active` int unsigned NOT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `zone_date` (`zone_id`,`date`,`ip_version`),
+  KEY `date_idx` (`date`,`zone_id`),
   CONSTRAINT `zone_server_counts` FOREIGN KEY (`zone_id`) REFERENCES `zones` (`id`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -677,16 +800,16 @@ DROP TABLE IF EXISTS `zones`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `zones` (
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `id` int unsigned NOT NULL AUTO_INCREMENT,
   `name` varchar(255) NOT NULL,
   `description` varchar(255) DEFAULT NULL,
-  `parent_id` int(10) unsigned DEFAULT NULL,
+  `parent_id` int unsigned DEFAULT NULL,
   `dns` tinyint(1) NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   UNIQUE KEY `name` (`name`),
   KEY `parent` (`parent_id`),
   CONSTRAINT `zones_parent` FOREIGN KEY (`parent_id`) REFERENCES `zones` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -701,7 +824,7 @@ CREATE TABLE `zones` (
 /*!50001 SET character_set_results     = utf8mb4 */;
 /*!50001 SET collation_connection      = utf8mb4_general_ci */;
 /*!50001 CREATE ALGORITHM=UNDEFINED */
-/*!50013 DEFINER=`askntp`@`10.%` SQL SECURITY DEFINER */
+/*!50013 DEFINER=`v-root-ntp-askntp-JRFPjVcaH1HOoQ`@`10.%` SQL SECURITY DEFINER */
 /*!50001 VIEW `monitors_data` AS select `monitors`.`id` AS `id`,`monitors`.`account_id` AS `account_id`,`monitors`.`type` AS `type`,if((`monitors`.`type` = 'score'),`monitors`.`name`,substring_index(`monitors`.`tls_name`,'.',1)) AS `name`,`monitors`.`ip` AS `ip`,`monitors`.`ip_version` AS `ip_version`,`monitors`.`status` AS `status`,`monitors`.`client_version` AS `client_version`,`monitors`.`last_seen` AS `last_seen`,`monitors`.`last_submit` AS `last_submit` from `monitors` where (not((`monitors`.`tls_name` like '%.system'))) */;
 /*!50001 SET character_set_client      = @saved_cs_client */;
 /*!50001 SET character_set_results     = @saved_cs_results */;
@@ -714,6 +837,6 @@ CREATE TABLE `zones` (
 /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
 /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+/*M!100616 SET NOTE_VERBOSITY=@OLD_NOTE_VERBOSITY */;
 
--- Dump completed on 2023-05-03  5:59:38
+-- Dump completed on 2025-01-18  4:31:13

scripts/run-goreleaser

@@ -2,7 +2,16 @@
 
 set -euo pipefail
 
-go install github.com/goreleaser/goreleaser@v1.22.1
+go install github.com/goreleaser/goreleaser/v2@v2.7.0
+
+if [ ! -z "${harbor_username:-}" ]; then
+  DOCKER_FILE=~/.docker/config.json
+  if [ ! -e $DOCKER_FILE ]; then
+    mkdir -p ~/.docker/
+    export harbor_auth=`cat /dev/null | jq -s -r '[ env.harbor_username, env.harbor_password ] | join(":") | @base64'`
+    echo '{"auths":{"harbor.ntppool.org":{"auth":""}}}' | jq '.auths["harbor.ntppool.org"].auth=env.harbor_auth' > $DOCKER_FILE
+  fi
+fi
 
 DRONE_TAG=${DRONE_TAG-""}
 

server/graph_image.go

@@ -32,7 +32,7 @@ func (srv *Server) graphImage(c echo.Context) error {
 	serverID := c.Param("server")
 	imageType := c.Param("type")
 	log = log.With("serverID", serverID).With("type", imageType)
-	log.Info("graph parameters")
+	log.InfoContext(ctx, "graph parameters")
 
 	span.SetAttributes(attribute.String("url.server_parameter", serverID))
 
@@ -107,6 +107,7 @@ func (srv *Server) fetchGraph(ctx context.Context, serverIP string) (string, []b
 
 	client := retryablehttp.NewClient()
 	client.Logger = log
+
 	client.HTTPClient.Transport = otelhttp.NewTransport(
 		client.HTTPClient.Transport,
 		otelhttp.WithClientTrace(func(ctx context.Context) *httptrace.ClientTrace {

server/history.go

@@ -9,6 +9,8 @@ import (
 	"fmt"
 	"math"
 	"net/http"
+	"net/netip"
+	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -42,30 +44,36 @@ func paramHistoryMode(s string) historyMode {
 	}
 }
 
-func (srv *Server) getHistory(ctx context.Context, c echo.Context, server ntpdb.Server) (*logscores.LogScoreHistory, error) {
-	log := logger.Setup()
+type historyParameters struct {
+	limit       int
+	monitorID   int
+	server      ntpdb.Server
+	since       time.Time
+	fullHistory bool
+}
+
+func (srv *Server) getHistoryParameters(ctx context.Context, c echo.Context) (historyParameters, error) {
+	log := logger.FromContext(ctx)
+
+	p := historyParameters{}
 
 	limit := 0
 	if limitParam, err := strconv.Atoi(c.QueryParam("limit")); err == nil {
 		limit = limitParam
 	} else {
-		limit = 50
-	}
-	if limit > 4000 {
-		limit = 4000
+		limit = 100
 	}
 
-	since, _ := strconv.ParseInt(c.QueryParam("since"), 10, 64) // defaults to 0 so don't care if it parses
-
-	monitorParam := c.QueryParam("monitor")
-
-	if since > 0 {
-		c.Request().Header.Set("Cache-Control", "s-maxage=300")
+	if limit > 10000 {
+		limit = 10000
 	}
+	p.limit = limit
 
 	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
 
-	var monitorID uint32 = 0
+	monitorParam := c.QueryParam("monitor")
+
+	var monitorID uint32
 	switch monitorParam {
 	case "":
 		name := "recentmedian.scores.ntp.dev"
@@ -84,30 +92,51 @@ func (srv *Server) getHistory(ctx context.Context, c echo.Context, server ntpdb.
 			// only accept the name prefix; no wildcards; trust the database
 			// to filter out any other crazy
 			if strings.ContainsAny(monitorParam, "_%. \t\n") {
-				return nil, echo.NewHTTPError(http.StatusNotFound, "monitor not found")
+				return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found")
 			}
 
-			if err != nil {
 			monitorParam = monitorParam + ".%"
 			monitor, err := q.GetMonitorByName(ctx, sql.NullString{Valid: true, String: monitorParam})
 			if err != nil {
-					log.Warn("could not find monitor", "name", monitorParam, "err", err)
-					return nil, echo.NewHTTPError(http.StatusNotFound, "monitor not found")
+				if err == sql.ErrNoRows {
+					return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found").WithInternal(err)
+				}
+				log.WarnContext(ctx, "could not find monitor", "name", monitorParam, "err", err)
+				return p, echo.NewHTTPError(http.StatusNotFound, "monitor not found (sql)")
 			}
 			monitorID = monitor.ID
-			}
+
 		}
 	}
 
-	log.Info("monitor param", "monitor", monitorID)
+	p.monitorID = int(monitorID)
+	log.DebugContext(ctx, "monitor param", "monitor", monitorID)
 
-	sinceTime := time.Unix(since, 0)
+	since, _ := strconv.ParseInt(c.QueryParam("since"), 10, 64) // defaults to 0 so don't care if it parses
 	if since > 0 {
-		log.Warn("monitor data requested with since parameter, not supported", "since", sinceTime)
+		p.since = time.Unix(since, 0)
 	}
 
-	ls, err := logscores.GetHistory(ctx, srv.db, server.ID, monitorID, sinceTime, limit)
+	clientIP, err := netip.ParseAddr(c.RealIP())
+	if err != nil {
+		return p, err
+	}
 
+	// log.DebugContext(ctx, "client ip", "client_ip", clientIP.String())
+
+	if clientIP.IsPrivate() || clientIP.IsLoopback() { // don't allow this through the ingress or CDN
+		if fullParam := c.QueryParam("full_history"); len(fullParam) > 0 {
+			if t, _ := strconv.ParseBool(fullParam); t {
+				p.fullHistory = true
+			}
+		}
+	}
+
+	return p, nil
+}
+
+func (srv *Server) getHistoryMySQL(ctx context.Context, _ echo.Context, p historyParameters) (*logscores.LogScoreHistory, error) {
+	ls, err := logscores.GetHistoryMySQL(ctx, srv.db, p.server.ID, uint32(p.monitorID), p.since, p.limit)
 	return ls, err
 }
 
@@ -116,7 +145,8 @@ func (srv *Server) history(c echo.Context) error {
 	ctx, span := tracing.Tracer().Start(c.Request().Context(), "history")
 	defer span.End()
 
-	// just cache for a short time by default
+	// set a reasonable default cache time; adjusted later for
+	// happy path common responses
 	c.Response().Header().Set("Cache-Control", "public,max-age=240")
 
 	mode := paramHistoryMode(c.Param("mode"))
@@ -124,9 +154,22 @@ func (srv *Server) history(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusNotFound, "invalid mode")
 	}
 
+	p, err := srv.getHistoryParameters(ctx, c)
+	if err != nil {
+		if he, ok := err.(*echo.HTTPError); ok {
+			return he
+		}
+		log.ErrorContext(ctx, "get history parameters", "err", err)
+		span.RecordError(err)
+		return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
+	}
+
 	server, err := srv.FindServer(ctx, c.Param("server"))
 	if err != nil {
-		log.Error("find server", "err", err)
+		log.ErrorContext(ctx, "find server", "err", err)
+		if he, ok := err.(*echo.HTTPError); ok {
+			return he
+		}
 		span.RecordError(err)
 		return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
 	}
@@ -139,7 +182,23 @@ func (srv *Server) history(c echo.Context) error {
 		return echo.NewHTTPError(http.StatusNotFound, "server not found")
 	}
 
-	history, err := srv.getHistory(ctx, c, server)
+	p.server = server
+
+	var history *logscores.LogScoreHistory
+
+	sourceParam := c.QueryParam("source")
+	switch sourceParam {
+	case "m":
+	case "c":
+	default:
+		sourceParam = os.Getenv("default_source")
+	}
+
+	if sourceParam == "m" {
+		history, err = srv.getHistoryMySQL(ctx, c, p)
+	} else {
+		history, err = logscores.GetHistoryClickHouse(ctx, srv.ch, srv.db, p.server.ID, uint32(p.monitorID), p.since, p.limit, p.fullHistory)
+	}
 	if err != nil {
 		var httpError *echo.HTTPError
 		if errors.As(err, &httpError) {
@@ -165,7 +224,6 @@ func (srv *Server) history(c echo.Context) error {
 	default:
 		return c.String(http.StatusNotFound, "not implemented")
 	}
-
 }
 
 func (srv *Server) historyJSON(ctx context.Context, c echo.Context, server ntpdb.Server, history *logscores.LogScoreHistory) error {
@@ -202,10 +260,15 @@ func (srv *Server) historyJSON(ctx context.Context, c echo.Context, server ntpdb
 
 	// log.InfoContext(ctx, "monitor id list", "ids", history.MonitorIDs)
 
+	monitorIDs := []uint32{}
+	for k := range history.Monitors {
+		monitorIDs = append(monitorIDs, uint32(k))
+	}
+
 	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
 	logScoreMonitors, err := q.GetServerScores(ctx,
 		ntpdb.GetServerScoresParams{
-			MonitorIDs: history.MonitorIDs,
+			MonitorIDs: monitorIDs,
 			ServerID:   server.ID,
 		},
 	)
@@ -254,21 +317,16 @@ func (srv *Server) historyJSON(ctx context.Context, c echo.Context, server ntpdb
 		}
 	}
 
-	if len(history.LogScores) == 0 ||
-		history.LogScores[len(history.LogScores)-1].Ts.After(time.Now().Add(-8*time.Hour)) {
-		// cache for longer if data hasn't updated for a while
-		c.Request().Header.Set("Cache-Control", "s-maxage=3600,max-age=1800")
-	} else {
-		c.Request().Header.Set("Cache-Control", "s-maxage=300,max-age=240")
-	}
+	setHistoryCacheControl(c, history)
 
 	return c.JSON(http.StatusOK, res)
-
 }
 
 func (srv *Server) historyCSV(ctx context.Context, c echo.Context, history *logscores.LogScoreHistory) error {
 	log := logger.Setup()
 	ctx, span := tracing.Tracer().Start(ctx, "history.csv")
+	defer span.End()
+
 	b := bytes.NewBuffer([]byte{})
 	w := csv.NewWriter(b)
 
@@ -279,7 +337,11 @@ func (srv *Server) historyCSV(ctx context.Context, c echo.Context, history *logs
 		return s
 	}
 
-	w.Write([]string{"ts_epoch", "ts", "offset", "step", "score", "monitor_id", "monitor_name", "leap", "error"})
+	err := w.Write([]string{"ts_epoch", "ts", "offset", "step", "score", "monitor_id", "monitor_name", "leap", "error"})
+	if err != nil {
+		log.ErrorContext(ctx, "could not write csv header", "err", err)
+		return err
+	}
 	for _, l := range history.LogScores {
 		// log.Debug("csv line", "id", l.ID, "n", i)
 
@@ -318,14 +380,31 @@ func (srv *Server) historyCSV(ctx context.Context, c echo.Context, history *logs
 	w.Flush()
 	if err := w.Error(); err != nil {
 		log.ErrorContext(ctx, "could not flush csv", "err", err)
-		span.End()
 		return c.String(http.StatusInternalServerError, "csv error")
 	}
 
 	// log.Info("entries", "count", len(history.LogScores), "out_bytes", b.Len())
 
-	c.Request().Header.Set("Cache-Control", "s-maxage=120,max-age=120")
-
-	return c.Blob(http.StatusOK, "text/csv", b.Bytes())
+	setHistoryCacheControl(c, history)
 
+	c.Response().Header().Set("Content-Disposition", "inline")
+	// Chrome and Firefox force-download text/csv files, so use text/plain
+	// https://bugs.chromium.org/p/chromium/issues/detail?id=152911
+	return c.Blob(http.StatusOK, "text/plain", b.Bytes())
+}
+
+func setHistoryCacheControl(c echo.Context, history *logscores.LogScoreHistory) {
+	hdr := c.Response().Header()
+	if len(history.LogScores) == 0 ||
+		// cache for longer if data hasn't updated for a while; or we didn't
+		// find any.
+		(time.Now().Add(-8 * time.Hour).After(history.LogScores[len(history.LogScores)-1].Ts)) {
+		hdr.Set("Cache-Control", "s-maxage=3600,max-age=1800")
+	} else {
+		if len(history.LogScores) == 1 {
+			hdr.Set("Cache-Control", "s-maxage=60,max-age=35")
+		} else {
+			hdr.Set("Cache-Control", "s-maxage=240,max-age=120")
+		}
+	}
 }

server/server.go

@@ -5,11 +5,15 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"os"
+	"strconv"
+	"time"
 
 	"golang.org/x/sync/errgroup"
 
+	"github.com/labstack/echo-contrib/echoprometheus"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	slogecho "github.com/samber/slog-echo"
@@ -49,7 +53,7 @@ func NewServer(ctx context.Context, configFile string) (*Server, error) {
 	if err != nil {
 		return nil, fmt.Errorf("clickhouse open: %w", err)
 	}
-	db, err := ntpdb.OpenDB(configFile)
+	db, err := ntpdb.OpenDB(ctx, configFile)
 	if err != nil {
 		return nil, fmt.Errorf("mysql open: %w", err)
 	}
@@ -69,14 +73,13 @@ func NewServer(ctx context.Context, configFile string) (*Server, error) {
 
 	tpShutdown, err := tracing.InitTracer(ctx, &tracing.TracerConfig{
 		ServiceName: "data-api",
-		Environment: "",
+		Environment: conf.DeploymentMode(),
 	})
 	if err != nil {
-		return nil, err
+		return nil, fmt.Errorf("tracing init: %w", err)
 	}
 
 	srv.tpShutdown = append(srv.tpShutdown, tpShutdown)
-	// srv.tracer = tracing.Tracer()
 	return srv, nil
 }
 
@@ -96,12 +99,17 @@ func (srv *Server) Run() error {
 	})
 
 	g.Go(func() error {
-		return health.HealthCheckListener(ctx, 9019, log.WithGroup("health"))
+		hclog := log.WithGroup("health")
+		hc := health.NewServer(healthHandler(srv, hclog))
+		hc.SetLogger(hclog)
+		return hc.Listen(ctx, 9019)
 	})
 
 	e := echo.New()
 	srv.tpShutdown = append(srv.tpShutdown, e.Shutdown)
 
+	e.Debug = false
+
 	trustOptions := []echo.TrustOption{
 		echo.TrustLoopback(true),
 		echo.TrustLinkLocal(false),
@@ -124,10 +132,17 @@ func (srv *Server) Run() error {
 
 	e.IPExtractor = echo.ExtractIPFromXFFHeader(trustOptions...)
 
+	e.Use(echoprometheus.NewMiddlewareWithConfig(echoprometheus.MiddlewareConfig{
+		Registerer: srv.metrics.Registry(),
+	}))
 	e.Use(otelecho.Middleware("data-api"))
+
 	e.Use(slogecho.NewWithConfig(log,
 		slogecho.Config{
 			WithTraceID:      false, // done by logger already
+			DefaultLevel:     slog.LevelInfo,
+			ClientErrorLevel: slog.LevelWarn,
+			ServerErrorLevel: slog.LevelError,
 			// WithRequestHeader: true,
 		},
 	))
@@ -157,7 +172,6 @@ func (srv *Server) Run() error {
 		vinfo := version.VersionInfo()
 		v := "data-api/" + vinfo.Version + "+" + vinfo.GitRevShort
 		return func(c echo.Context) error {
-
 			c.Response().Header().Set(echo.HeaderServer, v)
 			return next(c)
 		}
@@ -176,6 +190,7 @@ func (srv *Server) Run() error {
 	e.Use(middleware.RecoverWithConfig(middleware.RecoverConfig{
 		LogErrorFunc: func(c echo.Context, err error, stack []byte) error {
 			log.ErrorContext(c.Request().Context(), err.Error(), "stack", string(stack))
+			fmt.Println(string(stack))
 			return err
 		},
 	}))
@@ -192,10 +207,11 @@ func (srv *Server) Run() error {
 	e.GET("/api/usercc", srv.userCountryData)
 	e.GET("/api/server/dns/answers/:server", srv.dnsAnswers)
 	e.GET("/api/server/scores/:server/:mode", srv.history)
+	e.GET("/api/dns/counts", srv.dnsQueryCounts)
 
 	if len(ntpconf.WebHostname()) > 0 {
 		e.POST("/api/server/scores/:server/:mode", func(c echo.Context) error {
-			// POST requests used to work
+			// POST requests used to work, so make them not error out
 			mode := c.Param("mode")
 			server := c.Param("server")
 			query := c.Request().URL.Query()
@@ -210,7 +226,7 @@ func (srv *Server) Run() error {
 	}
 	e.GET("/graph/:server/:type", srv.graphImage)
 
-	// e.GET("/api/server/scores/:server/:type", srv.logScores)
+	e.GET("/api/zone/counts/:zone_name", srv.zoneCounts)
 
 	g.Go(func() error {
 		return e.Start(":8030")
@@ -246,7 +262,7 @@ func (srv *Server) userCountryData(c echo.Context) error {
 		log.InfoContext(ctx, "didn't get zoneStats")
 	}
 
-	data, err := srv.ch.UserCountryData(c.Request().Context())
+	data, err := srv.ch.UserCountryData(ctx)
 	if err != nil {
 		log.ErrorContext(ctx, "UserCountryData", "err", err)
 		return c.String(http.StatusInternalServerError, err.Error())
@@ -259,5 +275,90 @@ func (srv *Server) userCountryData(c echo.Context) error {
 		UserCountry: data,
 		ZoneStats:   zoneStats,
 	})
-
+}
+
+func (srv *Server) dnsQueryCounts(c echo.Context) error {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(c.Request().Context(), "dnsQueryCounts")
+	defer span.End()
+
+	data, err := srv.ch.DNSQueries(ctx)
+	if err != nil {
+		log.ErrorContext(ctx, "dnsQueryCounts", "err", err)
+		return c.String(http.StatusInternalServerError, err.Error())
+	}
+
+	hdr := c.Response().Header()
+	hdr.Set("Cache-Control", "s-maxage=30,max-age=60")
+
+	return c.JSON(http.StatusOK, data)
+}
+
+func healthHandler(srv *Server, log *slog.Logger) func(w http.ResponseWriter, req *http.Request) {
+	return func(w http.ResponseWriter, req *http.Request) {
+		ctx := req.Context()
+		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+		defer cancel()
+		g, ctx := errgroup.WithContext(ctx)
+
+		stats := srv.db.Stats()
+		if stats.OpenConnections > 3 {
+			log.InfoContext(ctx, "health requests", "url", req.URL.String(), "stats", stats)
+		}
+
+		if resetParam := req.URL.Query().Get("reset"); resetParam != "" {
+			reset, err := strconv.ParseBool(resetParam)
+			log.InfoContext(ctx, "db reset request", "err", err, "reset", reset)
+
+			if err == nil && reset {
+				// this feature was to debug some specific problem
+				log.InfoContext(ctx, "setting idle db conns to zero")
+				srv.db.SetConnMaxLifetime(30 * time.Second)
+				srv.db.SetMaxIdleConns(0)
+				srv.db.SetMaxIdleConns(4)
+			}
+		}
+
+		g.Go(func() error {
+			err := srv.ch.Scores.Ping(ctx)
+			if err != nil {
+				log.WarnContext(ctx, "ch scores ping", "err", err)
+				return err
+			}
+			return nil
+		})
+
+		g.Go(func() error {
+			err := srv.ch.Logs.Ping(ctx)
+			if err != nil {
+				log.WarnContext(ctx, "ch logs ping", "err", err)
+				return err
+			}
+			return nil
+		})
+
+		g.Go(func() error {
+			err := srv.db.PingContext(ctx)
+			if err != nil {
+				log.WarnContext(ctx, "db ping", "err", err)
+				return err
+			}
+			return nil
+		})
+
+		err := g.Wait()
+		if err != nil {
+			w.WriteHeader(http.StatusServiceUnavailable)
+			_, err = w.Write([]byte("db ping err"))
+			if err != nil {
+				log.ErrorContext(ctx, "could not write response", "err", err)
+			}
+			return
+		}
+		w.WriteHeader(http.StatusOK)
+		_, err = w.Write([]byte("ok"))
+		if err != nil {
+			log.ErrorContext(ctx, "could not write response", "err", err)
+		}
+	}
 }

server/zones.go

@@ -0,0 +1,148 @@
+package server
+
+import (
+	"database/sql"
+	"errors"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/labstack/echo/v4"
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/ntpdb"
+)
+
+func (srv *Server) zoneCounts(c echo.Context) error {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(c.Request().Context(), "zoneCounts")
+	defer span.End()
+
+	// just cache for a short time by default
+	c.Response().Header().Set("Cache-Control", "public,max-age=240")
+	c.Response().Header().Set("Access-Control-Allow-Origin", "*")
+	c.Response().Header().Del("Vary")
+
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+
+	zone, err := q.GetZoneByName(ctx, c.Param("zone_name"))
+	if err != nil || zone.ID == 0 {
+		if errors.Is(err, sql.ErrNoRows) {
+			return c.String(http.StatusNotFound, "Not found")
+		}
+		log.ErrorContext(ctx, "could not query for zone", "err", err)
+		span.RecordError(err)
+		return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
+	}
+
+	counts, err := q.GetZoneCounts(ctx, zone.ID)
+	if err != nil {
+		if !errors.Is(err, sql.ErrNoRows) {
+			log.ErrorContext(ctx, "get counts", "err", err)
+			span.RecordError(err)
+			return c.String(http.StatusInternalServerError, "internal error")
+		}
+	}
+
+	type historyEntry struct {
+		D  string `json:"d"`  // date
+		Ts int    `json:"ts"` // epoch timestamp
+		Rc int    `json:"rc"` // count registered
+		Ac int    `json:"ac"` // count active
+		W  int    `json:"w"`  // netspeed active
+		Iv string `json:"iv"` // ip version
+	}
+
+	rv := struct {
+		History []historyEntry `json:"history"`
+	}{}
+
+	skipCount := 0.0
+	limit := 0
+
+	if limitParam := c.QueryParam("limit"); len(limitParam) > 0 {
+		if limitInt, err := strconv.Atoi(limitParam); err == nil && limitInt > 0 {
+			limit = limitInt
+		}
+	}
+
+	var mostRecentDate int64 = -1
+	if limit > 0 {
+		count := 0
+		dates := map[int64]bool{}
+		for _, c := range counts {
+			ep := c.Date.Unix()
+			if _, ok := dates[ep]; !ok {
+				count++
+				dates[ep] = true
+				mostRecentDate = ep
+			}
+		}
+		if limit < count {
+			if limit > 1 {
+				skipCount = float64(count) / float64(limit-1)
+			} else {
+				// skip everything and use the special logic that we always include the most recent date
+				skipCount = float64(count) + 1
+
+			}
+		}
+
+		log.DebugContext(ctx, "mod", "count", count, "limit", limit, "mod", count%limit, "skipCount", skipCount)
+		// log.Info("limit plan", "date count", count, "limit", limit, "skipCount", skipCount)
+	}
+
+	toSkip := 0.0
+	if limit == 1 {
+		toSkip = skipCount // we just want to look for the last entry
+	}
+	lastDate := int64(0)
+	lastSkip := int64(0)
+	skipThreshold := 0.5
+	for _, c := range counts {
+		cDate := c.Date.Unix()
+		if (toSkip <= skipThreshold && cDate != lastSkip) ||
+			lastDate == cDate ||
+			mostRecentDate == cDate {
+			// log.Info("adding date", "date", c.Date.Format(time.DateOnly))
+			rv.History = append(rv.History, historyEntry{
+				D:  c.Date.Format(time.DateOnly),
+				Ts: int(cDate),
+				Ac: int(c.CountActive),
+				Rc: int(c.CountRegistered),
+				W:  int(c.NetspeedActive),
+				Iv: string(c.IpVersion),
+			})
+			lastDate = cDate
+		} else {
+			// log.Info("skipping date", "date", c.Date.Format(time.DateOnly))
+			if lastSkip == cDate {
+				continue
+			}
+			toSkip--
+			lastSkip = cDate
+			continue
+		}
+		if toSkip <= skipThreshold && skipCount > 0 {
+			toSkip += skipCount
+		}
+
+	}
+
+	if limit > 0 {
+		count := 0
+		dates := map[int]bool{}
+		for _, c := range rv.History {
+			ep := c.Ts
+			if _, ok := dates[ep]; !ok {
+				count++
+				dates[ep] = true
+			}
+		}
+		log.DebugContext(ctx, "result counts", "skipCount", skipCount, "limit", limit, "got", count)
+	}
+
+	c.Response().Header().Set("Cache-Control", "s-maxage=28800, max-age=7200")
+	return c.JSON(http.StatusOK, rv)
+
+}