Zipkin 706 prevent intermediate services to override a sample rate when doing zipkin_attrs override #137
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
drolando
reviewed
Oct 14, 2019
tests/zipkin_test.py
Outdated
| @@ -215,6 +213,17 @@ def test_init_span_storage_wrong_type(self): | |||
| ): | |||
| pass | |||
|
|
|||
| def test_error_when_sample_rate_and_attrs_override(self): | |||
| with pytest.raises(ZipkinError): | |||
There was a problem hiding this comment.
catch the exception with as e and then assert that the message contains sample_rate should not be set when zipkin_attrs are provided
| @@ -241,6 +241,10 @@ def __init__( | |||
| "use the timestamp and duration parameters." | |||
| ) | |||
|
|
|||
| if self.zipkin_attrs_override and self.sample_rate is not None: | |||
| raise ZipkinError( | |||
| 'sample_rate should not be set when zipkin_attrs are provided') | |||
There was a problem hiding this comment.
Also add a section in DEPRECATIONS.rst on how to do the resampling now that this is gone.
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.
with zipkin_attrs override the sample_rate is defaulted to 100 percent if no explicit sample_rate is provided. While creating zipkin_span though there is an option to additionally provide a sample_rate. This change throughs a ZipkinError if both zipkin_attr override and sample_rate were specified at the same time. The sample_rate override should be part of the zipkin_attr creation.