luciano/amazon-kinesis-client-go
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

decode: s/type/decoder_msg_type

Browse source 
type is a really generally name. sometimes, it is used in other
libraries or various output as a valid field name. let's not make it a
reserved keyword that gets overriden by type == Kayvee
This commit is contained in:
Nathan Leiby 2017-08-17 14:36:53 -07:00
parent 4b4af77ba2
commit d1473f894a
2 changed files with 120 additions and 120 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
decode/decode.go
View file

@ -15,7 +15,7 @@ import (
var reservedFields = []string{ var reservedFields = []string{
"prefix", "prefix",
"postfix", "postfix",
"Type", "decoder_msg_type",
} }
func stringInSlice(s string, slice []string) bool { func stringInSlice(s string, slice []string) bool {
@ -97,7 +97,7 @@ func FieldsFromKayvee(line string) (map[string]interface{}, error) {
} }
} }
m["type"] = "Kayvee" m["decoder_msg_type"] = "Kayvee"
return m, nil return m, nil
} }

236
decode/decode_test.go
View file

@ -24,10 +24,10 @@ func TestKayveeDecoding(t *testing.T) {
Title: "handles just JSON", Title: "handles just JSON",
Input: `{"a":"b"}`, Input: `{"a":"b"}`,
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"prefix": "", "prefix": "",
"postfix": "", "postfix": "",
"a": "b", "a": "b",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -35,10 +35,10 @@ func TestKayveeDecoding(t *testing.T) {
Title: "handles prefix + JSON", Title: "handles prefix + JSON",
Input: `prefix {"a":"b"}`, Input: `prefix {"a":"b"}`,
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"prefix": "prefix ", "prefix": "prefix ",
"postfix": "", "postfix": "",
"a": "b", "a": "b",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -46,10 +46,10 @@ func TestKayveeDecoding(t *testing.T) {
Title: "handles JSON + postfix", Title: "handles JSON + postfix",
Input: `{"a":"b"} postfix`, Input: `{"a":"b"} postfix`,
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"prefix": "", "prefix": "",
"postfix": " postfix", "postfix": " postfix",
"a": "b", "a": "b",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -57,10 +57,10 @@ func TestKayveeDecoding(t *testing.T) {
Title: "handles prefix + JSON + postfix", Title: "handles prefix + JSON + postfix",
Input: `prefix {"a":"b"} postfix`, Input: `prefix {"a":"b"} postfix`,
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"prefix": "prefix ", "prefix": "prefix ",
"postfix": " postfix", "postfix": " postfix",
"a": "b", "a": "b",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -221,18 +221,18 @@ func TestParseAndEnhance(t *testing.T) {
Title: "Parses a Kayvee log line from an ECS app", Title: "Parses a Kayvee log line from an ECS app",
Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished"}`}, Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished"}`},
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished"}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished"}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -240,18 +240,18 @@ func TestParseAndEnhance(t *testing.T) {
Title: "Parses a Kayvee log line from an ECS app, with override to container_app", Title: "Parses a Kayvee log line from an ECS app, with override to container_app",
Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished","container_app":"force-app"}`}, Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished","container_app":"force-app"}`},
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished","container_app":"force-app"}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished","container_app":"force-app"}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "force-app", "container_app": "force-app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -280,19 +280,19 @@ func TestParseAndEnhance(t *testing.T) {
Title: "Parses JSON values", Title: "Parses JSON values",
Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`}, Input: ParseAndEnhanceInput{Line: `2017-04-05T21:57:46.794862+00:00 ip-10-0-0-0 env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef[3291]: 2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`},
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"nested": map[string]interface{}{"a": "b"}, "nested": map[string]interface{}{"a": "b"},
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -303,19 +303,19 @@ func TestParseAndEnhance(t *testing.T) {
StringifyNested: true, StringifyNested: true,
}, },
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": {"a":"b"}}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"nested": `{"a":"b"}`, "nested": `{"a":"b"}`,
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -326,19 +326,19 @@ func TestParseAndEnhance(t *testing.T) {
StringifyNested: true, StringifyNested: true,
}, },
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": [{"a":"b"}]}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "nested": [{"a":"b"}]}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"nested": `[{"a":"b"}]`, "nested": `[{"a":"b"}]`,
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -349,19 +349,19 @@ func TestParseAndEnhance(t *testing.T) {
RenameESReservedFields: true, RenameESReservedFields: true,
}, },
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"kv__source": "a", "kv__source": "a",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -383,19 +383,19 @@ func TestParseAndEnhance(t *testing.T) {
MinimumTimestamp: time.Now().Add(-100 * time.Hour * 24 * 365), // good thru year 2117 MinimumTimestamp: time.Now().Add(-100 * time.Hour * 24 * 365), // good thru year 2117
}, },
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"kv__source": "a", "kv__source": "a",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },
@ -407,19 +407,19 @@ func TestParseAndEnhance(t *testing.T) {
MinimumTimestamp: time.Now().Add(-100 * time.Hour * 24 * 365), // good thru year 2117 MinimumTimestamp: time.Now().Add(-100 * time.Hour * 24 * 365), // good thru year 2117
}, },
ExpectedOutput: map[string]interface{}{ ExpectedOutput: map[string]interface{}{
"timestamp": logTime3, "timestamp": logTime3,
"hostname": "ip-10-0-0-0", "hostname": "ip-10-0-0-0",
"programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`, "programname": `env--app/arn%3Aaws%3Aecs%3Aus-west-1%3A999988887777%3Atask%2Fabcd1234-1a3b-1a3b-1234-d76552f4b7ef`,
"rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`, "rawlog": `2017/04/05 21:57:46 some_file.go:10: {"title":"request_finished", "_source": "a"}`,
"title": "request_finished", "title": "request_finished",
"type": "Kayvee", "decoder_msg_type": "Kayvee",
"prefix": "2017/04/05 21:57:46 some_file.go:10: ", "prefix": "2017/04/05 21:57:46 some_file.go:10: ",
"postfix": "", "postfix": "",
"env": "deploy-env", "env": "deploy-env",
"container_env": "env", "container_env": "env",
"container_app": "app", "container_app": "app",
"container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef", "container_task": "abcd1234-1a3b-1a3b-1234-d76552f4b7ef",
"kv__source": "a", "kv__source": "a",
}, },
ExpectedError: nil, ExpectedError: nil,
}, },