scores: allow specifying the monitor by name

.drone.yml

@@ -21,7 +21,7 @@ steps:
         memory: 100MiB
 
   - name: test
-    image: golang:1.21.4
+    image: golang:1.21.5
     volumes:
       - name: go
         path: /go
@@ -32,7 +32,7 @@ steps:
       - go build ./...
 
   - name: goreleaser
-    image: golang:1.21.4
+    image: golang:1.21.5
     resources:
       requests:
         cpu: 6000
@@ -81,6 +81,6 @@ volumes:
 
 ---
 kind: signature
-hmac: decaee945fdc81d38afbc85c69e3192f9c798e599af1c7a9d0a2f2c97c806f63
+hmac: c18ddc535490a0402d8eb78dcdeb66ae54feea7b54eee677180d36128f593c98
 
 ...

Dockerfile

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

chdb/chdnsanswers.go

@@ -95,11 +95,14 @@ func (d *ClickHouse) ServerAnswerCounts(ctx context.Context, serverIP string, da
 }
 
 func (d *ClickHouse) AnswerTotals(ctx context.Context, qtype string, days int) (ServerTotals, error) {
-
 	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "AnswerTotals")
+	defer span.End()
 
 	// queries by UserCC / Qtype for the ServerIP
-	rows, err := d.conn.Query(ctx, `
+	rows, err := d.conn.Query(clickhouse.Context(ctx,
+		clickhouse.WithSpan(span.SpanContext()),
+	), `
 	select UserCC,Qtype,sum(queries) as queries
 	from by_server_ip_1d
 	where

cmd/servercmd.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/version"
 	"go.ntppool.org/data-api/server"
 	"golang.org/x/sync/errgroup"
 )
@@ -39,6 +40,8 @@ func (cli *CLI) serverCLI(cmd *cobra.Command, args []string) error {
 
 	g, ctx := errgroup.WithContext(ctx)
 
+	log.Info("starting", "version", version.Version())
+
 	srv, err := server.NewServer(ctx, cfgFile)
 	if err != nil {
 		return fmt.Errorf("srv setup: %s", err)

go.mod

@@ -5,14 +5,18 @@ go 1.21.3
 // replace github.com/samber/slog-echo => github.com/abh/slog-echo v0.0.0-20231024051244-af740639893e
 
 require (
-	github.com/ClickHouse/clickhouse-go/v2 v2.15.0
+	github.com/ClickHouse/clickhouse-go/v2 v2.17.0
 	github.com/go-sql-driver/mysql v1.7.1
-	github.com/labstack/echo/v4 v4.11.3
+	github.com/hashicorp/go-retryablehttp v0.7.5
-	github.com/samber/slog-echo v1.8.0
+	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/common v0.2.5-0.20231112235121-2bff6d8ef307
+	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
@@ -20,36 +24,38 @@ require (
 )
 
 require (
-	github.com/ClickHouse/ch-go v0.58.2 // indirect
+	github.com/ClickHouse/ch-go v0.61.0 // indirect
 	github.com/andybalholm/brotli v1.0.6 // 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/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.0 // indirect
+	github.com/go-faster/errors v0.7.1 // indirect
-	github.com/go-logr/logr v1.3.0 // indirect
+	github.com/go-logr/logr v1.4.0 // 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.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.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.3 // indirect
+	github.com/klauspost/compress v1.17.4 // indirect
-	github.com/labstack/gommon v0.4.1 // indirect
+	github.com/labstack/gommon v0.4.2 // indirect
 	github.com/mattn/go-colorable v0.1.13 // 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.18 // indirect
+	github.com/pierrec/lz4/v4 v4.1.19 // 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.2 // indirect
+	github.com/remychantenay/slog-otel v1.2.3 // indirect
-	github.com/samber/lo v1.38.1 // indirect
+	github.com/samber/lo v1.39.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
@@ -61,15 +67,15 @@ require (
 	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.15.0 // indirect
+	golang.org/x/crypto v0.17.0 // indirect
-	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+	golang.org/x/exp v0.0.0-20231219180239-dc181d75b848 // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/time v0.4.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 )

go.sum

@@ -1,12 +1,10 @@
-github.com/ClickHouse/ch-go v0.58.2 h1:jSm2szHbT9MCAB1rJ3WuCJqmGLi5UTjlNu+f530UTS0=
+github.com/ClickHouse/ch-go v0.61.0 h1:22JYeFJoFNAU/Vod4etAeUEY28cYt7Ixnwqj1+EUfro=
-github.com/ClickHouse/ch-go v0.58.2/go.mod h1:Ap/0bEmiLa14gYjCiRkYGbXvbe8vwdrfTYWhsuQ99aw=
+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.14.3 h1:s9SuU3PfJrfJ4SDbVRo6XM2ZWlr7efvW9Z/ppUpE1vo=
+github.com/ClickHouse/clickhouse-go/v2 v2.16.0 h1:rhMfnPewXPnY4Q4lQRGdYuTLRBRKJEIEYHtbUMrzmvI=
-github.com/ClickHouse/clickhouse-go/v2 v2.14.3/go.mod h1:qdw8IMGH4Y+PedKlf9QEhFO1ATTSFhh4exQRVIa3y2A=
+github.com/ClickHouse/clickhouse-go/v2 v2.16.0/go.mod h1:J7SPfIxwR+x4mQ+o8MLSe0oY50NNntEqCIjFe/T1VPM=
-github.com/ClickHouse/clickhouse-go/v2 v2.15.0 h1:G0hTKyO8fXXR1bGnZ0DY3vTG01xYfOGW76zgjg5tmC4=
+github.com/ClickHouse/clickhouse-go/v2 v2.17.0 h1:xvsVYxOWb2obaIwL9NJZSZ3T/umJSh9P1gf1dfMFlI8=
-github.com/ClickHouse/clickhouse-go/v2 v2.15.0/go.mod h1:kXt1SRq0PIRa6aKZD7TnFnY9PQKmc2b13sHtOYcK6cQ=
+github.com/ClickHouse/clickhouse-go/v2 v2.17.0/go.mod h1:rkGTvFDTLqLIm0ma+13xmcCfr/08Gvs7KmFt1tgiWHQ=
-github.com/abh/slog-echo v0.0.0-20231024051244-af740639893e h1:RkyCTh9poEVRWZi9RWdSkcveX8TM5YVORZtdIeogUlI=
-github.com/abh/slog-echo v0.0.0-20231024051244-af740639893e/go.mod h1:iLkF/wVZhBWabIw4dB+bfbj1TjCd/OXnag0AE8IDFRg=
 github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
 github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -15,22 +13,23 @@ github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqy
 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.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 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/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.6.1 h1:nNIPOBkprlKzkThvS/0YaX8Zs9KewLCOSFQS5BU06FI=
-github.com/go-faster/errors v0.6.1/go.mod h1:5MGV2/2T9yvlrbhe9pD9LO5Z/2zCSq2T8j+Jpi2LAyY=
 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.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
-github.com/go-logr/logr v1.2.4/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/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=
@@ -38,33 +37,32 @@ github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9
 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/glog v1.1.2 h1:DVjP2PbBOzHyzA+dn3WhHIq4NdVu3Q+pvivFICf/7fo=
-github.com/golang/glog v1.1.2/go.mod h1:zR+okUeTbrL6EL3xHUDxZuEtGv04p5shwip1+mL/rLQ=
 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/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.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 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/grpc-ecosystem/grpc-gateway/v2 v2.18.0 h1:RtRsiaGvWxcwd8y3BiRZxsylPT8hLWZ5SPcfI+3IDNk=
+github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0/go.mod h1:TzP6duP4Py2pHLVPPQp42aoYI92+PCrVotyR5e8Vqlk=
+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/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/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.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
+github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
-github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
-github.com/klauspost/compress v1.17.3 h1:qkRjuerhUU1EmXLYGkSH6EZL+vPSxIrYjLNAK4slzwA=
-github.com/klauspost/compress v1.17.3/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 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=
@@ -72,18 +70,16 @@ 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.2 h1:T+cTLQxWCDfqDEoydYm5kCobjmHwOwcv4OJAPHilmdE=
-github.com/labstack/echo/v4 v4.11.2/go.mod h1:UcGuQ8V6ZNRmSweBIJkPvGfwCMIlFmiqrPqiEBfPYws=
 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/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
+github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+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/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+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.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 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=
@@ -96,6 +92,8 @@ github.com/paulmach/orb v0.10.0/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/En
 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/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=
@@ -108,23 +106,21 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne
 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.1 h1:CTsgUd2h3zWDf8/KQSCme+VMw7bdf/BycyGT0rjonSg=
+github.com/remychantenay/slog-otel v1.2.3 h1:uJKRE7vhBEZmJcNyPl2HEI789D8BlgN+ppoEr+UogjY=
-github.com/remychantenay/slog-otel v1.2.1/go.mod h1:YV+vYh8c5i5U2U/QeBxRYelOLdYJ+AYBHy5IIC/XSeo=
+github.com/remychantenay/slog-otel v1.2.3/go.mod h1:Ar2ZBcRfIPyoKV/3Xq4oHmNgKc69juGB0QMUzo1vJOc=
-github.com/remychantenay/slog-otel v1.2.2 h1:EnFH7oq2i83TBstmqHqMEjjRNVWmXMsiybdZxad4Nus=
-github.com/remychantenay/slog-otel v1.2.2/go.mod h1:YV+vYh8c5i5U2U/QeBxRYelOLdYJ+AYBHy5IIC/XSeo=
 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/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
+github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
-github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
-github.com/samber/slog-echo v1.8.0 h1:DQQRtAliSvQw+ScEdu5gv3jbHu9cCTzvHuTD8GDv7zI=
+github.com/samber/slog-echo v1.9.0 h1:1Cvn2/JXAM2ki26uBMbbk0jB9UxZgaE9xM1DVZvLAlo=
-github.com/samber/slog-echo v1.8.0/go.mod h1:0ab2AwcciQXNAXEcjkHwD9okOh9vEHEYn8xP97ocuhM=
+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/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.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
-github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 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=
@@ -134,8 +130,8 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 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/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/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=
@@ -144,7 +140,6 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl
 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=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
@@ -154,53 +149,35 @@ github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7Jul
 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/common v0.2.4 h1:OqKR1OHYayv6AsERAR8RYKdOEigJqXBpqkGWlaGF3+Q=
+go.ntppool.org/api v0.1.7/go.mod h1:PFWNS+pjJx+gnRphEZiyTCr1XnISZrn6ZBXv1C8Eqa4=
-go.ntppool.org/common v0.2.4/go.mod h1:kYshXIaeI13tj6CSW56KHkcwp0lJbM8bFCe3tm3BZEQ=
+go.ntppool.org/api v0.1.8-0.20231209235224-e3d38c8b1c15 h1:xzvsIUwRajlVQsRRrXjklhj63fsw2B83LZ3gbfhGFsk=
-go.ntppool.org/common v0.2.5-0.20231112235121-2bff6d8ef307 h1:bJPpvb3aP3sIdO/ptxH9Jqhksk0+c5qQBSa/xHLhscc=
+go.ntppool.org/api v0.1.8-0.20231209235224-e3d38c8b1c15/go.mod h1:9FKbwWfF7eRU7GZVEI3wUYv71ZKt16cLCGfxLayzS2Q=
-go.ntppool.org/common v0.2.5-0.20231112235121-2bff6d8ef307/go.mod h1:kYshXIaeI13tj6CSW56KHkcwp0lJbM8bFCe3tm3BZEQ=
+go.ntppool.org/api v0.1.8-0.20231210025001-f2c143296511 h1:ilTOX5NQcdDiNohhDexUevUrhDFDOrlB7uCM0ilQsLs=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.45.0 h1:JJCIHAxGCB5HM3NxeIwFjHc087Xwk96TG9kaZU6TAec=
+go.ntppool.org/api v0.1.8-0.20231210025001-f2c143296511/go.mod h1:9FKbwWfF7eRU7GZVEI3wUYv71ZKt16cLCGfxLayzS2Q=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.45.0/go.mod h1:Px9kH7SJ+NhsgWRtD/eMcs15Tyt4uL3rM7X54qv6pfA=
+go.ntppool.org/common v0.2.5 h1:fvuFrCCbmaRzZOSwv71+yhqVLOTDB/fD7YlscdGa6qs=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.0 h1:gYRavGiL75s1rM1MYzWbq6ptn02tnUt4t3HtDEaeVhE=
+go.ntppool.org/common v0.2.5/go.mod h1:Cw8mq8jd2sLCxbTNzYXKXn3qKo2ZLERZ6V/eLcSgDHw=
-go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.0/go.mod h1:XnbQgDkVMrAxz8+hbgLtSiYVO6HTo2D1z9SDlY1gU/Y=
+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/propagators/b3 v1.20.0 h1:Yty9Vs4F3D6/liF1o6FNt0PvN85h/BJJ6DQKJ3nrcM0=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 h1:gbhw/u49SS3gkPWiYweQNJGm/uJN5GkI/FrosxSHT7A=
-go.opentelemetry.io/contrib/propagators/b3 v1.20.0/go.mod h1:On4VgbkqYL18kbJlWsa18+cMNe6rYpBnPi1ARI/BrsU=
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1/go.mod h1:GnOaBaFQ2we3b9AGWJpsBa7v1S5RlQzlC3O7dRMxZhM=
-go.opentelemetry.io/contrib/propagators/b3 v1.21.0 h1:uGdgDPNzwQWRwCXJgw/7h29JaRqcq9B87Iv4hJDKAZw=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 h1:aFJWCqJMNjENlcleuuOkGAPH82y0yULBScfXcIEdS24=
-go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1/go.mod h1:sEGXWArGqc3tVa+ekntsN65DmVbVeW+7lTKTjZF3/Fo=
-go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY=
+go.opentelemetry.io/contrib/propagators/b3 v1.21.1 h1:WPYiUgmw3+b7b3sQ1bFBFAf0q+Di9dvNc3AtYfnT4RQ=
-go.opentelemetry.io/otel v1.20.0 h1:vsb/ggIY+hUjD/zCAQHpzTmndPqv/ml2ArbsbfBYTAc=
+go.opentelemetry.io/contrib/propagators/b3 v1.21.1/go.mod h1:EmzokPoSqsYMBVK4nRnhsfm5mbn8J1eDuz/U1UaQaWg=
-go.opentelemetry.io/otel v1.20.0/go.mod h1:oUIGj3D77RwJdM6PPZImDpSZGDvkD9fhesHny69JFrs=
 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.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0/go.mod h1:IPtUMKL4O3tH5y+iXVyAXqpAwMuzC1IrxVS81rummfE=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0 h1:DeFD0VgTZ+Cj6hxravYYZE2W4GlneVH81iAOPjZkzk8=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.20.0/go.mod h1:GijYcYmNpX1KazD5JmWGsi4P7dDTTTnfv1UbGn84MnU=
 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.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0 h1:CsBiKCiQPdSjS+MlRiqeTI9JDDpSuk0Hb6QTRfwer8k=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.20.0/go.mod h1:CMJYNAfooOwSZSAmAeMUV1M+TXld3BiK++z9fqIm2xk=
 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.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE=
-go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8=
-go.opentelemetry.io/otel/metric v1.20.0 h1:ZlrO8Hu9+GAhnepmRGhSU7/VkpjrNowxRN9GyKR4wzA=
-go.opentelemetry.io/otel/metric v1.20.0/go.mod h1:90DRw3nfK4D7Sm/75yQ00gTJxtkBxX+wu6YaNymbpVM=
 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.19.0 h1:6USY6zH+L8uMH8L3t1enZPR3WFEmSTADlqldyHtJi3o=
-go.opentelemetry.io/otel/sdk v1.19.0/go.mod h1:NedEbbS4w3C6zElbLdPJKOpJQOrGUJ+GfzpjUvI0v1A=
-go.opentelemetry.io/otel/sdk v1.20.0 h1:5Jf6imeFZlZtKv9Qbo6qt2ZkmWtdWx/wzcCbNUlAWGM=
-go.opentelemetry.io/otel/sdk v1.20.0/go.mod h1:rmkSx1cZCm/tn16iWDn1GQbLtsW/LvsdEEFzCSRM6V0=
 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.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg=
-go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo=
-go.opentelemetry.io/otel/trace v1.20.0 h1:+yxVAPZPbQhbC3OfAkeIVTky6iTFpcr4SiY9om7mXSQ=
-go.opentelemetry.io/otel/trace v1.20.0/go.mod h1:HJSK7F/hA5RlzpZ0zKDCHCDHm556LCDtKaAo6JmBFUU=
 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=
@@ -209,18 +186,18 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 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.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
-golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb h1:c0vyKkb6yr3KR7jEfJaOSv4lG7xPkbN6r52aJz1d8a8=
-golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
+golang.org/x/exp v0.0.0-20231206192017-f3f8817b8deb/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa h1:FRnLl4eNAQl8hwxVVC17teOw8kdjVDVAiFMtgUdTSRQ=
+golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 h1:qCEDpW1G+vcj3Y7Fy52pEM1AWm3abj8WimGYejI3SC4=
-golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa/go.mod h1:zk2irFbV9DP96SEBUUAy67IdHUaZuSnrz1n472HUCLE=
+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/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.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
-golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 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/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -228,16 +205,12 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL
 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.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
-golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
-golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
 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.4.0 h1:zxkM55ReGkDlKSM+Fu41A+zmbZuaPVbGMzvvdUPznYQ=
-golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 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/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -246,28 +219,19 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/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.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
-golang.org/x/sys v0.14.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.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 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.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
-golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY=
-golang.org/x/time v0.4.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=
@@ -276,22 +240,22 @@ 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-20231012201019-e917dd12ba7a h1:fwgW9j3vHirt4ObdHoYNwuO24BEZjSzbh+zPaNWoiY8=
+google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f h1:Vn+VyHU5guc9KjB5KrjI2q0wCOWEOIh0OEsleqakHJg=
-google.golang.org/genproto v0.0.0-20231012201019-e917dd12ba7a/go.mod h1:EMfReVxb80Dq1hhioy0sOsY9jCE46YDgHlJ7fWVUWRE=
+google.golang.org/genproto v0.0.0-20231120223509-83a465c0220f/go.mod h1:nWSwAFPb+qfNJXsoeO3Io7zf4tMSfN8EA8RlDA04GhY=
-google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k=
+google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 h1:ZcOkrmX74HbKFYnpPY8Qsw93fC29TbJXspYKaBkSXDQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870=
+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-20231106174013-bbf56f31fb17 h1:JpwMPBpFN3uKhdaekDpiNlImDdkUAyiJ6ez/uxGaUSo=
+google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 h1:s1w3X6gQxwrLEpxnLd/qXTVLgQE2yXwaOaoa6IlY/+o=
-google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:0xJLfVdJqpAPl8tDg1ujOCGzx6LFLttXT5NhllGOXY4=
+google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0/go.mod h1:CAny0tYF+0/9rmDB9fahA9YLzX3+AEVl1qXbv5hhj6c=
-google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f h1:2yNACc1O40tTnrsbk9Cv6oxiW8pxI/pXj0wRtdlYmgY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 h1:DC7wcm+i+P1rN3Ff07vL+OndGg5OhNddHyTA+ocPqYE=
-google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f/go.mod h1:Uy9bTZJqmfrw2rIBxgGLnamc78euZULUBrLZ9XTITKI=
+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-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 h1:/jFB8jK5R3Sq3i/lmeZO0cATSzFfZaJq1J2Euan3XKU=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0/go.mod h1:FUoWkonphQm3RhTS+kOEhF8h0iDpm4tdXolVCeZ9KKA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 h1:Jyp0Hsi0bmHXG6k9eATXoYtjd6e2UzZ1SCn/wIupY14=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17/go.mod h1:oQ5rr10WTTMvP4A36n8JpR1OrO1BEiV4f78CneXZxkA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
 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/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=
@@ -302,6 +266,5 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

logscores/history.go

@@ -0,0 +1,82 @@
+package logscores
+
+import (
+	"context"
+	"database/sql"
+	"time"
+
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/ntpdb"
+	"go.opentelemetry.io/otel/attribute"
+)
+
+type LogScoreHistory struct {
+	LogScores  []ntpdb.LogScore
+	Monitors   map[int]string
+	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")
+	defer span.End()
+
+	if count == 0 {
+		count = 200
+	}
+
+	span.SetAttributes(
+		attribute.Int("server", int(serverID)),
+		attribute.Int("monitor", int(monitorID)),
+	)
+
+	log.Debug("GetHistory", "server", serverID, "monitor", monitorID, "since", since, "count", count)
+
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(db))
+
+	var ls []ntpdb.LogScore
+	var err error
+	if monitorID > 0 {
+		ls, err = q.GetServerLogScoresByMonitorID(ctx, ntpdb.GetServerLogScoresByMonitorIDParams{
+			ServerID:  serverID,
+			MonitorID: sql.NullInt32{Int32: int32(monitorID), Valid: true},
+			Limit:     int32(count),
+		})
+	} else {
+		ls, err = q.GetServerLogScores(ctx, ntpdb.GetServerLogScoresParams{
+			ServerID: serverID,
+			Limit:    int32(count),
+		})
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	monitors := map[int]string{}
+	monitorIDs := []uint32{}
+	for _, l := range ls {
+		if !l.MonitorID.Valid {
+			continue
+		}
+		mID := uint32(l.MonitorID.Int32)
+		if _, ok := monitors[int(mID)]; !ok {
+			monitors[int(mID)] = ""
+			monitorIDs = append(monitorIDs, mID)
+		}
+	}
+
+	dbmons, err := q.GetMonitorsByID(ctx, monitorIDs)
+	if err != nil {
+		return nil, err
+	}
+	for _, m := range dbmons {
+		monitors[int(m.ID)] = m.DisplayName()
+	}
+
+	return &LogScoreHistory{
+		LogScores:  ls,
+		Monitors:   monitors,
+		MonitorIDs: monitorIDs,
+	}, nil
+}

ntpdb/db.go

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

ntpdb/models.go

@@ -1,14 +1,232 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.22.0
+//   sqlc v1.24.0
 
 package ntpdb
 
 import (
+	"database/sql"
 	"database/sql/driver"
 	"fmt"
+	"time"
+
+	"go.ntppool.org/common/types"
 )
 
+type MonitorsIpVersion string
+
+const (
+	MonitorsIpVersionV4 MonitorsIpVersion = "v4"
+	MonitorsIpVersionV6 MonitorsIpVersion = "v6"
+)
+
+func (e *MonitorsIpVersion) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = MonitorsIpVersion(s)
+	case string:
+		*e = MonitorsIpVersion(s)
+	default:
+		return fmt.Errorf("unsupported scan type for MonitorsIpVersion: %T", src)
+	}
+	return nil
+}
+
+type NullMonitorsIpVersion struct {
+	MonitorsIpVersion MonitorsIpVersion `json:"monitors_ip_version"`
+	Valid             bool              `json:"valid"` // Valid is true if MonitorsIpVersion is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullMonitorsIpVersion) Scan(value interface{}) error {
+	if value == nil {
+		ns.MonitorsIpVersion, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.MonitorsIpVersion.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullMonitorsIpVersion) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.MonitorsIpVersion), nil
+}
+
+type MonitorsStatus string
+
+const (
+	MonitorsStatusPending MonitorsStatus = "pending"
+	MonitorsStatusTesting MonitorsStatus = "testing"
+	MonitorsStatusActive  MonitorsStatus = "active"
+	MonitorsStatusPaused  MonitorsStatus = "paused"
+	MonitorsStatusDeleted MonitorsStatus = "deleted"
+)
+
+func (e *MonitorsStatus) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = MonitorsStatus(s)
+	case string:
+		*e = MonitorsStatus(s)
+	default:
+		return fmt.Errorf("unsupported scan type for MonitorsStatus: %T", src)
+	}
+	return nil
+}
+
+type NullMonitorsStatus struct {
+	MonitorsStatus MonitorsStatus `json:"monitors_status"`
+	Valid          bool           `json:"valid"` // Valid is true if MonitorsStatus is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullMonitorsStatus) Scan(value interface{}) error {
+	if value == nil {
+		ns.MonitorsStatus, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.MonitorsStatus.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullMonitorsStatus) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.MonitorsStatus), nil
+}
+
+type MonitorsType string
+
+const (
+	MonitorsTypeMonitor MonitorsType = "monitor"
+	MonitorsTypeScore   MonitorsType = "score"
+)
+
+func (e *MonitorsType) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = MonitorsType(s)
+	case string:
+		*e = MonitorsType(s)
+	default:
+		return fmt.Errorf("unsupported scan type for MonitorsType: %T", src)
+	}
+	return nil
+}
+
+type NullMonitorsType struct {
+	MonitorsType MonitorsType `json:"monitors_type"`
+	Valid        bool         `json:"valid"` // Valid is true if MonitorsType is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullMonitorsType) Scan(value interface{}) error {
+	if value == nil {
+		ns.MonitorsType, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.MonitorsType.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullMonitorsType) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.MonitorsType), nil
+}
+
+type ServerScoresStatus string
+
+const (
+	ServerScoresStatusNew     ServerScoresStatus = "new"
+	ServerScoresStatusTesting ServerScoresStatus = "testing"
+	ServerScoresStatusActive  ServerScoresStatus = "active"
+)
+
+func (e *ServerScoresStatus) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = ServerScoresStatus(s)
+	case string:
+		*e = ServerScoresStatus(s)
+	default:
+		return fmt.Errorf("unsupported scan type for ServerScoresStatus: %T", src)
+	}
+	return nil
+}
+
+type NullServerScoresStatus struct {
+	ServerScoresStatus ServerScoresStatus `json:"server_scores_status"`
+	Valid              bool               `json:"valid"` // Valid is true if ServerScoresStatus is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullServerScoresStatus) Scan(value interface{}) error {
+	if value == nil {
+		ns.ServerScoresStatus, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.ServerScoresStatus.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullServerScoresStatus) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.ServerScoresStatus), nil
+}
+
+type ServersIpVersion string
+
+const (
+	ServersIpVersionV4 ServersIpVersion = "v4"
+	ServersIpVersionV6 ServersIpVersion = "v6"
+)
+
+func (e *ServersIpVersion) Scan(src interface{}) error {
+	switch s := src.(type) {
+	case []byte:
+		*e = ServersIpVersion(s)
+	case string:
+		*e = ServersIpVersion(s)
+	default:
+		return fmt.Errorf("unsupported scan type for ServersIpVersion: %T", src)
+	}
+	return nil
+}
+
+type NullServersIpVersion struct {
+	ServersIpVersion ServersIpVersion `json:"servers_ip_version"`
+	Valid            bool             `json:"valid"` // Valid is true if ServersIpVersion is not NULL
+}
+
+// Scan implements the Scanner interface.
+func (ns *NullServersIpVersion) Scan(value interface{}) error {
+	if value == nil {
+		ns.ServersIpVersion, ns.Valid = "", false
+		return nil
+	}
+	ns.Valid = true
+	return ns.ServersIpVersion.Scan(value)
+}
+
+// Value implements the driver Valuer interface.
+func (ns NullServersIpVersion) Value() (driver.Value, error) {
+	if !ns.Valid {
+		return nil, nil
+	}
+	return string(ns.ServersIpVersion), nil
+}
+
 type ZoneServerCountsIpVersion string
 
 const (
@@ -50,3 +268,52 @@ func (ns NullZoneServerCountsIpVersion) Value() (driver.Value, error) {
 	}
 	return string(ns.ZoneServerCountsIpVersion), nil
 }
+
+type LogScore struct {
+	ID         uint64                   `db:"id" json:"id"`
+	MonitorID  sql.NullInt32            `db:"monitor_id" json:"monitor_id"`
+	ServerID   uint32                   `db:"server_id" json:"server_id"`
+	Ts         time.Time                `db:"ts" json:"ts"`
+	Score      float64                  `db:"score" json:"score"`
+	Step       float64                  `db:"step" json:"step"`
+	Offset     sql.NullFloat64          `db:"offset" json:"offset"`
+	Rtt        sql.NullInt32            `db:"rtt" json:"rtt"`
+	Attributes types.LogScoreAttributes `db:"attributes" json:"attributes"`
+}
+
+type Monitor struct {
+	ID            uint32                `db:"id" json:"id"`
+	Type          MonitorsType          `db:"type" json:"type"`
+	UserID        sql.NullInt32         `db:"user_id" json:"user_id"`
+	AccountID     sql.NullInt32         `db:"account_id" json:"account_id"`
+	Name          string                `db:"name" json:"name"`
+	Location      string                `db:"location" json:"location"`
+	Ip            sql.NullString        `db:"ip" json:"ip"`
+	IpVersion     NullMonitorsIpVersion `db:"ip_version" json:"ip_version"`
+	TlsName       sql.NullString        `db:"tls_name" json:"tls_name"`
+	ApiKey        sql.NullString        `db:"api_key" json:"api_key"`
+	Status        MonitorsStatus        `db:"status" json:"status"`
+	Config        string                `db:"config" json:"config"`
+	ClientVersion string                `db:"client_version" json:"client_version"`
+	LastSeen      sql.NullTime          `db:"last_seen" json:"last_seen"`
+	LastSubmit    sql.NullTime          `db:"last_submit" json:"last_submit"`
+	CreatedOn     time.Time             `db:"created_on" json:"created_on"`
+}
+
+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"`
+	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"`
+	Netspeed     uint32           `db:"netspeed" json:"netspeed"`
+	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"`
+}

ntpdb/monitor.go

@@ -0,0 +1,23 @@
+package ntpdb
+
+import (
+	"strconv"
+	"strings"
+)
+
+func (m *Monitor) DisplayName() string {
+	switch {
+	case len(m.Name) > 0:
+		return m.Name
+	case m.TlsName.Valid && len(m.TlsName.String) > 0:
+		name := m.TlsName.String
+		if idx := strings.Index(name, "."); idx > 0 {
+			name = name[0:idx]
+		}
+		return name
+	case len(m.Location) > 0:
+		return m.Location + " (" + strconv.Itoa(int(m.ID)) + ")" // todo: IDToken instead of ID
+	default:
+		return strconv.Itoa(int(m.ID)) // todo: IDToken
+	}
+}

ntpdb/otel.go

@@ -8,6 +8,7 @@ package ntpdb
 
 import (
 	"context"
+	"database/sql"
 
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -78,6 +79,144 @@ func (_d QuerierTxWithTracing) Commit(ctx context.Context) (err error) {
 	return _d.QuerierTx.Commit(ctx)
 }
 
+// GetMonitorByName implements QuerierTx
+func (_d QuerierTxWithTracing) GetMonitorByName(ctx context.Context, tlsName sql.NullString) (m1 Monitor, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetMonitorByName")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx":     ctx,
+				"tlsName": tlsName}, map[string]interface{}{
+				"m1":  m1,
+				"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.GetMonitorByName(ctx, tlsName)
+}
+
+// GetMonitorsByID implements QuerierTx
+func (_d QuerierTxWithTracing) GetMonitorsByID(ctx context.Context, monitorids []uint32) (ma1 []Monitor, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetMonitorsByID")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx":        ctx,
+				"monitorids": monitorids}, map[string]interface{}{
+				"ma1": ma1,
+				"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.GetMonitorsByID(ctx, monitorids)
+}
+
+// GetServerByID implements QuerierTx
+func (_d QuerierTxWithTracing) GetServerByID(ctx context.Context, id uint32) (s1 Server, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerByID")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx": ctx,
+				"id":  id}, map[string]interface{}{
+				"s1":  s1,
+				"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.GetServerByID(ctx, id)
+}
+
+// GetServerByIP implements QuerierTx
+func (_d QuerierTxWithTracing) GetServerByIP(ctx context.Context, ip string) (s1 Server, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerByIP")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx": ctx,
+				"ip":  ip}, map[string]interface{}{
+				"s1":  s1,
+				"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.GetServerByIP(ctx, ip)
+}
+
+// GetServerLogScores implements QuerierTx
+func (_d QuerierTxWithTracing) GetServerLogScores(ctx context.Context, arg GetServerLogScoresParams) (la1 []LogScore, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerLogScores")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx": ctx,
+				"arg": arg}, map[string]interface{}{
+				"la1": la1,
+				"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.GetServerLogScores(ctx, arg)
+}
+
+// GetServerLogScoresByMonitorID implements QuerierTx
+func (_d QuerierTxWithTracing) GetServerLogScoresByMonitorID(ctx context.Context, arg GetServerLogScoresByMonitorIDParams) (la1 []LogScore, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerLogScoresByMonitorID")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx": ctx,
+				"arg": arg}, map[string]interface{}{
+				"la1": la1,
+				"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.GetServerLogScoresByMonitorID(ctx, arg)
+}
+
 // GetServerNetspeed implements QuerierTx
 func (_d QuerierTxWithTracing) GetServerNetspeed(ctx context.Context, ip string) (u1 uint32, err error) {
 	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerNetspeed")
@@ -101,6 +240,29 @@ func (_d QuerierTxWithTracing) GetServerNetspeed(ctx context.Context, ip string)
 	return _d.QuerierTx.GetServerNetspeed(ctx, ip)
 }
 
+// GetServerScores implements QuerierTx
+func (_d QuerierTxWithTracing) GetServerScores(ctx context.Context, arg GetServerScoresParams) (ga1 []GetServerScoresRow, err error) {
+	ctx, _span := otel.Tracer(_d._instance).Start(ctx, "QuerierTx.GetServerScores")
+	defer func() {
+		if _d._spanDecorator != nil {
+			_d._spanDecorator(_span, map[string]interface{}{
+				"ctx": ctx,
+				"arg": arg}, map[string]interface{}{
+				"ga1": ga1,
+				"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.GetServerScores(ctx, arg)
+}
+
 // 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,15 +1,23 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.22.0
+//   sqlc v1.24.0
 
 package ntpdb
 
 import (
 	"context"
+	"database/sql"
 )
 
 type Querier interface {
+	GetMonitorByName(ctx context.Context, tlsName sql.NullString) (Monitor, error)
+	GetMonitorsByID(ctx context.Context, monitorids []uint32) ([]Monitor, error)
+	GetServerByID(ctx context.Context, id uint32) (Server, error)
+	GetServerByIP(ctx context.Context, ip string) (Server, error)
+	GetServerLogScores(ctx context.Context, arg GetServerLogScoresParams) ([]LogScore, error)
+	GetServerLogScoresByMonitorID(ctx context.Context, arg GetServerLogScoresByMonitorIDParams) ([]LogScore, error)
 	GetServerNetspeed(ctx context.Context, ip string) (uint32, error)
+	GetServerScores(ctx context.Context, arg GetServerScoresParams) ([]GetServerScoresRow, error)
 	GetZoneStatsData(ctx context.Context) ([]GetZoneStatsDataRow, error)
 	GetZoneStatsV2(ctx context.Context, ip string) ([]GetZoneStatsV2Row, error)
 }

ntpdb/query.sql.go

@@ -1,15 +1,256 @@
 // Code generated by sqlc. DO NOT EDIT.
 // versions:
-//   sqlc v1.22.0
+//   sqlc v1.24.0
 // source: query.sql
 
 package ntpdb
 
 import (
 	"context"
+	"database/sql"
+	"strings"
 	"time"
 )
 
+const getMonitorByName = `-- name: GetMonitorByName :one
+select id, type, user_id, account_id, name, location, ip, ip_version, tls_name, api_key, status, config, client_version, last_seen, last_submit, created_on from monitors
+where
+  tls_name like ?
+  order by id
+  limit 1
+`
+
+func (q *Queries) GetMonitorByName(ctx context.Context, tlsName sql.NullString) (Monitor, error) {
+	row := q.db.QueryRowContext(ctx, getMonitorByName, tlsName)
+	var i Monitor
+	err := row.Scan(
+		&i.ID,
+		&i.Type,
+		&i.UserID,
+		&i.AccountID,
+		&i.Name,
+		&i.Location,
+		&i.Ip,
+		&i.IpVersion,
+		&i.TlsName,
+		&i.ApiKey,
+		&i.Status,
+		&i.Config,
+		&i.ClientVersion,
+		&i.LastSeen,
+		&i.LastSubmit,
+		&i.CreatedOn,
+	)
+	return i, err
+}
+
+const getMonitorsByID = `-- name: GetMonitorsByID :many
+select id, type, user_id, account_id, name, location, ip, ip_version, tls_name, api_key, status, config, client_version, last_seen, last_submit, created_on from monitors
+where id in (/*SLICE:MonitorIDs*/?)
+`
+
+func (q *Queries) GetMonitorsByID(ctx context.Context, monitorids []uint32) ([]Monitor, error) {
+	query := getMonitorsByID
+	var queryParams []interface{}
+	if len(monitorids) > 0 {
+		for _, v := range monitorids {
+			queryParams = append(queryParams, v)
+		}
+		query = strings.Replace(query, "/*SLICE:MonitorIDs*/?", strings.Repeat(",?", len(monitorids))[1:], 1)
+	} else {
+		query = strings.Replace(query, "/*SLICE:MonitorIDs*/?", "NULL", 1)
+	}
+	rows, err := q.db.QueryContext(ctx, query, queryParams...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Monitor
+	for rows.Next() {
+		var i Monitor
+		if err := rows.Scan(
+			&i.ID,
+			&i.Type,
+			&i.UserID,
+			&i.AccountID,
+			&i.Name,
+			&i.Location,
+			&i.Ip,
+			&i.IpVersion,
+			&i.TlsName,
+			&i.ApiKey,
+			&i.Status,
+			&i.Config,
+			&i.ClientVersion,
+			&i.LastSeen,
+			&i.LastSubmit,
+			&i.CreatedOn,
+		); 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 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
+where
+  id = ?
+`
+
+func (q *Queries) GetServerByID(ctx context.Context, id uint32) (Server, error) {
+	row := q.db.QueryRowContext(ctx, getServerByID, id)
+	var i Server
+	err := row.Scan(
+		&i.ID,
+		&i.Ip,
+		&i.IpVersion,
+		&i.UserID,
+		&i.AccountID,
+		&i.Hostname,
+		&i.Stratum,
+		&i.InPool,
+		&i.InServerList,
+		&i.Netspeed,
+		&i.CreatedOn,
+		&i.UpdatedOn,
+		&i.ScoreTs,
+		&i.ScoreRaw,
+		&i.DeletionOn,
+	)
+	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
+where
+  ip = ?
+`
+
+func (q *Queries) GetServerByIP(ctx context.Context, ip string) (Server, error) {
+	row := q.db.QueryRowContext(ctx, getServerByIP, ip)
+	var i Server
+	err := row.Scan(
+		&i.ID,
+		&i.Ip,
+		&i.IpVersion,
+		&i.UserID,
+		&i.AccountID,
+		&i.Hostname,
+		&i.Stratum,
+		&i.InPool,
+		&i.InServerList,
+		&i.Netspeed,
+		&i.CreatedOn,
+		&i.UpdatedOn,
+		&i.ScoreTs,
+		&i.ScoreRaw,
+		&i.DeletionOn,
+	)
+	return i, err
+}
+
+const getServerLogScores = `-- name: GetServerLogScores :many
+select id, monitor_id, server_id, ts, score, step, offset, rtt, attributes from log_scores
+where
+  server_id = ?
+  order by ts desc
+  limit ?
+`
+
+type GetServerLogScoresParams struct {
+	ServerID uint32 `db:"server_id" json:"server_id"`
+	Limit    int32  `db:"limit" json:"limit"`
+}
+
+func (q *Queries) GetServerLogScores(ctx context.Context, arg GetServerLogScoresParams) ([]LogScore, error) {
+	rows, err := q.db.QueryContext(ctx, getServerLogScores, arg.ServerID, arg.Limit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []LogScore
+	for rows.Next() {
+		var i LogScore
+		if err := rows.Scan(
+			&i.ID,
+			&i.MonitorID,
+			&i.ServerID,
+			&i.Ts,
+			&i.Score,
+			&i.Step,
+			&i.Offset,
+			&i.Rtt,
+			&i.Attributes,
+		); 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 getServerLogScoresByMonitorID = `-- name: GetServerLogScoresByMonitorID :many
+select id, monitor_id, server_id, ts, score, step, offset, rtt, attributes from log_scores
+where
+  server_id = ? AND
+  monitor_id = ?
+  order by ts desc
+  limit ?
+`
+
+type GetServerLogScoresByMonitorIDParams struct {
+	ServerID  uint32        `db:"server_id" json:"server_id"`
+	MonitorID sql.NullInt32 `db:"monitor_id" json:"monitor_id"`
+	Limit     int32         `db:"limit" json:"limit"`
+}
+
+func (q *Queries) GetServerLogScoresByMonitorID(ctx context.Context, arg GetServerLogScoresByMonitorIDParams) ([]LogScore, error) {
+	rows, err := q.db.QueryContext(ctx, getServerLogScoresByMonitorID, arg.ServerID, arg.MonitorID, arg.Limit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []LogScore
+	for rows.Next() {
+		var i LogScore
+		if err := rows.Scan(
+			&i.ID,
+			&i.MonitorID,
+			&i.ServerID,
+			&i.Ts,
+			&i.Score,
+			&i.Step,
+			&i.Offset,
+			&i.Rtt,
+			&i.Attributes,
+		); 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 getServerNetspeed = `-- name: GetServerNetspeed :one
 select netspeed from servers where ip = ?
 `
@@ -21,6 +262,77 @@ func (q *Queries) GetServerNetspeed(ctx context.Context, ip string) (uint32, err
 	return netspeed, err
 }
 
+const getServerScores = `-- name: GetServerScores :many
+select
+    m.id, m.name, m.tls_name, m.location, m.type,
+    ss.score_raw, ss.score_ts, ss.status
+  from server_scores ss
+    inner join monitors m
+      on (m.id=ss.monitor_id)
+where
+  server_id = ? AND
+  monitor_id in (/*SLICE:MonitorIDs*/?)
+`
+
+type GetServerScoresParams struct {
+	ServerID   uint32   `db:"server_id" json:"server_id"`
+	MonitorIDs []uint32 `db:"MonitorIDs" json:"MonitorIDs"`
+}
+
+type GetServerScoresRow struct {
+	ID       uint32             `db:"id" json:"id"`
+	Name     string             `db:"name" json:"name"`
+	TlsName  sql.NullString     `db:"tls_name" json:"tls_name"`
+	Location string             `db:"location" json:"location"`
+	Type     MonitorsType       `db:"type" json:"type"`
+	ScoreRaw float64            `db:"score_raw" json:"score_raw"`
+	ScoreTs  sql.NullTime       `db:"score_ts" json:"score_ts"`
+	Status   ServerScoresStatus `db:"status" json:"status"`
+}
+
+func (q *Queries) GetServerScores(ctx context.Context, arg GetServerScoresParams) ([]GetServerScoresRow, error) {
+	query := getServerScores
+	var queryParams []interface{}
+	queryParams = append(queryParams, arg.ServerID)
+	if len(arg.MonitorIDs) > 0 {
+		for _, v := range arg.MonitorIDs {
+			queryParams = append(queryParams, v)
+		}
+		query = strings.Replace(query, "/*SLICE:MonitorIDs*/?", strings.Repeat(",?", len(arg.MonitorIDs))[1:], 1)
+	} else {
+		query = strings.Replace(query, "/*SLICE:MonitorIDs*/?", "NULL", 1)
+	}
+	rows, err := q.db.QueryContext(ctx, query, queryParams...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []GetServerScoresRow
+	for rows.Next() {
+		var i GetServerScoresRow
+		if err := rows.Scan(
+			&i.ID,
+			&i.Name,
+			&i.TlsName,
+			&i.Location,
+			&i.Type,
+			&i.ScoreRaw,
+			&i.ScoreTs,
+			&i.Status,
+		); 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)

ntpdb/server.go

@@ -0,0 +1,16 @@
+package ntpdb
+
+import "time"
+
+func (s *Server) DeletionAge(dur time.Duration) bool {
+	if !s.DeletionOn.Valid {
+		return false
+	}
+	if dur > 0 {
+		dur = dur * -1
+	}
+	if s.DeletionOn.Time.Before(time.Now().Add(dur)) {
+		return true
+	}
+	return false
+}

query.sql

@@ -35,4 +35,51 @@ WHERE
 	AND in_pool = 1
 	AND netspeed > 0
 GROUP BY z.name)
-AS server_netspeed
+AS server_netspeed;
+
+-- name: GetServerByID :one
+select * from servers
+where
+  id = ?;
+
+-- name: GetServerByIP :one
+select * from servers
+where
+  ip = sqlc.arg(ip);
+
+-- name: GetMonitorByName :one
+select * from monitors
+where
+  tls_name like sqlc.arg('tls_name')
+  order by id
+  limit 1;
+
+-- name: GetMonitorsByID :many
+select * from monitors
+where id in (sqlc.slice('MonitorIDs'));
+
+-- name: GetServerScores :many
+select
+    m.id, m.name, m.tls_name, m.location, m.type,
+    ss.score_raw, ss.score_ts, ss.status
+  from server_scores ss
+    inner join monitors m
+      on (m.id=ss.monitor_id)
+where
+  server_id = ? AND
+  monitor_id in (sqlc.slice('MonitorIDs'));
+
+-- name: GetServerLogScores :many
+select * from log_scores
+where
+  server_id = ?
+  order by ts desc
+  limit ?;
+
+-- name: GetServerLogScoresByMonitorID :many
+select * from log_scores
+where
+  server_id = ? AND
+  monitor_id = ?
+  order by ts desc
+  limit ?;

server/dnsanswers.go

@@ -24,9 +24,7 @@ const pointSymbol = "‱"
 
 func (srv *Server) dnsAnswers(c echo.Context) error {
 	log := logger.Setup()
-	ctx := c.Request().Context()
+	ctx, span := tracing.Tracer().Start(c.Request().Context(), "dnsanswers")
-
-	ctx, span := tracing.Tracer().Start(ctx, "dnsanswers")
 	defer span.End()
 
 	// for errors and 404s, a shorter cache time
@@ -89,7 +87,7 @@ func (srv *Server) dnsAnswers(c echo.Context) error {
 
 	queryGroup.Go(func() error {
 		var err error
-		serverData, err = srv.ch.ServerAnswerCounts(c.Request().Context(), ip.String(), days)
+		serverData, err = srv.ch.ServerAnswerCounts(ctx, ip.String(), days)
 		if err != nil {
 			log.Error("ServerUserCCData", "err", err)
 			return err
@@ -107,7 +105,7 @@ func (srv *Server) dnsAnswers(c echo.Context) error {
 			qtype = "AAAA"
 		}
 
-		totalData, err = srv.ch.AnswerTotals(c.Request().Context(), qtype, days)
+		totalData, err = srv.ch.AnswerTotals(ctx, qtype, days)
 		if err != nil {
 			log.Error("AnswerTotals", "err", err)
 		}
@@ -141,9 +139,15 @@ func (srv *Server) dnsAnswers(c echo.Context) error {
 			totalName = "uk"
 		}
 		if zt, ok := zoneTotals[totalName]; ok {
+			// log.InfoContext(ctx, "netspeed data", "pointBasis", pointBasis, "zt", zt, "server netspeed", serverNetspeed)
+			if zt == 0 {
+				// if the recorded netspeed for the zone was zero, assume it's at least
+				// this servers worth instead. Otherwise the Netspeed gets to be 'infinite'.
+				zt = int32(serverNetspeed)
+			}
 			cc.Netspeed = (pointBasis / float64(zt)) * float64(serverNetspeed)
 		}
-		// log.Info("points", "cc", cc.CC, "points", cc.Points)
+		// log.DebugContext(ctx, "points", "cc", cc.CC, "points", cc.Points)
 	}
 
 	r := struct {

server/functions.go

@@ -0,0 +1,46 @@
+package server
+
+import (
+	"context"
+	"database/sql"
+	"errors"
+	"net/netip"
+	"strconv"
+	"time"
+
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/ntpdb"
+)
+
+func (srv *Server) FindServer(ctx context.Context, serverID string) (ntpdb.Server, error) {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "FindServer")
+	defer span.End()
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+
+	var serverData ntpdb.Server
+	var dberr error
+	if id, err := strconv.Atoi(serverID); id > 0 && err == nil {
+		serverData, dberr = q.GetServerByID(ctx, uint32(id))
+	} else {
+		ip, err := netip.ParseAddr(serverID)
+		if err != nil || !ip.IsValid() {
+			return ntpdb.Server{}, nil // 404 error
+		}
+		serverData, dberr = q.GetServerByIP(ctx, ip.String())
+	}
+	if dberr != nil {
+		if !errors.Is(dberr, sql.ErrNoRows) {
+			log.Error("could not query server id", "err", dberr)
+			return serverData, dberr
+		}
+	}
+
+	if serverData.ID == 0 || (serverData.DeletionOn.Valid && serverData.DeletionOn.Time.Before(time.Now().Add(-1*time.Hour*24*30*24))) {
+		// no data and no error to produce 404 errors
+		return ntpdb.Server{}, nil
+	}
+
+	return serverData, nil
+}

server/graph_image.go

@@ -0,0 +1,149 @@
+package server
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/httptrace"
+	"net/url"
+	"os"
+	"time"
+
+	"github.com/hashicorp/go-retryablehttp"
+	"github.com/labstack/echo/v4"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace"
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
+
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+)
+
+func (srv *Server) graphImage(c echo.Context) error {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(c.Request().Context(), "graphImage")
+	defer span.End()
+
+	// cache errors briefly
+	c.Response().Header().Set("Cache-Control", "public,max-age=240")
+
+	serverID := c.Param("server")
+	imageType := c.Param("type")
+	log = log.With("serverID", serverID).With("type", imageType)
+	log.Info("graph parameters")
+
+	span.SetAttributes(attribute.String("url.server_parameter", serverID))
+
+	if imageType != "offset.png" {
+		return c.String(http.StatusNotFound, "invalid image name")
+	}
+
+	if len(c.QueryString()) > 0 {
+		// people breaking the varnish cache by adding query parameters
+		redirectURL := c.Request().URL
+		redirectURL.RawQuery = ""
+		log.InfoContext(ctx, "redirecting", "url", redirectURL.String())
+		return c.Redirect(308, redirectURL.String())
+	}
+
+	serverData, err := srv.FindServer(ctx, serverID)
+	if err != nil {
+		span.RecordError(err)
+		return c.String(http.StatusInternalServerError, "server error")
+	}
+	if serverData.ID == 0 {
+		return c.String(http.StatusNotFound, "not found")
+	}
+	if serverData.DeletionAge(7 * 24 * time.Hour) {
+		return c.String(http.StatusNotFound, "not found")
+	}
+
+	if serverData.Ip != serverID {
+		return c.Redirect(308, fmt.Sprintf("/graph/%s/offset.png", serverData.Ip))
+	}
+
+	contentType, data, err := srv.fetchGraph(ctx, serverData.Ip)
+	if err != nil {
+		span.RecordError(err)
+		return c.String(http.StatusInternalServerError, "server error")
+
+	}
+	if len(data) == 0 {
+		span.RecordError(fmt.Errorf("no data"))
+		return c.String(http.StatusInternalServerError, "server error")
+	}
+
+	ttl := 1800
+	c.Response().Header().Set("Cache-Control",
+		fmt.Sprintf("public,max-age=%d,s-maxage=%.0f",
+			ttl, float64(ttl)*0.75,
+		),
+	)
+
+	return c.Blob(http.StatusOK, contentType, data)
+}
+
+func (srv *Server) fetchGraph(ctx context.Context, serverIP string) (string, []byte, error) {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "fetchGraph")
+	defer span.End()
+
+	// q := url.Values{}
+	// q.Set("graph_only", "1")
+	// pagePath := srv.config.WebURL("/scores/" + serverIP, q)
+
+	serviceHost := os.Getenv("screensnap_service")
+	if len(serviceHost) == 0 {
+		serviceHost = "screensnap"
+	}
+
+	reqURL := url.URL{
+		Scheme: "http",
+		Host:   serviceHost,
+		Path:   fmt.Sprintf("/image/offset/%s", serverIP),
+	}
+
+	client := retryablehttp.NewClient()
+	client.Logger = log
+	client.HTTPClient.Transport = otelhttp.NewTransport(
+		client.HTTPClient.Transport,
+		otelhttp.WithClientTrace(func(ctx context.Context) *httptrace.ClientTrace {
+			return otelhttptrace.NewClientTrace(ctx)
+		}),
+	)
+
+	req, err := retryablehttp.NewRequestWithContext(ctx, "GET", reqURL.String(), nil)
+	if err != nil {
+		return "", nil, err
+	}
+
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != 200 {
+		span.AddEvent("unexpected status code", trace.WithAttributes(attribute.Int64("http.status", int64(resp.StatusCode))))
+		return "text/plain", nil, fmt.Errorf("upstream error %d", resp.StatusCode)
+	}
+
+	b, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", nil, err
+	}
+
+	return resp.Header.Get("Content-Type"), b, nil
+}
+
+// # my $data = JSON::encode_json(
+// #     {   url              => $url->as_string(),
+// #         timeout          => 10,
+// #         viewport         => "501x233",
+// #         height           => 233,
+// #         resource_timeout => 5,
+// #         wait             => 0.5,
+// #         scale_method     => "vector",
+// #     }
+// # );

server/history.go

@@ -0,0 +1,331 @@
+package server
+
+import (
+	"bytes"
+	"context"
+	"database/sql"
+	"encoding/csv"
+	"errors"
+	"fmt"
+	"math"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/labstack/echo/v4"
+	"go.ntppool.org/common/logger"
+	"go.ntppool.org/common/tracing"
+	"go.ntppool.org/data-api/logscores"
+	"go.ntppool.org/data-api/ntpdb"
+)
+
+type historyMode uint8
+
+const (
+	historyModeUnknown historyMode = iota
+	historyModeLog
+	historyModeJSON
+	historyModeMonitor
+)
+
+func paramHistoryMode(s string) historyMode {
+	switch s {
+	case "log":
+		return historyModeLog
+	case "json":
+		return historyModeJSON
+	case "monitor":
+		return historyModeMonitor
+	default:
+		return historyModeUnknown
+	}
+}
+
+func (srv *Server) getHistory(ctx context.Context, c echo.Context, server ntpdb.Server) (*logscores.LogScoreHistory, error) {
+	log := logger.Setup()
+
+	limit := 0
+	if limitParam, err := strconv.Atoi(c.QueryParam("limit")); err == nil {
+		limit = limitParam
+	} else {
+		limit = 50
+	}
+	if limit > 4000 {
+		limit = 4000
+	}
+
+	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")
+	}
+
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+
+	var monitorID uint32 = 0
+	switch monitorParam {
+	case "":
+		name := "recentmedian.scores.ntp.dev"
+		monitor, err := q.GetMonitorByName(ctx, sql.NullString{Valid: true, String: name})
+		if err != nil {
+			log.Warn("could not find monitor", "name", name, "err", err)
+		}
+		monitorID = monitor.ID
+	case "*":
+		monitorID = 0 // don't filter on monitor ID
+	default:
+		mID, err := strconv.ParseUint(monitorParam, 10, 32)
+		if err == nil {
+			monitorID = uint32(mID)
+		} else {
+			// 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")
+			}
+
+			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")
+				}
+				monitorID = monitor.ID
+			}
+		}
+	}
+
+	log.Info("monitor param", "monitor", monitorID)
+
+	sinceTime := time.Unix(since, 0)
+	if since > 0 {
+		log.Warn("monitor data requested with since parameter, not supported", "since", sinceTime)
+	}
+
+	ls, err := logscores.GetHistory(ctx, srv.db, server.ID, monitorID, sinceTime, limit)
+
+	return ls, err
+}
+
+func (srv *Server) history(c echo.Context) error {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(c.Request().Context(), "history")
+	defer span.End()
+
+	// just cache for a short time by default
+	c.Response().Header().Set("Cache-Control", "public,max-age=240")
+
+	mode := paramHistoryMode(c.Param("mode"))
+	if mode == historyModeUnknown {
+		return echo.NewHTTPError(http.StatusNotFound, "invalid mode")
+	}
+
+	server, err := srv.FindServer(ctx, c.Param("server"))
+	if err != nil {
+		log.Error("find server", "err", err)
+		span.RecordError(err)
+		return echo.NewHTTPError(http.StatusInternalServerError, "internal error")
+	}
+	if server.DeletionAge(30 * 24 * time.Hour) {
+		span.AddEvent("server deleted")
+		return echo.NewHTTPError(http.StatusNotFound, "server not found")
+	}
+	if server.ID == 0 {
+		span.AddEvent("server not found")
+		return echo.NewHTTPError(http.StatusNotFound, "server not found")
+	}
+
+	history, err := srv.getHistory(ctx, c, server)
+	if err != nil {
+		var httpError *echo.HTTPError
+		if errors.As(err, &httpError) {
+			if httpError.Code >= 500 {
+				log.Error("get history", "err", err)
+				span.RecordError(err)
+			}
+			return httpError
+		} else {
+			log.Error("get history", "err", err)
+			span.RecordError(err)
+			return c.String(http.StatusInternalServerError, "internal error")
+		}
+	}
+
+	c.Response().Header().Set("Access-Control-Allow-Origin", "*")
+
+	switch mode {
+	case historyModeLog:
+		return srv.historyCSV(ctx, c, history)
+	case historyModeJSON:
+		return srv.historyJSON(ctx, c, server, history)
+	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 {
+	log := logger.Setup()
+	ctx, span := tracing.Tracer().Start(ctx, "history.json")
+	defer span.End()
+
+	type ScoresEntry struct {
+		TS        int64    `json:"ts"`
+		Offset    *float64 `json:"offset,omitempty"`
+		Step      float64  `json:"step"`
+		Score     float64  `json:"score"`
+		MonitorID int      `json:"monitor_id"`
+	}
+
+	type MonitorEntry struct {
+		ID     uint32  `json:"id"`
+		Name   string  `json:"name"`
+		Type   string  `json:"type"`
+		Ts     string  `json:"ts"`
+		Score  float64 `json:"score"`
+		Status string  `json:"status"`
+	}
+	res := struct {
+		History  []ScoresEntry  `json:"history"`
+		Monitors []MonitorEntry `json:"monitors"`
+		Server   struct {
+			IP string `json:"ip"`
+		} `json:"server"`
+	}{
+		History: make([]ScoresEntry, len(history.LogScores)),
+	}
+	res.Server.IP = server.Ip
+
+	// log.InfoContext(ctx, "monitor id list", "ids", history.MonitorIDs)
+
+	q := ntpdb.NewWrappedQuerier(ntpdb.New(srv.db))
+	logScoreMonitors, err := q.GetServerScores(ctx,
+		ntpdb.GetServerScoresParams{
+			MonitorIDs: history.MonitorIDs,
+			ServerID:   server.ID,
+		},
+	)
+	if err != nil {
+		span.RecordError(err)
+		log.ErrorContext(ctx, "GetServerScores", "err", err)
+		return c.String(http.StatusInternalServerError, "err")
+	}
+
+	// log.InfoContext(ctx, "got logScoreMonitors", "count", len(logScoreMonitors))
+
+	for _, lsm := range logScoreMonitors {
+		score := math.Round(lsm.ScoreRaw*10) / 10 // round to one decimal
+
+		tempMon := ntpdb.Monitor{
+			Name:     lsm.Name,
+			TlsName:  lsm.TlsName,
+			Location: lsm.Location,
+			ID:       lsm.ID,
+		}
+		name := tempMon.DisplayName()
+
+		me := MonitorEntry{
+			ID:     lsm.ID,
+			Name:   name,
+			Type:   string(lsm.Type),
+			Ts:     lsm.ScoreTs.Time.Format(time.RFC3339),
+			Score:  score,
+			Status: string(lsm.Status),
+		}
+		res.Monitors = append(res.Monitors, me)
+	}
+
+	for i, ls := range history.LogScores {
+		x := float64(1000000000000)
+		score := math.Round(ls.Score*x) / x
+		res.History[i] = ScoresEntry{
+			TS:        ls.Ts.Unix(),
+			MonitorID: int(ls.MonitorID.Int32),
+			Step:      ls.Step,
+			Score:     score,
+		}
+		if ls.Offset.Valid {
+			offset := ls.Offset.Float64
+			res.History[i].Offset = &offset
+		}
+	}
+
+	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")
+	}
+
+	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")
+	b := bytes.NewBuffer([]byte{})
+	w := csv.NewWriter(b)
+
+	ff := func(f float64) string {
+		s := fmt.Sprintf("%.9f", f)
+		s = strings.TrimRight(s, "0")
+		s = strings.TrimRight(s, ".")
+		return s
+	}
+
+	w.Write([]string{"ts_epoch", "ts", "offset", "step", "score", "monitor_id", "monitor_name", "leap", "error"})
+	for _, l := range history.LogScores {
+		// log.Debug("csv line", "id", l.ID, "n", i)
+
+		var offset string
+		if l.Offset.Valid {
+			offset = ff(l.Offset.Float64)
+		}
+
+		step := ff(l.Step)
+		score := ff(l.Score)
+		var monName string
+		if l.MonitorID.Valid {
+			monName = history.Monitors[int(l.MonitorID.Int32)]
+		}
+		var leap string
+		if l.Attributes.Leap != 0 {
+			leap = fmt.Sprintf("%d", l.Attributes.Leap)
+		}
+
+		err := w.Write([]string{
+			strconv.Itoa(int(l.Ts.Unix())),
+			// l.Ts.Format(time.RFC3339),
+			l.Ts.Format("2006-01-02 15:04:05"),
+			offset,
+			step,
+			score,
+			fmt.Sprintf("%d", l.MonitorID.Int32),
+			monName,
+			leap,
+			l.Attributes.Error,
+		})
+		if err != nil {
+			log.Warn("csv encoding error", "ls_id", l.ID, "err", err)
+		}
+	}
+	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())
+
+}

server/server.go

@@ -25,13 +25,16 @@ import (
 	"go.ntppool.org/common/version"
 	"go.ntppool.org/common/xff/fastlyxff"
 
+	"go.ntppool.org/api/config"
+
 	chdb "go.ntppool.org/data-api/chdb"
 	"go.ntppool.org/data-api/ntpdb"
 )
 
 type Server struct {
-	db *sql.DB
+	db     *sql.DB
-	ch *chdb.ClickHouse
+	ch     *chdb.ClickHouse
+	config *config.Config
 
 	ctx context.Context
 
@@ -40,6 +43,8 @@ type Server struct {
 }
 
 func NewServer(ctx context.Context, configFile string) (*Server, error) {
+	log := logger.Setup()
+
 	ch, err := chdb.New(ctx, configFile)
 	if err != nil {
 		return nil, fmt.Errorf("clickhouse open: %w", err)
@@ -49,10 +54,16 @@ func NewServer(ctx context.Context, configFile string) (*Server, error) {
 		return nil, fmt.Errorf("mysql open: %w", err)
 	}
 
+	conf := config.New()
+	if !conf.Valid() {
+		log.Error("invalid ntppool config")
+	}
+
 	srv := &Server{
 		ch:      ch,
 		db:      db,
 		ctx:     ctx,
+		config:  conf,
 		metrics: metricsserver.New(),
 	}
 
@@ -72,12 +83,15 @@ func NewServer(ctx context.Context, configFile string) (*Server, error) {
 func (srv *Server) Run() error {
 	log := logger.Setup()
 
+	ntpconf := config.New()
+
 	ctx, cancel := context.WithCancel(srv.ctx)
 	defer cancel()
 
 	g, _ := errgroup.WithContext(ctx)
 
 	g.Go(func() error {
+		version.RegisterMetric("dataapi", srv.metrics.Registry())
 		return srv.metrics.ListenAndServe(ctx, 9020)
 	})
 
@@ -113,8 +127,7 @@ func (srv *Server) Run() error {
 	e.Use(otelecho.Middleware("data-api"))
 	e.Use(slogecho.NewWithConfig(log,
 		slogecho.Config{
-			WithTraceID: true,
+			WithTraceID: false, // done by logger already
-			// WithSpanID:  true,
 			// WithRequestHeader: true,
 		},
 	))
@@ -127,6 +140,12 @@ func (srv *Server) Run() error {
 				span := trace.SpanFromContext(request.Context())
 				span.SetAttributes(attribute.String("http.real_ip", c.RealIP()))
 
+				// since the Go library (temporarily?) isn't including this
+				span.SetAttributes(attribute.String("url.path", c.Request().RequestURI))
+				if q := c.QueryString(); len(q) > 0 {
+					span.SetAttributes(attribute.String("url.query", q))
+				}
+
 				c.Response().Header().Set("Traceparent", span.SpanContext().TraceID().String())
 
 				return next(c)
@@ -172,6 +191,25 @@ 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)
+
+	if len(ntpconf.WebHostname()) > 0 {
+		e.POST("/api/server/scores/:server/:mode", func(c echo.Context) error {
+			// POST requests used to work
+			mode := c.Param("mode")
+			server := c.Param("server")
+			query := c.Request().URL.Query()
+			return c.Redirect(
+				http.StatusSeeOther,
+				ntpconf.WebURL(
+					fmt.Sprintf("/scores/%s/%s", server, mode),
+					&query,
+				),
+			)
+		})
+	}
+	e.GET("/graph/:server/:type", srv.graphImage)
+
 	// e.GET("/api/server/scores/:server/:type", srv.logScores)
 
 	g.Go(func() error {

sqlc.yaml

@@ -12,6 +12,10 @@ sql:
         omit_unused_structs: true
         emit_interface: true
         # emit_all_enum_values: true
+        rename:
+          servers.Ip: IP
         overrides:
+          - column: log_scores.attributes
+            go_type: go.ntppool.org/common/types.LogScoreAttributes
           - column: "server_netspeed.netspeed_active"
             go_type: "uint64"