Skip to content

Commit 7263ecb

Browse files
committed
Add measurements fetched log message
1 parent 1dc15df commit 7263ecb

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

internal/reaper/source_reaper.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,8 @@ func (sr *SourceReaper) isRoleExcluded(m metrics.Metric) bool {
9494

9595
// sendEnvelope adds sysinfo and dispatches a MeasurementEnvelope to the
9696
// measurement channel.
97-
func (sr *SourceReaper) sendEnvelope(name, storageName string, data metrics.Measurements) {
97+
func (sr *SourceReaper) sendEnvelope(ctx context.Context, name, storageName string, data metrics.Measurements) {
98+
log.GetLogger(ctx).WithField("metric", name).WithField("rows", len(data)).Info("measurements fetched")
9899
sr.reaper.AddSysinfoToMeasurements(data, sr.md)
99100
sr.reaper.measurementCh <- metrics.MeasurementEnvelope{
100101
DBName: sr.md.Name,
@@ -110,7 +111,7 @@ func (sr *SourceReaper) dispatchMetricData(ctx context.Context, name string, met
110111
if key := sr.cacheKey(metric, name); key != "" {
111112
sr.reaper.measurementCache.Put(key, data)
112113
}
113-
sr.sendEnvelope(name, metric.StorageName, data)
114+
sr.sendEnvelope(ctx, name, metric.StorageName, data)
114115
if name == "db_stats" {
115116
sr.detectServerRestart(ctx, data)
116117
}
@@ -167,7 +168,8 @@ func (sr *SourceReaper) Run(ctx context.Context) {
167168
continue
168169
}
169170
if cached := sr.reaper.GetMeasurementCache(sr.cacheKey(metric, name)); len(cached) > 0 {
170-
sr.sendEnvelope(name, metric.StorageName, cached)
171+
l.WithField("metric", name).Info("instance level cache hit")
172+
sr.sendEnvelope(ctx, name, metric.StorageName, cached)
171173
break
172174
}
173175
sql := metric.GetSQL(sr.md.Version)
@@ -255,6 +257,7 @@ func (sr *SourceReaper) fetchOSMetric(ctx context.Context, name string) error {
255257
return fmt.Errorf("could not read metric from OS: %v", err)
256258
}
257259
if msg != nil && len(msg.Data) > 0 {
260+
log.GetLogger(ctx).WithField("metric", name).WithField("rows", len(msg.Data)).Info("measurements fetched")
258261
sr.reaper.measurementCh <- *msg
259262
}
260263
return nil
@@ -283,7 +286,7 @@ func (sr *SourceReaper) fetchSpecialMetric(ctx context.Context, name string) err
283286
return fmt.Errorf("failed to fetch special metric: %v", err)
284287
}
285288
if len(data) > 0 {
286-
sr.sendEnvelope(name, metric.StorageName, data)
289+
sr.sendEnvelope(ctx, name, metric.StorageName, data)
287290
}
288291
return err
289292
}

0 commit comments

Comments
 (0)