Skip to content

#181 issue #182

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 4 commits into from
Feb 26, 2025
Merged

#181 issue #182

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92d0629
#181 issue
rlagyu0 Feb 25, 2025
54ff4e6
#181 issue
rlagyu0 Feb 25, 2025
88df026
Merge branch '181' of https://github.com/rlagyu0/oracle-db-appdev-mon…
rlagyu0 Feb 25, 2025
6b775c6
#181 issue 181 seperate only error and scrape error
Feb 26, 2025
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: 6 additions & 6 deletions collector/collector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,12 +354,12 @@ func (e *Exporter) scrape(ch chan<- prometheus.Metric, tick *time.Time) {
}

scrapeStart := time.Now()
if err1 := e.ScrapeMetric(e.db, ch, metric, tick); err1 != nil {
errmutex.Lock()
{
err = err1
}
errmutex.Unlock()
errmutex.Lock()
err1 := e.ScrapeMetric(e.db, ch, metric, tick)
errmutex.Unlock()

if err1 != nil {
err = err1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you're on the right track here, but this moves shared memory access outside the mutex boundary. I think we need to refactor this method and goroutine closure to properly synchronize the errors and provide an accurate count of errors in the defer method. Likely this should be handled with an error channel, so we can collect all errors that occurred in the goroutine and remove shared memory access entirely.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What happens if the content of err is changed by another goroutine after this method? It seems like this could also be a partial error. As you mentioned, I’ve placed logic in defer to handle both scrape errors and single errors. What do you think of this approach?

Please take a look at the next commit.

commit 6b775c6

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is looking better, definitely an improvement over the original code. Thanks for incorporating an error channel!

I'd like to take this commit once we get the CLA issue sorted, and we can further optimize/clean-up this concurrent section from there.

if shouldLogScrapeError(err, metric.IgnoreZeroResult) {
level.Error(e.logger).Log("msg", "Error scraping metric",
"Context", metric.Context,
Expand Down