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

client: use Tracer from Span and fix unfinished span #7860

Merged
merged 9 commits into from
Mar 5, 2024

Conversation

CabinfeverB
Copy link
Member

@CabinfeverB CabinfeverB commented Feb 29, 2024

What problem does this PR solve?

Issue Number: close #7861

What is changed and how does it work?

  1. using Tracer from Span not global tracer
  2. finish Span for GetLocalTSAsync

Check List

Tests

  • Unit test
  • manual test
    image

Code changes

Side effects

  • Possible performance regression
  • Increased code complexity
  • Breaking backward compatibility

Related changes

Release note

None.

Signed-off-by: Cabinfever_B <[email protected]>
Signed-off-by: Cabinfever_B <[email protected]>
Signed-off-by: Cabinfever_B <[email protected]>
Copy link
Contributor

ti-chi-bot bot commented Feb 29, 2024

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • JmPotato
  • rleungx

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot bot added the release-note-none Denotes a PR that doesn't merit a release note. label Feb 29, 2024
@ti-chi-bot ti-chi-bot bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 29, 2024
Signed-off-by: Cabinfever_B <[email protected]>
@CabinfeverB CabinfeverB changed the title client: fix unfinished span client: use Tracer from Span and fix unfinished span Feb 29, 2024
Signed-off-by: Cabinfever_B <[email protected]>
@ti-chi-bot ti-chi-bot bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 29, 2024
Signed-off-by: Cabinfever_B <[email protected]>
Signed-off-by: Cabinfever_B <[email protected]>
Copy link

codecov bot commented Feb 29, 2024

Codecov Report

Merging #7860 (7b2f4b4) into master (2851db2) will increase coverage by 0.05%.
Report is 2 commits behind head on master.
The diff coverage is 22.22%.

❗ Current head 7b2f4b4 differs from pull request most recent head 7ec9bd1. Consider uploading reports for the commit 7ec9bd1 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7860      +/-   ##
==========================================
+ Coverage   73.44%   73.50%   +0.05%     
==========================================
  Files         433      433              
  Lines       47972    47966       -6     
==========================================
+ Hits        35235    35257      +22     
+ Misses       9691     9664      -27     
+ Partials     3046     3045       -1     
Flag Coverage Δ
unittests 73.50% <22.22%> (+0.05%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

_, _, err = cli.GetTS(ctx)
re.NoError(err)
spans = recorder.GetSpans()
re.Len(spans, 3)
Copy link
Member

Choose a reason for hiding this comment

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

There are two GetLocalTSAsync, is it expected?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, because we use the same recorder twice.

@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 5, 2024
@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Mar 5, 2024
@JmPotato
Copy link
Member

JmPotato commented Mar 5, 2024

@CabinfeverB Please resolve the conflicts.

Signed-off-by: Cabinfever_B <[email protected]>
@CabinfeverB
Copy link
Member Author

/merge

Copy link
Contributor

ti-chi-bot bot commented Mar 5, 2024

@CabinfeverB: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and if the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

If you have any questions about the PR merge process, please refer to pr process.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

Copy link
Contributor

ti-chi-bot bot commented Mar 5, 2024

This pull request has been accepted and is ready to merge.

Commit hash: 7b2f4b4

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 5, 2024
Copy link
Contributor

ti-chi-bot bot commented Mar 5, 2024

@CabinfeverB: Your PR was out of date, I have automatically updated it for you.

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot bot merged commit ba33aa5 into tikv:master Mar 5, 2024
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PD Client don't record Span of opentracing
3 participants