Skip to content

Commit 62ef525

Browse files
feat: add logger to metrics for sqlinstance
Co-authored-by: christeredvartsen <[email protected]>
1 parent 1374455 commit 62ef525

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

internal/cmd/api/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func run(ctx context.Context, cfg *Config, log logrus.FieldLogger) error {
162162

163163
userSyncRuns := usersync.NewRunsHandler(cfg.UserSync.RunsToPersist)
164164
resourceUsageClient := resourceusage.NewClient(cfg.K8s.AllClusterNames(), db, log)
165-
sqlinstanceMetrics, err := sqlinstance.NewMetrics(ctx)
165+
sqlinstanceMetrics, err := sqlinstance.NewMetrics(ctx, log)
166166
if err != nil {
167167
return err
168168
}

internal/sqlinstance/sqlinstance.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import (
1414

1515
type Metrics struct {
1616
monitoring *monitoring.MetricClient
17+
log log.FieldLogger
1718
}
1819

1920
const (
@@ -46,13 +47,16 @@ type MetricsOptions struct {
4647

4748
type Option func(*MetricsOptions)
4849

49-
func NewMetrics(ctx context.Context) (*Metrics, error) {
50+
func NewMetrics(ctx context.Context, log log.FieldLogger) (*Metrics, error) {
5051
client, err := monitoring.NewMetricClient(ctx)
5152
if err != nil {
5253
return nil, err
5354
}
5455

55-
return &Metrics{monitoring: client}, nil
56+
return &Metrics{
57+
monitoring: client,
58+
log: log,
59+
}, nil
5660
}
5761

5862
func WithQuery(metricType MetricType, databaseId string) Option {
@@ -150,6 +154,7 @@ func (m *Metrics) ListTimeSeries(ctx context.Context, projectID string, opts ...
150154
metric, err := it.Next()
151155
// TODO: handle error?
152156
if err != nil {
157+
m.log.WithError(err).Error("error when fetching time series")
153158
break
154159
}
155160
timeSeries = append(timeSeries, metric)

0 commit comments

Comments
 (0)