Skip to content

Commit 2b6a0b8

Browse files
author
Saied Kazemi
authored
Use legacy CachedResult instead of CachedTrace (#142)
This commit changes the CachedTrace field name in the metadata line back to CachedResult to prevent a breakage in the ETL parser. The changes were tested locally.
1 parent 1035233 commit 2b6a0b8

15 files changed

+20
-19
lines changed

parser/parser.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"time"
88
)
99

10+
// Errors returned by parser.
1011
var (
1112
ErrTracerouteType = errors.New("unknown traceroute type")
1213
ErrTracerouteFile = errors.New("invalid traceroute file")
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start, "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start-invalid", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace"}
44
{"type":"cycle-stop"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop, "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start"}
33
{"type":"trace"}
44
{"type":"cycle-stop-invalid", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}

parser/testdata/scamper2/invalid-last-line

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":,"TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":,"TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}

parser/testdata/scamper2/invalid-num-lines

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":[{"addr":"192.168.144.1","probe_ttl":1,"probe_id":1,"probe_size":44,"tx":{"sec":1638999963,"usec":788025},"rtt":0.07,"reply_ttl":64,"reply_tos":192,"reply_ipid":11379,"reply_size":72,"icmp_type":11,"icmp_code":0,"icmp_q_ttl":1,"icmp_q_ipl":44,"icmp_q_tos":0},{"addr":"91.189.88.142","probe_ttl":14,"probe_id":1,"probe_size":44,"tx":{"sec":1638999984,"usec":523505},"rtt":135.61,"reply_ttl":46,"reply_tos":128,"reply_ipid":26001,"reply_size":44,"icmp_type":0,"icmp_code":0}]}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedTrace":false,"CachedUUID":""}
1+
{"UUID":"0000000000","TracerouteCallerVersion":"0000000","CachedResult":false,"CachedUUID":""}
22
{"type":"cycle-start", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "start_time":1566691298}
33
{"type":"trace","version":"0.1","userid":0,"method":"icmp-echo-paris","src":"192.168.144.2","dst":"91.189.88.142","icmp_sum":33009,"stop_reason":"COMPLETED","stop_data":0,"start":{"sec":1638999963,"usec":787829,"ftime":"2021-12-08 21:46:03"},"hop_count":2,"attempts":2,"hoplimit":0,"firsthop":1,"wait":5,"wait_probe":0,"tos":0,"probe_size":44,"probe_count":16,"hops":}
44
{"type":"cycle-stop", "list_name":"/tmp/scamperctrl:51811", "id":1, "hostname":"ndt-plh7v", "stop_time":1566691298}

0 commit comments

Comments
 (0)