-
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
Fix: Remove hardcoded sampling-strategies.json dependency in Jaeger in-one binary #6356
Conversation
…ll-in-one binary Signed-off-by: yunmaoQu <[email protected]>
0845def
to
29c1ab5
Compare
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6356 +/- ##
===========================================
- Coverage 96.07% 49.05% -47.03%
===========================================
Files 359 182 -177
Lines 20504 11205 -9299
===========================================
- Hits 19700 5497 -14203
- Misses 613 5262 +4649
- Partials 191 446 +255
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
if err := command.Execute(); err != nil { | ||
log.Fatal(err) | ||
} | ||
strategiesFile := "./cmd/jaeger/sampling-strategies.json" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this logic does not belong in main
@@ -28,12 +28,9 @@ extensions: | |||
max_traces: 100000 | |||
|
|||
remote_sampling: | |||
# We can either use file or adaptive sampling strategy in remote_sampling | |||
file: | |||
path: ./cmd/jaeger/sampling-strategies.json |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We still want to use a file based strategy by default. A user running all-in-one should be able to override the path via --set
flag.
Hi @yurishkuro I also checked the config files under cmd/jaeger/internal/config.yaml and found this line, which is commented out:
I'm wondering why this is commented out. Is this the file where I should make changes? |
It's not commented out jaeger/cmd/jaeger/internal/all-in-one.yaml Lines 30 to 34 in 4ecb086
But it is incorrect to leave it like this because it assumes some random location of the config. My proposal would be to keep the |
Closing this in favor of #6431 |
Which problem is this PR solving?
Description of the changes
all-in-one.yaml
).sampling-strategies.json
file.How was this change tested?
Checklist
jaeger
:make lint test
jaeger-ui
:npm run lint
andnpm run test