refactor: use enum instead of strings for ES mappings #6068
+119
−37
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
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
Saumya40-codes
force-pushed
the
switch-to-enums
branch
from
f2b6b51
to
ac6de11
Compare
yurishkuro
approved these changes
Oct 7, 2024
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
Saumya40-codes
changed the title
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
Signed-off-by: Saumya Shah <saumyabshah90@gmail.com>
|
anything im missing out on here @yurishkuro ? |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #6068 +/- ##
==========================================
- Coverage 96.92% 96.81% -0.12%
==========================================
Files 349 349
Lines 16598 16650 +52
==========================================
+ Hits 16087 16119 +32
- Misses 328 345 +17
- Partials 183 186 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
yurishkuro
reviewed
Oct 8, 2024
| {mapping: SpanMapping, esVersion: 6}, | ||
| {mapping: ServiceMapping, esVersion: 8}, | ||
| {mapping: ServiceMapping, esVersion: 7}, | ||
| {mapping: DependenciesMapping, esVersion: 6}, |
There was a problem hiding this comment.
Suggested change
| {mapping: DependenciesMapping, esVersion: 6}, | |
| {mapping: ServiceMapping, esVersion: 6}, |
| case SamplingMapping: | ||
| return "jaeger-sampling", nil | ||
| default: | ||
| return "", fmt.Errorf("Unknown mapping type %d", mt) |
There was a problem hiding this comment.
String() methods usually do not return errors. You can return "unknown" string.
| return ok | ||
| } | ||
|
|
||
| // stringToMappingType converts a string to a MappingType | ||
| func stringToMappingType(val string) (mappings.MappingType, error) { |
There was a problem hiding this comment.
this translation can be co-located with the MappingType definition:
func MappingTypeFromString(val string) (MappingType, error)
| "jaeger-service": {}, | ||
| "jaeger-dependencies": {}, | ||
| "jaeger-sampling": {}, | ||
| var supportedMappings = map[mappings.MappingType]struct{}{ |
| return "", err | ||
| } | ||
|
|
||
| return mappingBuilder.GetMapping(mappingType) | ||
| } | ||
|
|
||
| // IsValidOption checks if passed option is a valid index template. | ||
| func IsValidOption(val string) bool { |
There was a problem hiding this comment.
I don't think this function is needed. Wherever it's called the called can instead do
if m, err := MappingTypeFromString(val); err == nil {
//
}
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
plugin/storage/es/mappings/mapping.gowe are using bare string inorder to for the file mapping. This PR refractors this approach to use enums instead of stringHow was this change tested?
go testChecklist
jaeger:make lint testjaeger-ui:yarn lintandyarn test