-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
[v2][query] Apply "Max Clock Skew Adjust" setting #6566
Conversation
d111ea7
to
268a0ef
Compare
@yurishkuro I adjusted the PR to instead pass down the value through the service options and make the adjuster internal. I hope I understood your comment correctly by that change idea. There didn't seem to be any reason to keep the adjuster public and imho this way it's clearer as there is only one place that sets the adjuster field. |
We have a bit of a mess right now:
As a result, in v1 the user-settings are respected, but in v2 we always end up with I would like to minimize duplication. My suggestion is:
|
268a0ef
to
71a0700
Compare
5867d9c
to
43daedc
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6566 +/- ##
==========================================
- Coverage 95.94% 95.93% -0.02%
==========================================
Files 365 365
Lines 20616 20618 +2
==========================================
- Hits 19781 19780 -1
- Misses 636 638 +2
- Partials 199 200 +1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
SIGSEGV in unit tests, please make sure |
7efa229
to
61b14c9
Compare
Sorry for that, didn't test the latest few changes anymore before heading to bed. Tests should be passing again now 🙇♂️ |
Ah I see some merge conflicts have come up, let me fix those (hopefully) real quick. |
61b14c9
to
c794409
Compare
Apply the `max_clock_skew_adjust` setting to the query service during initialization. The maximum clock skew adjustment setting for the query component is properly read during initialization, but not applied in the v2 server in the end. This causes it to always default to 1 second, regardless of the configuration value. Signed-off-by: Dominik Nakamura <[email protected]>
c794409
to
e208918
Compare
Thanks! |
Apply the
max_clock_skew_adjust
setting to the query service during initialization.The maximum clock skew adjustment setting for the query component is properly read during initialization, but not applied in the v2 server in the end. This causes it to always default to 1 second, regardless of the configuration value.
Which problem is this PR solving?
Description of the changes
Adjuster
on both the v1 and v2 query options.0
so applying this unconditionally would now disable the clock skew adjustment instead of defaulting to1s
? However, the same seems to be done in the older services from v1.1s
instead of0
(which disables adjustments completely) might have been an accident?How was this change tested?
Checklist
jaeger
:make lint test
jaeger-ui
:npm run lint
andnpm run test