Skip to content

Commit

Permalink
reorg
Browse files Browse the repository at this point in the history
  • Loading branch information
@aybabtme
aybabtme authored and Antoine Grondin committed Sep 15, 2022
1 parent 85936d7 commit 69e78eb
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 38 deletions.
16 changes: 16 additions & 0 deletions e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,22 @@ func TestHarness(t *testing.T) {
t.Errorf("want %q", wantPart)
t.Errorf("got %q", gotPart)
}

dir, err := ioutil.TempDir(os.TempDir(), "humanlog-tests-*")
if err != nil {
t.Fatal(err)
}
gotf, err := ioutil.TempFile(dir, de.Name())
if err != nil {
t.Fatal(err)
}
if _, err := gotf.Write(got); err != nil {
t.Fatal(err)
}
if err := gotf.Close(); err != nil {
t.Fatal(err)
}
t.Logf("wrote output to %q", gotf.Name())
})
}
}
Expand Down
18 changes: 10 additions & 8 deletions test/cases/00003-zap/input
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
@cee: {"data":{"short":"service-startup","message":"The login-api service is running on port 8085."},"datacontenttype":"application/json","id":"01FCV6S4M6S8H3VKAQD9SWFWFP","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:50.246861-05:00","type":"simple-log"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6S9YK70GJ5Q6YT0PYKQDA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6S9YJXD2SYG3HTGWXHX0G","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:55.699075-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SDKRW3XZDA1FAGZ3QVSH","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SDKRHB1RR1Q87Q1SKT5P","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:14:59.448566-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SE597EY6RJ762V59PZQA","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SE596ZMASA1D79M16KVV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.009615-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SEKCC9RG364AJ60J75KW","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SEKCNSQJJ2NDEPQ2TGMP","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.46025-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SF3DXGB8G1DVX19KQZYT","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SF3DJZSXTT1RNR6F1QAV","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:00.973455-05:00","type":"incoming_http_request"}
@cee: {"data":{"short":"http access","message":"incoming HTTP request was served"},"datacontenttype":"application/json","id":"01FCV6SKY9MM7D795258XPQGC9","invapptracingcallingservice":"unset","invapptracingrequestid":"01FCV6SKY9M1D725HTV0ZXKF1V","invapptracingtequestsource":"unset","invloglevel":"Info","invwebbytes":0,"invwebbytesin":0,"invwebbytesout":0,"invwebcached":false,"invwebdesthost":"","invwebdestip":"::ffff:0.0.0.0","invwebduration":0,"invwebhttpcontenttype":"","invwebhttpmethod":"","invwebhttpuseragent":"","invwebhttpuseragentlength":0,"invwebsrcip":"::ffff:0.0.0.0","invwebstatus":0,"invweburipath":"","invweburiquery":"","invweburl":"","invweburllength":0,"source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:05.929423-05:00","type":"incoming_http_request"}
@cee: {"data":{"event":"Shutdown"},"datacontenttype":"application/json","id":"01FCV6SR6JZH7JZ6RFDFN9Q99Y","invloglevel":"Info","source":"irn:libraries:github.com/InVisionApp/invlogger","specversion":"1.0","time":"2021-08-11T13:15:10.290034-05:00","type":"service-shutdown"}
2021-02-05T12:41:48.053-0700 DEBUG zapper/zapper.go:18 some message 1 {"rand_index": 1}
2021-02-05T12:41:49.059-0700 ERROR zapper/zapper.go:18 some message 2 {"rand_index": 3}
2021-02-05T15:45:04.425-0700 FATAL zapper/zapper.go:18 some message 5 {"rand_index": 11}
2021-02-05T12:41:50.064-0700 INFO zapper/zapper.go:18 some message 3 {"rand_index": 5}
2021-02-05T12:41:51.069-0700 WARN zapper/zapper.go:18 some message 4 {"rand_index": 7}
2021-02-06T22:55:22.004Z DEBUG zapper/zapper.go:17 some message 1 {"rand_index": 1}
2021-02-06T22:55:22.008Z ERROR zapper/zapper.go:17 some message 2 {"rand_index": 2}
2021-02-06T22:55:22.009Z FATAL zapper/zapper.go:17 some message 5 {"rand_index": 1}
2021-02-06T22:55:22.009Z INFO zapper/zapper.go:17 some message 3 {"rand_index": 2}
2021-02-06T22:55:22.009Z WARN zapper/zapper.go:17 some message 4 {"rand_index": 4}
18 changes: 10 additions & 8 deletions test/cases/00003-zap/want
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
Aug 11 13:14:50 || <no msg> specversion="1.0" type="simple-log" invloglevel="Info" id="01FCV6S4M6S8H3VKAQD9SWFWFP" datacontenttype="application/json" source="irn:libraries:github.com/InVisionApp/invlogger" data=map[message:The login-api service is running on port 8085. short:service-startup]
Aug 11 13:14:55 || <no msg> invweburl="" invwebbytes=0 invwebstatus=0 invwebbytesin=0 invwebbytesout=0 invwebduration=0 invweburipath="" invwebdesthost="" invweburiquery="" invweburllength=0 invwebcached=false invwebhttpmethod="" invwebhttpuseragent="" invwebhttpcontenttype="" invwebhttpuseragentlength=0 invwebsrcip="::ffff:0.0.0.0" type="incoming_http_request" invwebdestip="::ffff:0.0.0.0" id="01FCV6S9YK70GJ5Q6YT0PYKQDA" invapptracingtequestsource="unset" invapptracingcallingservice="unset" invapptracingrequestid="01FCV6S9YJXD2SYG3HTGWXHX0G" data=map[message:incoming HTTP request was served short:http access]
Aug 11 13:14:59 || <no msg> id="01FCV6SDKRW3XZDA1FAGZ3QVSH" invapptracingrequestid="01FCV6SDKRHB1RR1Q87Q1SKT5P"
Aug 11 13:15:00 || <no msg> id="01FCV6SE597EY6RJ762V59PZQA" invapptracingrequestid="01FCV6SE596ZMASA1D79M16KVV"
Aug 11 13:15:00 || <no msg> id="01FCV6SEKCC9RG364AJ60J75KW" invapptracingrequestid="01FCV6SEKCNSQJJ2NDEPQ2TGMP"
Aug 11 13:15:00 || <no msg> id="01FCV6SF3DXGB8G1DVX19KQZYT" invapptracingrequestid="01FCV6SF3DJZSXTT1RNR6F1QAV"
Aug 11 13:15:05 || <no msg> id="01FCV6SKY9MM7D795258XPQGC9" invapptracingrequestid="01FCV6SKY9M1D725HTV0ZXKF1V"
Aug 11 13:15:10 || <no msg> type="service-shutdown" data=map[event:Shutdown] id="01FCV6SR6JZH7JZ6RFDFN9Q99Y"
Feb 5 12:41:48 |DEBU| some message 1 rand_index=1 caller=zapper/zapper.go:18
Feb 5 12:41:49 |ERRO| some message 2 rand_index=3 caller=zapper/zapper.go:18
Feb 5 15:45:04 |FATA| some message 5 rand_index=11 caller=zapper/zapper.go:18
Feb 5 12:41:50 |INFO| some message 3 rand_index=5 caller=zapper/zapper.go:18
Feb 5 12:41:51 |WARN| some message 4 rand_index=7 caller=zapper/zapper.go:18
2021-02-06T22:55:22.004Z DEBUG zapper/zapper.go:17 some message 1 {"rand_index": 1}
2021-02-06T22:55:22.008Z ERROR zapper/zapper.go:17 some message 2 {"rand_index": 2}
2021-02-06T22:55:22.009Z FATAL zapper/zapper.go:17 some message 5 {"rand_index": 1}
2021-02-06T22:55:22.009Z INFO zapper/zapper.go:17 some message 3 {"rand_index": 2}
2021-02-06T22:55:22.009Z WARN zapper/zapper.go:17 some message 4 {"rand_index": 4}
14 changes: 4 additions & 10 deletions test/cases/10000-behavior-base/input
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
2021-02-05T12:41:48.053-0700 DEBUG zapper/zapper.go:18 some message 1 {"rand_index": 1}
2021-02-05T12:41:49.059-0700 ERROR zapper/zapper.go:18 some message 2 {"rand_index": 3}
2021-02-05T15:45:04.425-0700 FATAL zapper/zapper.go:18 some message 5 {"rand_index": 11}
2021-02-05T12:41:50.064-0700 INFO zapper/zapper.go:18 some message 3 {"rand_index": 5}
2021-02-05T12:41:51.069-0700 WARN zapper/zapper.go:18 some message 4 {"rand_index": 7}
2021-02-06T22:55:22.004Z DEBUG zapper/zapper.go:17 some message 1 {"rand_index": 1}
2021-02-06T22:55:22.008Z ERROR zapper/zapper.go:17 some message 2 {"rand_index": 2}
2021-02-06T22:55:22.009Z FATAL zapper/zapper.go:17 some message 5 {"rand_index": 1}
2021-02-06T22:55:22.009Z INFO zapper/zapper.go:17 some message 3 {"rand_index": 2}
2021-02-06T22:55:22.009Z WARN zapper/zapper.go:17 some message 4 {"rand_index": 4}
{"k2":"lonnnnnnnnnnnnnnnnnnng","k1":"short"}
{"repeated":"first time"}
{"repeated":"first time"}
{"repeated":"second time"}
14 changes: 4 additions & 10 deletions test/cases/10000-behavior-base/want
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
Feb 5 12:41:48 |DEBU| some message 1 rand_index=1 caller=zapper/zapper.go:18
Feb 5 12:41:49 |ERRO| some message 2 rand_index=3 caller=zapper/zapper.go:18
Feb 5 15:45:04 |FATA| some message 5 rand_index=11 caller=zapper/zapper.go:18
Feb 5 12:41:50 |INFO| some message 3 rand_index=5 caller=zapper/zapper.go:18
Feb 5 12:41:51 |WARN| some message 4 rand_index=7 caller=zapper/zapper.go:18
2021-02-06T22:55:22.004Z DEBUG zapper/zapper.go:17 some message 1 {"rand_index": 1}
2021-02-06T22:55:22.008Z ERROR zapper/zapper.go:17 some message 2 {"rand_index": 2}
2021-02-06T22:55:22.009Z FATAL zapper/zapper.go:17 some message 5 {"rand_index": 1}
2021-02-06T22:55:22.009Z INFO zapper/zapper.go:17 some message 3 {"rand_index": 2}
2021-02-06T22:55:22.009Z WARN zapper/zapper.go:17 some message 4 {"rand_index": 4}
Jan 1 00:00:00 || <no msg> k1="short" k2="lonnnnnnnnnnnnnnnnnnng"
Jan 1 00:00:00 || <no msg> repeated="first time"
Jan 1 00:00:00 || <no msg>
Jan 1 00:00:00 || <no msg> repeated="second time"
2 changes: 1 addition & 1 deletion test/cases/10001-behavior-truncates/input
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{"k2":"lonnnnnnnng","k1":"short"}
{"k2":"lonnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnng","k1":"short"}
{"repeated":"first time"}
{"repeated":"first time"}
{"repeated":"second time"}
2 changes: 1 addition & 1 deletion test/cases/10001-behavior-truncates/want
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Jan 1 00:00:00 || <no msg> k1="short" k2="lonnnnnnnng"
Jan 1 00:00:00 || <no msg> k1="short" k2="lonnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnng"
Jan 1 00:00:00 || <no msg> repeated="first time"
Jan 1 00:00:00 || <no msg>
Jan 1 00:00:00 || <no msg> repeated="second time"
0 test/cases/90000-misc-golog/input → test/cases/90000-misc-unchanged/input
View file
File renamed without changes.
0 test/cases/90000-misc-golog/opts.json → test/cases/90000-misc-unchanged/opts.json
View file
File renamed without changes.
0 test/cases/90000-misc-golog/want → test/cases/90000-misc-unchanged/want
View file
File renamed without changes.

0 comments on commit 69e78eb

Please sign in to comment.