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.

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

Jump to bottom

Correct trace name resolution #541

Merged
merged 20 commits into from
Mar 12, 2020
Merged

Correct trace name resolution #541

merged 20 commits into from
Mar 12, 2020

Commits on Mar 9, 2020

  1. Trace name resolution by root span with remote ref 

    1. Find all spans without parent reference or with a parent reference that is not found in the trace
2. Sort all found spans by start time (in case when there are more than one span found)
3. Take first of the found spans and get a trace name

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    76aa568 View commit details
    Browse the repository at this point in the history

  2. Unit tests for getTraceName() method 

    * Test for trace without root span
* Test for trace with exactly one root span (with remote ref)
* Test for trace with exactly one root span (with no refs)
* Test for trace with more than one root span

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    2e5d770 View commit details
    Browse the repository at this point in the history

  3. trace-viewer to .tsx 

    * File extension changed to .tsx
* Path to changed file removed from tsconfig.lint.json
* Added type for spans argument in getTraceName()

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    e968cdb View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2020

  1. Year fix 

    Fixed a year in a copyright text

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    5c633c2 View commit details
    Browse the repository at this point in the history

  2. Variable rename 

    Renamed variable from "remoteSpanId" to "missingSpanId"

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    08d8dbb View commit details
    Browse the repository at this point in the history

  3. Timestamp constant 

    Made a constant with base span's timestamp in a tests

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    5793005 View commit details
    Browse the repository at this point in the history

  4. Spans id array to spans dictionary 

    Usage of dictionary of all spans instead of id's array to check an inclusion

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    52e3794 View commit details
    Browse the repository at this point in the history

  5. Correct sort logic 

    Correction of a spans sorting to such order:
1. First, sort spans by a presence of a parent
2. Second, sort spans by a start time

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    c914bcf View commit details
    Browse the repository at this point in the history

  6. Tests for a new sorting logic 

    * Test for a trace with multiple root spans different by parents
* Test for a trace with multiple root spans different by start time

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    a6f67ba View commit details
    Browse the repository at this point in the history

  7. Empty process object to all test spans 

    Added a process key with an empty object to all test spans to avoid reading property of undefined

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 10, 2020
    Configuration menu
    Copy the full SHA
    270a762 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2020

  1. Merge branch 'master' into correct-trace-name-resolution

    @yurishkuro
    yurishkuro committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    75552d8 View commit details
    Browse the repository at this point in the history

  2. Update Copyright text in packages/jaeger-ui/src/model/trace-viewer.tsx 

    Co-Authored-By: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster @yurishkuro
    swapster and yurishkuro committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3944f05 View commit details
    Browse the repository at this point in the history

  3. Update Copyright text in packages/jaeger-ui/src/model/find-trace-name… 

    ….test.js

Co-Authored-By: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster @yurishkuro
    swapster and yurishkuro committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    f65375f View commit details
    Browse the repository at this point in the history

  4. More detailed comment for root span 

    Co-Authored-By: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster @yurishkuro
    swapster and yurishkuro committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    98b7eb7 View commit details
    Browse the repository at this point in the history

  5. Note about a loop 

    Co-Authored-By: Yuri Shkuro <yurishkuro@users.noreply.github.com>
Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster @yurishkuro
    swapster and yurishkuro committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    bfbce5b View commit details
    Browse the repository at this point in the history

  6. Change of parents definition logic 

    Method of parents definition changed to comparing traceIDs of spans

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    9aa5b4b View commit details
    Browse the repository at this point in the history

  7. Tests correction according to changed logic 

    Tests traces data was changed to fit parents definition method by a traceIDs

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    0c49d43 View commit details
    Browse the repository at this point in the history

  8. Checking of parent span presence 

    Added a checking of parent span presence among all trace's spans

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    8d3eb81 View commit details
    Browse the repository at this point in the history

  9. Tests correction according to changed logic 

    Tests traces data was changed according to changed logic

Signed-off-by: Valerii Varankin <swapster@yandex-team.ru>
    @swapster
    swapster committed Mar 11, 2020
    Configuration menu
    Copy the full SHA
    3b2cbae View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2020

  1. Merge branch 'master' into correct-trace-name-resolution

    @yurishkuro
    yurishkuro committed Mar 12, 2020
    Configuration menu
    Copy the full SHA
    cd8d04c View commit details
    Browse the repository at this point in the history