ntppool/data-api
Private
Public Access
1
0
Fork 0
Code Activity

Add tracing

Browse Source
This commit is contained in:
Ask Bjørn Hansen
2023-10-14 04:01:43 -07:00
parent 42dccd28a7
commit f9b521664d
13 changed files with 407 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
chdb/chdnsanswers.go
View File

@@ -5,7 +5,9 @@ import (
"fmt"
"sort"
"github.com/ClickHouse/clickhouse-go/v2"
"go.ntppool.org/common/logger"
"go.ntppool.org/common/tracing"
)
type ccCount struct {
@@ -31,12 +33,17 @@ func (s ServerQueries) Less(i, j int) bool {
func (d *ClickHouse) ServerAnswerCounts(ctx context.Context, serverIP string, days int) (ServerQueries, error) {
ctx, span := tracing.NewTracer("fooxx").Start(ctx, "ServerAnswerCounts")
defer span.End()
conn := d.conn
log := logger.Setup().With("server", serverIP)
// queries by UserCC / Qtype for the ServerIP
rows, err := conn.Query(ctx, `
rows, err := conn.Query(clickhouse.Context(ctx,
clickhouse.WithSpan(span.SpanContext()),
), `
select UserCC,Qtype,sum(queries) as queries
from by_server_ip_1d
where

9
chdb/geoqueries.go
View File

@@ -9,6 +9,9 @@ import (
"log/slog"
"sort"
"time"
"github.com/ClickHouse/clickhouse-go/v2"
"go.ntppool.org/common/tracing"
)
type flatAPI struct {
@@ -30,9 +33,11 @@ func (s UserCountry) Less(i, j int) bool {
}
func (d *ClickHouse) UserCountryData(ctx context.Context) (*UserCountry, error) {
ctx, span := tracing.NewTracer("foozz").Start(ctx, "UserCountryData")
defer span.End()
// rows, err := conn.Query(ctx, "select dt,UserCC,Qtype,sum(queries) as queries from by_usercc_1d group by rollup(dt,Qtype,UserCC) order by dt,UserCC,Qtype;")
rows, err := d.conn.Query(ctx, "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;")
rows, err := d.conn.Query(clickhouse.Context(ctx, clickhouse.WithSpan(span.SpanContext())),
"select max(dt) as d,UserCC,Qtype,sum(queries) as queries from by_usercc_1d where dt > now() - INTERVAL 4 DAY group by rollup(Qtype,UserCC) order by UserCC,Qtype;")
if err != nil {
slog.Error("query error", "err", err)
return nil, fmt.Errorf("database error")