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

Zipkin: Allow SetTag even when the CS annotation is missing (#1414) #1418

Merged
merged 2 commits into from
Aug 9, 2017

Conversation

clguiman
Copy link
Contributor

@clguiman clguiman commented Aug 9, 2017

  • Removed the check for CS annotation in ZipkinSpan::SetTag
  • Removed ZipkinSpan::hasCSAnnotation (SetTag was the only place where it was used)
  • Updated Zipkin Tracer unit tests

@mattklein123
Copy link
Member

@rshriram @fabolive please review.

cc @adriancole if you have time for review.

@fabolive
Copy link
Contributor

fabolive commented Aug 9, 2017

@mattklein123 I will review this later today.

@RomanDzhabarov
Copy link
Member

LGTM, will defer final review to @fabolive

Copy link
Contributor

@fabolive fabolive left a comment

Choose a reason for hiding this comment

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

Looks good to me.

mattklein123
mattklein123 previously approved these changes Aug 9, 2017
@mattklein123 mattklein123 reopened this Aug 9, 2017
@clguiman
Copy link
Contributor Author

clguiman commented Aug 9, 2017

I had a compilation error in zipkin_tracer_impl_test (I missed it due to other tests failing locally), so I amended the commit

@mattklein123
Copy link
Member

@clguimanMSFT thanks in the future once you open PRs please don't rebase (just push new commits). It's easier to review. Thank you.

@@ -0,0 +1 @@
/source/bazel/get_workspace_status
Copy link
Member

Choose a reason for hiding this comment

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

Can you revert this change and below?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sorry for that, I have reverted the change

@clguiman
Copy link
Contributor Author

clguiman commented Aug 9, 2017

Is there some easy way I can just run specific tests? Currently I have a lot of test failures locally and I would like to run just the tests directly affected by my change.

@mattklein123
Copy link
Member

If you are using the CI container directly, IIRC we don't have an option to override the tests. You could hack the script that launches the tests, for example: https://github.com/lyft/envoy/blob/master/ci/do_ci.sh#L49

@mattklein123
Copy link
Member

@clguimanMSFT this is passing tests now. Are you OK to commit or did you want to look at something else?

@clguiman
Copy link
Contributor Author

clguiman commented Aug 9, 2017

@mattklein123 I'm OK with the commit.
Thanks for the help

@mattklein123 mattklein123 merged commit cc53479 into envoyproxy:master Aug 9, 2017
Copy link
Contributor

@codefromthecrypt codefromthecrypt left a comment

Choose a reason for hiding this comment

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

thanks!

nezdolik pushed a commit to nezdolik/envoy that referenced this pull request May 4, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants