make default maxSpans for zipkin endpoint configurable #19
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
autata
force-pushed
the
configure-max-spans
branch
from
08563c0 to
1731db9
Compare
baroquebobcat
approved these changes
Dec 4, 2024
| @@ -34,7 +34,7 @@ public class ZipkinServiceTest { | |||
| @BeforeEach | |||
| public void setup() throws IOException { | |||
| MockitoAnnotations.openMocks(this); | |||
| zipkinService = spy(new ZipkinService(searcher)); | |||
| zipkinService = spy(new ZipkinService(searcher, 20000)); | |||
There was a problem hiding this comment.
I think it'd be good to add a test of the max behavior before upstreaming. Now that it's configureable, it'd probably be easier to construct a test case with a service object that has a really small max.
| @@ -50,6 +50,7 @@ queryConfig: | |||
| serverAddress: ${ASTRA_QUERY_SERVER_ADDRESS:-localhost} | |||
| requestTimeoutMs: ${ASTRA_QUERY_REQUEST_TIMEOUT_MS:-5000} | |||
| defaultQueryTimeoutMs: ${ASTRA_QUERY_DEFAULT_QUERY_TIMEOUT_MS:-3000} | |||
| zipkinDefaultMaxSpans: ${ASTRA_QUERY_ZIPKIN_DEFAULT_MAX_SPANS:-20000} | |||
There was a problem hiding this comment.
Also, adding docs for zipkinDefaultMaxSpans hereish: https://github.com/airbnb/kaldb/blob/airbnb-main/docs/topics/Config-options.md?plain=1#L315 would be good.
| .withAnnotatedService( | ||
| new ZipkinService( | ||
| astraDistributedQueryService, | ||
| astraConfig.getQueryConfig().getZipkinDefaultMaxSpans())) |
There was a problem hiding this comment.
I think it'd be good to add a precondition for the zipkinDefaultMaxSpans value. Maybe add another checkArgument call for it in ValidateAstraConfig.validateQueryConfig?
autata
force-pushed
the
configure-max-spans
branch
from
c69374f to
0b8a9d8
Compare
autata
force-pushed
the
configure-max-spans
branch
from
685631d to
a14240d
Compare
autata
changed the title
set reasonable default so checks pass
autata
force-pushed
the
configure-max-spans
branch
from
ae420f7 to
4660563
Compare
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.
Summary
This makes the default
maxSpansfor the zipkin API configurable and sets the default to 20k which is what it is hardcoded as right now.To note: the param
maxSpansdoes exist, but the grafana zipkin plugin does not support using that. So it makes sense for us to configure this default at the stack level as well.Requirements