Skip to content
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.

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

remove ErrorBusy, it essentially duplicates SpansDropped #1091

Merged
merged 1 commit into from
Jan 23, 2019

Conversation

cstyan
Copy link
Contributor

@cstyan cstyan commented Sep 28, 2018

Fixes #1065
Signed-off-by: Callum Styan callumstyan@gmail.com

Which problem is this PR solving?

Removes ErrorBusy. Having not looked at the code before, I assume that if a span can't be added to the queue it is just dropped (hence SpansDropped). If that's the case, then ErrorBusy would duplicate SpansDropped but the name provides less context.

What's busy?

Short description of the changes

Removes ErrorBusy.

Copy link
Contributor

@objectiser objectiser left a comment

Choose a reason for hiding this comment

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

Sorry for the delay in review, but looks like there are build errors that need to be addressed, and you will need to rebase your PR.

@@ -141,8 +140,6 @@ func (sp *spanProcessor) enqueueSpan(span *model.Span, originalFormat string) bo
span: span,
}
addedToQueue := sp.queue.Produce(item)
Copy link
Contributor

Choose a reason for hiding this comment

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

The addedToQueue is no longer required, so could just have return sp.queue.Produce(item)

Signed-off-by: Callum Styan <callumstyan@gmail.com>
@codecov
Copy link

codecov bot commented Jan 23, 2019

Codecov Report

Merging #1091 into master will not change coverage.
The diff coverage is 100%.

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1091   +/-   ##
======================================
  Coverage     100%    100%           
======================================
  Files         162     162           
  Lines        7263    7259    -4     
======================================
- Hits         7263    7259    -4
Impacted Files Coverage Δ
cmd/collector/app/metrics.go 100% <ø> (ø) ⬆️
cmd/collector/app/span_processor.go 100% <100%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 296181e...2e20cea. Read the comment docs.

@cstyan
Copy link
Contributor Author

cstyan commented Jan 23, 2019

@objectiser sorry for the delay. Removed addedToQueue, fixed an import that I shouldn't have removed, and tests in span_collector_test.go.

@objectiser
Copy link
Contributor

@yurishkuro Are you ok with this duplicate metric being removed? If so, we just need to list it as a breaking change for next release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants