Move pkg/normalizer to collector #6877
Merged
Conversation
This file contains hidden or 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
Signed-off-by: danish9039 <[email protected]>
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #6877 +/- ##
=======================================
Coverage 96.13% 96.13%
=======================================
Files 341 341
Lines 19738 19738
=======================================
Hits 18975 18975
Misses 577 577
Partials 186 186
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
yurishkuro
requested changes
Mar 19, 2025
cmd/collector/app/metrics.go
Outdated
| @@ -327,13 +327,15 @@ func (m *traceCountsBySvc) countByServiceName(serviceName string, isDebug bool, | |||
| // an alert should be raised to investigate what's causing so many unique | |||
| // service names. | |||
| func (m *spanCountsBySvc) countByServiceName(serviceName string, isDebug bool) { | |||
| serviceName = normalizer.ServiceName(serviceName) | |||
| m.lock.Lock() | |||
There was a problem hiding this comment.
This is not a required change for this pr and makes the code slower
There was a problem hiding this comment.
i have reverted these changes
cmd/collector/app/metrics.go
Outdated
| @@ -363,3 +364,42 @@ func (m *traceCountsBySvc) buildKey(serviceName, samplerType string) string { | |||
| m.stringBuilderPool.Put(keyBuilder) | |||
| return key | |||
| } | |||
| func normalizeServiceName(serviceName string) string { | |||
There was a problem hiding this comment.
Move the files, don't inline. We don't need xtra diffs.
Signed-off-by: danish9039 <[email protected]>
yurishkuro
reviewed
Mar 20, 2025
yurishkuro
reviewed
Mar 20, 2025
Signed-off-by: Yuri Shkuro <[email protected]>
yurishkuro
approved these changes
Mar 20, 2025
yurishkuro
added
the
changelog:refactoring
Merged
via the queue into
jaegertracing:main
with commit Mar 20, 2025
7152b42
56 of 57 checks passed
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
<!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - part of jaegertracing#6869 ## Description of the changes - inline the `/pkg/normalizer `package into the metrics.go file where it's used. ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: danish9039 <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]>
amilbcahat
pushed a commit
to amilbcahat/jaeger
that referenced
this pull request
May 4, 2025
<!-- !! Please DELETE this comment before posting. We appreciate your contribution to the Jaeger project! 👋🎉 --> ## Which problem is this PR solving? - part of jaegertracing#6869 ## Description of the changes - inline the `/pkg/normalizer `package into the metrics.go file where it's used. ## How was this change tested? - ## Checklist - [ ] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [ ] I have signed all commits - [ ] I have added unit tests for the new functionality - [ ] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: danish9039 <[email protected]> Signed-off-by: Yuri Shkuro <[email protected]> Co-authored-by: Yuri Shkuro <[email protected]> Signed-off-by: amol-verma-allen <[email protected]>
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.
Which problem is this PR solving?
Description of the changes
/pkg/normalizerpackage into the metrics.go file where it's used.How was this change tested?
Checklist
jaeger:make lint testjaeger-ui:npm run lintandnpm run test