Avoid duplicate expvar metrics - fixes #716 #726
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yurishkuro
requested review from
black-adder,
pavolloffay and
vprithvi
as code owners
ghost
assigned 
black-adder
reviewed
Mar 5, 2018
pkg/cassandra/config/config.go
Outdated
| @@ -94,6 +95,9 @@ type SessionBuilder interface { | |||
|
|
|||
| // NewSession creates a new Cassandra session | |||
| func (c *Configuration) NewSession() (cassandra.Session, error) { | |||
| if true { | |||
| return &mocks.Session{}, nil | |||
There was a problem hiding this comment.
is this a WIP? cos this is weird
There was a problem hiding this comment.
yeah, sorry, still WIP
yurishkuro
changed the title
yurishkuro
commented
Mar 5, 2018
| subpackages: | ||
| - metrics | ||
| - metrics/adapters | ||
| - metrics/expvar | ||
| - metrics/go-kit | ||
| - metrics/go-kit/expvar |
There was a problem hiding this comment.
weird, even if I remove this line/pkg, glide adds it back, even though all code using it seems to be gone.
yurishkuro
changed the title
|
@black-adder ready for review |
black-adder
approved these changes
Mar 6, 2018
cmd/query/main.go
Outdated
| return nil | ||
| } | ||
| if err != nil { | ||
| logger.Error("Cannot init archive storage reader", zap.Error(err)) | ||
| return nil | ||
| } | ||
| writer, err := storageFactory.CreateSpanWriter() | ||
| writer, err := archiveFactory.CreateArchiveSpanWriter() | ||
| if err == istorage.ErrArchiveStorageNotConfigured || err == istorage.ErrArchiveStorageNotSupported { | ||
| return nil |
There was a problem hiding this comment.
do we want to add the same logs as on L191? or is it not possible here since L192 would've been called anyway?
added 3 commits
March 6, 2018 10:59
yurishkuro
force-pushed
the
fix-716-expvar-dups
branch
from
d78cae6 to
9a646bb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #716
jaeger-lib1.4.0Signed-off-by: Yuri Shkuro ys@uber.com