[v2][query] Apply "Max Clock Skew Adjust" setting #6566
+7
−0
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
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]>
yurishkuro
reviewed
Jan 18, 2025
| @@ -100,6 +102,10 @@ func (s *server) Start(ctx context.Context, host component.Host) error { | |||
| if err := s.addArchiveStorage(&opts, &v2opts, host); err != nil { | |||
| return err | |||
| } | |||
|
|
|||
| opts.Adjuster = adjuster.Sequence(querysvc.StandardAdjusters(s.config.MaxClockSkewAdjust)...) | |||
| v2opts.Adjuster = v2adjuster.Sequence(v2adjuster.StandardAdjusters(s.config.MaxClockSkewAdjust)...) | |||
There was a problem hiding this comment.
@mahadzaryab1 did we miss adjusters altogether in query extension?
yurishkuro
reviewed
Jan 18, 2025
| @@ -32,6 +32,7 @@ extensions: | |||
| traces_archive: another_store | |||
| ui: | |||
| config_file: ./cmd/jaeger/config-ui.json | |||
| max_clock_skew_adjust: 5s | |||
There was a problem hiding this comment.
we don't want this in the default config
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.
Apply the
max_clock_skew_adjustsetting 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
Adjusteron both the v1 and v2 query options.0so 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.1sinstead of0(which disables adjustments completely) might have been an accident?How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test