Skip to content

Make sure we don't try to count metrics if scraper returns an error (… #2902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2021
Merged

Make sure we don't try to count metrics if scraper returns an error (… #2902

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions receiver/scraperhelper/scraper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,11 @@ func (ms metricsScraper) Scrape(ctx context.Context, receiverName string) (pdata
ctx = obsreport.ScraperContext(ctx, receiverName, ms.Name())
ctx = obsreport.StartMetricsScrapeOp(ctx, receiverName, ms.Name())
metrics, err := ms.ScrapeMetrics(ctx)
obsreport.EndMetricsScrapeOp(ctx, metrics.Len(), err)
count := 0
if err == nil {
count = metrics.Len()
}
obsreport.EndMetricsScrapeOp(ctx, count, err)
return metrics, err
}

Expand Down Expand Up @@ -155,7 +159,11 @@ func (rms resourceMetricsScraper) Scrape(ctx context.Context, receiverName strin
ctx = obsreport.ScraperContext(ctx, receiverName, rms.Name())
ctx = obsreport.StartMetricsScrapeOp(ctx, receiverName, rms.Name())
resourceMetrics, err := rms.ScrapeResourceMetrics(ctx)
obsreport.EndMetricsScrapeOp(ctx, metricCount(resourceMetrics), err)
count := 0
if err == nil {
count = metricCount(resourceMetrics)
}
obsreport.EndMetricsScrapeOp(ctx, count, err)
return resourceMetrics, err
}

Expand Down