@@ -18,26 +18,26 @@ import (
1818 "encoding/json"
1919 "fmt"
2020 "io"
21+ "log/slog"
2122 "math"
2223 "os"
2324 "sort"
2425 "strings"
2526 "time"
2627
2728 "cloud.google.com/go/bigquery"
28- "github.com/go-kit/log"
29- "github.com/go-kit/log/level"
3029 "github.com/pkg/errors"
3130 "github.com/prometheus/client_golang/prometheus"
3231 "github.com/prometheus/common/model"
32+ "github.com/prometheus/common/promslog"
3333 "github.com/prometheus/prometheus/prompb"
3434 "google.golang.org/api/iterator"
3535 "google.golang.org/api/option"
3636)
3737
3838// BigqueryClient allows sending batches of Prometheus samples to Bigquery.
3939type BigqueryClient struct {
40- logger log .Logger
40+ logger * slog .Logger
4141 client bigquery.Client
4242 datasetID string
4343 tableID string
@@ -50,13 +50,16 @@ type BigqueryClient struct {
5050}
5151
5252// NewClient creates a new Client.
53- func NewClient (logger log .Logger , googleAPIjsonkeypath , googleProjectID , googleAPIdatasetID , googleAPItableID string , remoteTimeout time.Duration ) * BigqueryClient {
53+ func NewClient (logger * slog .Logger , googleAPIjsonkeypath , googleProjectID , googleAPIdatasetID , googleAPItableID string , remoteTimeout time.Duration ) * BigqueryClient {
5454 ctx := context .Background ()
55+ if logger == nil {
56+ logger = promslog .NewNopLogger ()
57+ }
5558 bigQueryClientOptions := []option.ClientOption {}
5659 if googleAPIjsonkeypath != "" {
5760 jsonFile , err := os .Open (googleAPIjsonkeypath )
5861 if err != nil {
59- level .Error (logger ). Log ( "err "err ) //nolint:errcheck
62+ logger .Error ("failed to open google api json key" , slog . Any ( "error "err ))
6063 os .Exit (1 )
6164 }
6265
@@ -65,7 +68,7 @@ func NewClient(logger log.Logger, googleAPIjsonkeypath, googleProjectID, googleA
6568 var result map [string ]interface {}
6669 err = json .Unmarshal ([]byte (byteValue ), & result )
6770 if err != nil {
68- level .Error (logger ). Log ( "err "err ) //nolint:errcheck
71+ logger .Error ("failed to unmarshal google api json key" , slog . Any ( "error "err ))
6972 os .Exit (1 )
7073 }
7174
@@ -80,14 +83,10 @@ func NewClient(logger log.Logger, googleAPIjsonkeypath, googleProjectID, googleA
8083 c , err := bigquery .NewClient (ctx , googleProjectID , bigQueryClientOptions ... )
8184
8285 if err != nil {
83- level .Error (logger ). Log ( "err "err ) //nolint:errcheck
86+ logger .Error ("failed to create new bigquery client" , slog . Any ( "error "err ))
8487 os .Exit (1 )
8588 }
8689
87- if logger == nil {
88- logger = log .NewNopLogger ()
89- }
90-
9190 return & BigqueryClient {
9291 logger : logger ,
9392 client : * c ,
@@ -180,7 +179,7 @@ func (c *BigqueryClient) Write(timeseries []*prompb.TimeSeries) error {
180179 for _ , s := range samples {
181180 v := float64 (s .Value )
182181 if math .IsNaN (v ) || math .IsInf (v , 0 ) {
183- //level.Debug( c.logger).Log("msg", " cannot send to BigQuery , skipping sample", "value", v, "sample", s)
182+ c .logger . Debug ( " cannot send to bigquery , skipping sample"slog . Any ( "value" , v ), slog . Any ( "sample" , s ) )
184183 c .ignoredSamples .Inc ()
185184 continue
186185 }
@@ -259,7 +258,7 @@ func (c *BigqueryClient) Read(req *prompb.ReadRequest) (*prompb.ReadResponse, er
259258 }
260259 duration := time .Since (begin ).Seconds ()
261260 c .sqlQueryDuration .Observe (duration )
262- level . Debug ( c .logger ). Log ( "msg" , "BigQuery SQL query""rows" , iter .TotalRows , "duration" , duration ) //nolint:errcheck
261+ c .logger . Debug ( "bigquery sql query"slog . Any ( "rows" , iter .TotalRows ), slog . Any ( "duration" , duration ))
263262 }
264263
265264 resp := prompb.ReadResponse {
@@ -312,7 +311,7 @@ func (c *BigqueryClient) buildCommand(q *prompb.Query) (string, error) {
312311 matchers = append (matchers , fmt .Sprintf ("timestamp <= TIMESTAMP_MILLIS(%v)" , q .EndTimestampMs ))
313312
314313 query := fmt .Sprintf ("SELECT metricname, tags, UNIX_MILLIS(timestamp) as timestamp, value FROM %s.%s WHERE %v ORDER BY timestamp" , c .datasetID , c .tableID , strings .Join (matchers , " AND " ))
315- level . Debug ( c .logger ). Log ( "msg" , "BigQuery read""sql query" , query ) //nolint:errcheck
314+ c .logger . Debug ( "bigquery read"slog . Any ( "sql query" , query ))
316315
317316 return query , nil
318317}
0 commit comments