Use DisableLogsFieldSearch flag to deduce es logs field mapping in te…

…mplate Signed-off-by: Parvesh Chaudhary <parveshchaudhary111@gmail.com> Co-authored-by: Raghav Gupta <ragaws1674@gmail.com>
jaegertracing · Sep 8, 2024 · 5793145 · 5793145
1 parent 257a562
commit 5793145
Show file tree

Hide file tree

Showing 16 changed files with 75 additions and 229 deletions.
diff --git a/cmd/es-rollover/app/init/action.go b/cmd/es-rollover/app/init/action.go
@@ -40,7 +40,7 @@ func (c Action) getMapping(version uint, templateName string) (string, error) {
  UseILM: c.Config.UseILM,
  ILMPolicyName: c.Config.ILMPolicyName,
  EsVersion: version,
- LogsFieldsType:  mappings.ParseFieldType(c.Config.DisableLogsFieldSearch),
+ DisableLogsFieldSearch: c.Config.DisableLogsFieldSearch,
  }
  return mappingBuilder.GetMapping(templateName)
 }

diff --git a/cmd/esmapping-generator/app/flags.go b/cmd/esmapping-generator/app/flags.go
@@ -16,7 +16,7 @@ type Options struct {
  IndexPrefix string
  UseILM string // using string as util is being used in python and using bool leads to type issues.
  ILMPolicyName string
- DisableLogsFieldSearch string
+ DisableLogsFieldSearch string // using string as util is being used in python and using bool leads to type issues.
 }
 
 const (

diff --git a/cmd/esmapping-generator/app/renderer/render.go b/cmd/esmapping-generator/app/renderer/render.go
@@ -24,16 +24,20 @@ func GetMappingAsString(builder es.TemplateBuilder, opt *app.Options) (string, e
  if err != nil {
  return "", err
  }
+ disableLogsFieldSearch, err := strconv.ParseBool(opt.DisableLogsFieldSearch)
+ if err != nil {
+ return "", err
+ }
 
  mappingBuilder := mappings.MappingBuilder{
- TemplateBuilder: builder,
- Shards: opt.Shards,
- Replicas: opt.Replicas,
- EsVersion: opt.EsVersion,
- IndexPrefix: opt.IndexPrefix,
- UseILM: enableILM,
- ILMPolicyName: opt.ILMPolicyName,
- LogsFieldsType: mappings.ParseFieldType(opt.DisableLogsFieldSearch),
+ TemplateBuilder:  builder,
+ Shards:  opt.Shards,
+ Replicas:  opt.Replicas,
+ EsVersion:  opt.EsVersion,
+ IndexPrefix:  opt.IndexPrefix,
+ UseILM:  enableILM,
+ ILMPolicyName:  opt.ILMPolicyName,
+ DisableLogsFieldSearch: disableLogsFieldSearch,
  }
  return mappingBuilder.GetMapping(opt.Mapping)
 }

diff --git a/cmd/esmapping-generator/app/renderer/render_test.go b/cmd/esmapping-generator/app/renderer/render_test.go
@@ -53,16 +53,16 @@ func Test_getMappingAsString(t *testing.T) {
  IndexPrefix: "test-",
  UseILM: "true",
  ILMPolicyName: "jaeger-test-policy",
- DisableLogsFieldSearch: "false",
+ DisableLogsFieldSearch: "true",
  },
  wantedMapping: &mappings.MappingBuilder{
- EsVersion: 7,
- Shards: 5,
- Replicas: 1,
- IndexPrefix: "test-",
- UseILM: true,
- ILMPolicyName: "jaeger-test-policy",
- LogsFieldsType: mappings.NestedFieldType,
+ EsVersion:  7,
+ Shards:  5,
+ Replicas:  1,
+ IndexPrefix:  "test-",
+ UseILM:  true,
+ ILMPolicyName:  "jaeger-test-policy",
+ DisableLogsFieldSearch: true,
  },
  want: "ES version 7",
  },
@@ -79,13 +79,13 @@ func Test_getMappingAsString(t *testing.T) {
  DisableLogsFieldSearch: "false",
  },
  wantedMapping: &mappings.MappingBuilder{
- EsVersion: 7,
- Shards: 5,
- Replicas: 1,
- IndexPrefix: "test-",
- UseILM: false,
- ILMPolicyName: "jaeger-test-policy",
- LogsFieldsType: mappings.ObjectFieldType,
+ EsVersion:  7,
+ Shards:  5,
+ Replicas:  1,
+ IndexPrefix:  "test-",
+ UseILM:  false,
+ ILMPolicyName:  "jaeger-test-policy",
+ DisableLogsFieldSearch: false,
  },
  wantErr: errors.New("parse error"),
  },
@@ -100,16 +100,8 @@ func Test_getMappingAsString(t *testing.T) {
  UseILM: "foo",
  ILMPolicyName: "jaeger-test-policy",
  },
- wantedMapping: &mappings.MappingBuilder{
- EsVersion: 7,
- Shards: 5,
- Replicas: 1,
- IndexPrefix: "test-",
- UseILM: false,
- ILMPolicyName: "jaeger-test-policy",
- LogsFieldsType: mappings.ObjectFieldType,
- },
- wantErr: errors.New("strconv.ParseBool: parsing \"foo\": invalid syntax"),
+ wantedMapping: &mappings.MappingBuilder{},
+ wantErr: errors.New("strconv.ParseBool: parsing \"foo\": invalid syntax"),
  },
  {
  name: "Parse bool error for DisableLogsFieldSearch",
@@ -123,16 +115,8 @@ func Test_getMappingAsString(t *testing.T) {
  ILMPolicyName: "jaeger-test-policy",
  DisableLogsFieldSearch: "foo",
  },
- wantedMapping: &mappings.MappingBuilder{
- EsVersion: 7,
- Shards: 5,
- Replicas: 1,
- IndexPrefix: "test-",
- UseILM: false,
- ILMPolicyName: "jaeger-test-policy",
- LogsFieldsType: mappings.ObjectFieldType,
- },
- wantErr: errors.New("strconv.ParseBool: parsing \"foo\": invalid syntax"),
+ wantedMapping: &mappings.MappingBuilder{},
+ wantErr: errors.New("strconv.ParseBool: parsing \"foo\": invalid syntax"),
  },
  }
  for _, tt := range tests {

diff --git a/plugin/storage/es/factory.go b/plugin/storage/es/factory.go
@@ -323,6 +323,7 @@ func mappingBuilderFromConfig(cfg *config.Configuration) mappings.MappingBuilder
  PrioritySpanTemplate: cfg.PrioritySpanTemplate,
  PriorityServiceTemplate: cfg.PriorityServiceTemplate,
  PriorityDependenciesTemplate: cfg.PriorityDependenciesTemplate,
+ DisableLogsFieldSearch: cfg.DisableLogsFieldSearch,
  }
 }
 

diff --git a/plugin/storage/es/mappings/fieldType.go b/plugin/storage/es/mappings/fieldType.go
diff --git a/plugin/storage/es/mappings/fieldType_test.go b/plugin/storage/es/mappings/fieldType_test.go
diff --git a/...er-span-with-object-fieldtype-logs-6.json → ...er-span-with-logs-fieldtype-object-6.json b/...er-span-with-object-fieldtype-logs-6.json → ...er-span-with-logs-fieldtype-object-6.json
diff --git a/...er-span-with-object-fieldtype-logs-7.json → ...er-span-with-logs-fieldtype-object-7.json b/...er-span-with-object-fieldtype-logs-7.json → ...er-span-with-logs-fieldtype-object-7.json
diff --git a/...er-span-with-object-fieldtype-logs-8.json → ...er-span-with-logs-fieldtype-object-8.json b/...er-span-with-object-fieldtype-logs-8.json → ...er-span-with-logs-fieldtype-object-8.json
diff --git a/plugin/storage/es/mappings/jaeger-span-6.json b/plugin/storage/es/mappings/jaeger-span-6.json
@@ -65,14 +65,22 @@
  "type":"integer"
  },
  "logs":{
- "type":"{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type":"object",
+ {{- else }}
+ "type":"nested",
+ {{- end }}
  "dynamic":false,
  "properties":{
  "timestamp":{
  "type":"long"
  },
  "fields":{
- "type":"{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type":"object",
+ {{- else }}
+ "type":"nested",
+ {{- end }}
  "dynamic":false,
  "properties":{
  "key":{

diff --git a/plugin/storage/es/mappings/jaeger-span-7.json b/plugin/storage/es/mappings/jaeger-span-7.json
@@ -69,14 +69,22 @@
  "type":"integer"
  },
  "logs":{
- "type":"{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type":"object",
+ {{- else }}
+ "type":"nested",
+ {{- end }}
  "dynamic":false,
  "properties":{
  "timestamp":{
  "type":"long"
  },
  "fields":{
- "type":"{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type":"object",
+ {{- else }}
+ "type":"nested",
+ {{- end }}
  "dynamic":false,
  "properties":{
  "key":{

diff --git a/plugin/storage/es/mappings/jaeger-span-8.json b/plugin/storage/es/mappings/jaeger-span-8.json
@@ -72,14 +72,22 @@
  "type": "integer"
  },
  "logs": {
- "type": "{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type": "object",
+ {{- else }}
+ "type": "nested",
+ {{- end }}
  "dynamic": false,
  "properties": {
  "timestamp": {
  "type": "long"
  },
  "fields": {
- "type": "{{ .LogsFieldsType }}",
+ {{- if .DisableLogsFieldSearch }}
+ "type": "object",
+ {{- else }}
+ "type": "nested",
+ {{- end }}
  "dynamic": false,
  "properties": {
  "key": {

diff --git a/plugin/storage/es/mappings/mapping.go b/plugin/storage/es/mappings/mapping.go
@@ -29,7 +29,7 @@ type MappingBuilder struct {
  IndexPrefix string
  UseILM bool
  ILMPolicyName string
- LogsFieldsType  FieldType
+ DisableLogsFieldSearch bool
 }
 
 // GetMapping returns the rendered mapping based on elasticsearch version