Support for Zipkin: CombineTraces #688
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
|
|
Signed-off-by: Joe Elliott <number101010@gmail.com>
joe-elliott
force-pushed
the
zipkin-combine
branch
from
4cffd97
to
44fa901
Compare
annanay25
approved these changes
May 5, 2021
| @@ -68,12 +69,13 @@ func CombineTraceProtos(traceA, traceB *tempopb.Trace) (*tempopb.Trace, int, int | |||
| spanCountTotal := 0 | |||
|
|
|||
| h := fnv.New32() | |||
| buffer := make([]byte, 4) | |||
There was a problem hiding this comment.
Just mentioning for reference (was wondering why we need 4bytes), the span kind field is a int32
https://github.com/open-telemetry/opentelemetry-collector/blob/51661b8400d8a90e1bded85e2770fd56865761be/internal/data/protogen/trace/v1/trace.pb.go#L34
There was a problem hiding this comment.
lol i meant i didn't think we need more than 1 byte
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.
What this PR does:
Uses span.Kind to differentiate between zipkin client/server spans in combine.
Which issue(s) this PR fixes:
Related to #682 and #687
Checklist
CHANGELOG.mdupdated - the order of entries should be[CHANGE],[FEATURE],[ENHANCEMENT],[BUGFIX]