fix: remove incorrect forced addition of timestamp to fields

influxdata · Sep 7, 2023 · cdbf514 · cdbf514
1 parent bfbe195
commit cdbf514
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 27 deletions.
diff --git a/plugins/parsers/avro/parser.go b/plugins/parsers/avro/parser.go
@@ -173,23 +173,6 @@ func (p *Parser) createMetric(data map[string]interface{}, schema string) (teleg
 		// get what you asked for.
 		fieldList = p.Fields
 
-		// Except...if you specify the timestamp field, and it's
-		// not listed in your fields, you'll get it anyway.
-		// This will randomize your field ordering, which isn't
-		// ideal.  If you care, list the timestamp field.
-		if p.Timestamp != "" {
-			// quick list-to-set-to-list implementation
-			fieldSet := make(map[string]bool)
-			for k := range fieldList {
-				fieldSet[fieldList[k]] = true
-			}
-			fieldSet[p.Timestamp] = true
-			var newList []string
-			for s := range fieldSet {
-				newList = append(newList, s)
-			}
-			fieldList = newList
-		}
 	} else {
 		for k := range data {
 			// Otherwise, that which is not a tag is a field

diff --git a/plugins/parsers/avro/testdata/json-format/message.json b/plugins/parsers/avro/testdata/json-format/message.json
@@ -4,4 +4,4 @@
     "up_time": 1166984904,
     "cpu_utilization": 14.0,
     "memory_utilization": 20.0
-}
+}
diff --git a/plugins/parsers/avro/testdata/json-format/telegraf.conf b/plugins/parsers/avro/testdata/json-format/telegraf.conf
@@ -5,7 +5,7 @@
   avro_format = "json"
   avro_measurement = "Switch"
   avro_tags = ["switch_wwn"]
-  avro_fields = ["up_time", "cpu_utilization", "memory_utilization"]
+  avro_fields = ["up_time", "cpu_utilization", "memory_utilization", "statistics_collection_time"]
   avro_timestamp = "statistics_collection_time"
   avro_timestamp_format = "unix_ms"
   avro_schema = '''
@@ -22,4 +22,4 @@
                         {"name": "memory_utilization", "type": "float", "default": 0, "doc": "Memory Utilization in %"}
                 ]
         }
-  '''
+  '''
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/expected.out b/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/expected.out
@@ -1 +1 @@
-measurement,tag=test_tag field=19i,timestamp=1664296121000000i 1664296121000000
+measurement,tag=test_tag field=19i 1664296121000000
diff --git a/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/telegraf.conf b/plugins/parsers/avro/testdata/supplied_timestamp_fields_unspecified/telegraf.conf
@@ -4,8 +4,6 @@
   avro_measurement = "measurement"
   avro_tags = [ "tag" ]
   avro_fields = [ "field" ]
-  avro_timestamp = "timestamp"
-  avro_timestamp_format = "unix_us"
   avro_schema = '''
 {
   "type":"record",
@@ -19,10 +17,6 @@
       {
 	  "name":"field",
 	  "type":"long"
-      },
-      {
-	  "name":"timestamp",
-	  "type":"long"
       }
   ]
 }