mock: unify expected span checking #3096
Closed
Conversation
This file contains hidden or 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
Previously there were two separate implementations which would check an `ExpectedSpan` against and actual span. One on the `ExpectedSpan` struct itself, which took a `SpanState` as used by the `MockCollector` and another on the `MockSubscriber` which took a `SpanRef` (from `tracing-subscriber`). In reality, both of these checks needed a `span::Id` and a `Metadata` to check, but the structure was also somewhat different, with the `MockSubscriber` span check giving better error output. This change combines the two checks into the one on `ExpectedSpan`, which is now generic over an `ActualSpan` implementation, which has been provided for `SpanState`, `SpanRef`, and also `span::Id` (for the case where no `Metadata` is available). The better error output from `MockSubscriber` has been integrated into that check.
hds
force-pushed
the
hds/mock-expected-span-check
branch
from
935bbe0 to
1da4c31
Compare
Contributor
Author
|
This change has been merged into #3098 and modified significantly. |
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.
Motivation
Previously there were two separate implementations which would check an
ExpectedSpanagainst and actual span. One on theExpectedSpanstructitself, which took a
SpanStateas used by theMockCollectorandanother on the
MockSubscriberwhich took aSpanRef(fromtracing-subscriber).In reality, both of these checks needed a
span::Idand aMetadatatocheck, but the structure was also somewhat different, with the
MockSubscriberspan check giving better error output.Solution
This change combines the two checks into the one on
ExpectedSpan,which is now generic over an
ActualSpanimplementation, which has beenprovided for
SpanState,SpanRef, and alsospan::Id(for the casewhere no
Metadatais available).The better error output from
MockSubscriberhas been integrated intothat check.