Replace mapping.omit_attributes_prefix: true with mapping.mode: raw

open-telemetry · Jan 17, 2024 · d7b8b4e · d7b8b4e
1 parent 0139e75
commit d7b8b4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/exporter/elasticsearchexporter/config.go b/exporter/elasticsearchexporter/config.go
@@ -167,9 +167,6 @@ type MappingsSettings struct {
 	Dedup bool `mapstructure:"dedup"`
 
 	Dedot bool `mapstructure:"dedot"`
-
-	// Omit "Attributes." prefix on fields.
-	OmitAttributesPrefix bool `mapstructure:"omit_attributes_prefix"`
 }
 
 type MappingMode int

diff --git a/exporter/elasticsearchexporter/config_test.go b/exporter/elasticsearchexporter/config_test.go
@@ -134,10 +134,9 @@ func TestLoadConfig(t *testing.T) {
 					MaxInterval:     1 * time.Minute,
 				},
 				Mapping: MappingsSettings{
-					Mode:                 "ecs",
-					Dedup:                true,
-					Dedot:                true,
-					OmitAttributesPrefix: false,
+					Mode:  "ecs",
+					Dedup: true,
+					Dedot: true,
 				},
 				LogstashFormat: LogstashFormatSettings{
 					Enabled:         false,
@@ -185,10 +184,9 @@ func TestLoadConfig(t *testing.T) {
 					MaxInterval:     1 * time.Minute,
 				},
 				Mapping: MappingsSettings{
-					Mode:                 "ecs",
-					Dedup:                true,
-					Dedot:                true,
-					OmitAttributesPrefix: true,
+					Mode:  "raw",
+					Dedup: true,
+					Dedot: true,
 				},
 				LogstashFormat: LogstashFormatSettings{
 					Enabled:         false,

diff --git a/exporter/elasticsearchexporter/testdata/config.yaml b/exporter/elasticsearchexporter/testdata/config.yaml
@@ -41,7 +41,7 @@ elasticsearch/log:
   sending_queue:
     enabled: true
   mapping:
-    omit_attributes_prefix: true
+    mode: raw
 elasticsearch/logstash_format:
   endpoints: [http://localhost:9200]
   logstash_format: