diff --git a/connectionlistener/connectionlistener.go b/connectionlistener/connectionlistener.go index caf7f01..ef42133 100644 --- a/connectionlistener/connectionlistener.go +++ b/connectionlistener/connectionlistener.go @@ -103,7 +103,7 @@ func (cl *connectionListener) traceAnnotateAndArchive(ctx context.Context, conn if allErrs != nil { log.Printf("failed to annotate some or all hops (errors: %+v)\n", allErrs) } - if annotations != nil && len(annotations) > 0 { + if len(annotations) > 0 { cl.hopAnnotator.WriteAnnotations(annotations, traceStartTime) } } diff --git a/parser/testdata/20130524T00:04:44Z_ALL5729.paris b/parser/testdata/20130524T00:04:44Z_ALL5729.paris deleted file mode 100644 index d2438d8..0000000 --- a/parser/testdata/20130524T00:04:44Z_ALL5729.paris +++ /dev/null @@ -1,17 +0,0 @@ -traceroute [(91.239.96.102:33456) -> (2.80.132.33:33457)], protocol icmp, algo exhaustive, duration 19 s - 1 P(6, 6) 91.239.96.65 (91.239.96.65) 0.246/0.284/0.314/0.020 ms - 2 P(6, 6) mx-lj1-ge-0-0-3-v110.amis.net (90.157.211.89) 0.984/4.166/19.768/6.978 ms - 3 P(6, 6) mx-vi1-te-0-0-0.amis.net (212.18.44.142) 8.602/13.981/40.600/11.904 ms - 4 P(6, 6) te0-0-2.frk1-cr1.cprm.net (80.81.192.38) 22.939/25.367/26.480/1.193 ms - 5 P(6, 6) ams1-cr1-te0-0-2.cprm.net (195.8.1.33) 29.842/33.365/43.589/4.696 ms - 6 P(6, 6) lon1-cr1-te7-0-5.cprm.net (195.8.0.249) 74.040/77.631/81.690/2.422 ms - 7 P(6, 6) lis2-cr1-be3.cprm.net (195.8.0.217) 76.171/78.649/81.650/1.768 ms !T2 - 8 P(6, 6) bt-cr1-hu5-0-0.cprm.net (195.8.1.58) 74.433/88.352/124.008/17.892 ms !T3 - 9 P(6, 6) dvs-cr1-hu2.cprm.net (195.8.1.13) 74.754/76.854/78.521/1.361 ms -10 P(6, 6) telepac4-huge.cprm.net (195.8.10.206) 76.260/78.578/81.592/1.717 ms -11 P(6, 6) 194.65.12.153 (194.65.12.153) 74.305/83.235/123.161/17.875 ms -12 P(0, 6) -13 P(0, 6) -14 P(0, 6) - - diff --git a/parser/testdata/20160112T00:45:44Z_ALL27409.paris b/parser/testdata/20160112T00:45:44Z_ALL27409.paris deleted file mode 100644 index 6465c51..0000000 --- a/parser/testdata/20160112T00:45:44Z_ALL27409.paris +++ /dev/null @@ -1,14 +0,0 @@ -traceroute [(4.71.254.138:33456) -> (207.150.205.159:33457)], protocol icmp, algo exhaustive, duration 8 s - 1 P(6, 6) ge-7-2.car2.Atlanta2.Level3.net (4.71.254.129) 7.172/72.348/166.927/55.462 ms - 2 P(6, 6) vlan52.ebr2.Atlanta2.Level3.net (4.69.150.126) 19.861/19.899/19.932/0.023 ms !T2 - MPLS Label 2029 TTL=1 - 3 P(0, 6) - 4 P(6, 6) ae-7-7.ebr3.Dallas1.Level3.net (4.69.134.21) 20.101/20.123/20.158/0.018 ms !T4 - MPLS Label 1459 TTL=1 - 5 P(6, 6) ae-73-73.csw2.Dallas1.Level3.net (4.69.151.145) 20.094/20.114/20.137/0.014 ms !T5 - MPLS Label 1493 TTL=1 - 6 P(6, 6) ae-2-70.edge3.Dallas1.Level3.net (4.69.145.72) 20.134/20.149/20.168/0.013 ms - 7 P(6, 6) HOSTWAY-COR.ear1.Dallas1.Level3.net (4.59.112.38) 24.658/24.684/24.709/0.016 ms - 8 P(6, 6) xe-3-3.dist-rtr-02.aus.us.siteprotect.com (216.139.253.70) 24.672/24.718/24.767/0.036 ms - 9 P(6, 6) xe-49.core-fesx-01.tc.aus.us.siteprotect.com (216.139.253.234) 24.985/25.114/25.593/0.217 ms -10 P(6, 6) txapp1.samknows.com (207.150.205.159) 24.900/24.972/25.055/0.045 ms diff --git a/parser/testdata/20170320T23:53:10Z-172.17.94.34-33456-74.125.224.100-33457.paris b/parser/testdata/20170320T23:53:10Z-172.17.94.34-33456-74.125.224.100-33457.paris deleted file mode 100644 index 6ecf1fc..0000000 --- a/parser/testdata/20170320T23:53:10Z-172.17.94.34-33456-74.125.224.100-33457.paris +++ /dev/null @@ -1,9 +0,0 @@ -traceroute [(172.17.94.34:33456) -> (74.125.224.100:33457)], protocol tcp, algo exhaustive, duration 3 s - 1 P(6, 6) 172.17.95.252 (172.17.95.252) 0.376 ms - 2 P(6, 6) us-mtv-cl4-core1-gigabitethernet1-1.n.corp.google.com (172.25.252.172) 0.407 ms - 3 P(6, 6) us-mtv-ply1-bb1-tengigabitethernet2-3.n.corp.google.com (172.25.252.166) 0.501 ms - 4 P(6, 6) us-mtv-ply1-br1-xe-1-1-0-706.n.corp.google.com (172.25.253.46) 0.343 ms - 5 P(16, 16) pr01-xe-7-1-0.pao03.net.google.com (72.14.218.190):0,2,3,4,6,8,10 0.530 ms pr02-xe-3-0-1.pao03.net.google.com (72.14.196.8):1,5,7,9 0.556 ms - 6 P(16, 16) bb01-ae3.nuq04.net.google.com (216.239.49.250):0,2,3,4,6,8,10 1.386 ms bb01-ae7.nuq04.net.google.com (72.14.232.136):1,5,7,9 1.693 ms - 7 P(6, 6) sr05-te1-8.nuq04.net.google.com (64.233.174.109) 1.614 ms - 8 P(6, 6) 74.125.224.100 (74.125.224.100) 0.895 ms diff --git a/parser/testdata/20171208T00:00:04Z-35.188.101.1-40784-173.205.3.38-9090.paris b/parser/testdata/20171208T00:00:04Z-35.188.101.1-40784-173.205.3.38-9090.paris deleted file mode 100644 index 07d0159..0000000 --- a/parser/testdata/20171208T00:00:04Z-35.188.101.1-40784-173.205.3.38-9090.paris +++ /dev/null @@ -1,18 +0,0 @@ -traceroute [(173.205.3.38:33458) -> (35.188.101.1:40784)], protocol icmp, algo exhaustive, duration 14 s - 1 P(6, 6) 173.205.3.1 (173.205.3.1) 0.138/5.405/31.541/11.688 ms - 2 P(6, 6) xe-1-0-6.cr2-sjc1.ip4.gtt.net (89.149.137.5) 19.090/21.052/24.168/1.898 ms - 3 P(6, 6) as15169.sjc10.ip4.gtt.net (199.229.230.134) 19.105/19.611/21.314/0.796 ms - 4 P(6, 6) 108.170.243.13 (108.170.243.13) 19.872/20.275/20.931/0.446 ms - 5 P(6, 6) 209.85.246.206 (209.85.246.206) 20.092/20.545/21.096/0.331 ms - MPLS Label 697177 TTL=1 - 6 P(6, 6) 209.85.248.127 (209.85.248.127) 53.493/54.490/57.796/1.493 ms - MPLS Label 638493 TTL=1 - 7 P(6, 6) 216.239.47.251 (216.239.47.251) 52.755/56.170/67.922/5.386 ms - MPLS Label 402431 TTL=1 - 8 P(6, 6) 216.239.51.185 (216.239.51.185) 52.455/52.652/52.981/0.228 ms - 9 P(6, 6) csd180.gsc.webair.net (173.239.28.18) 4802.776/4803.621/4807.622/1.790 ms -10 P(6, 6) 173.239.11.1 (173.239.11.1) 66.509/66.524/66.561/0.018 ms -11 P(6, 6) 173.239.57.74 (173.239.57.74) 66.634/69.047/72.354/2.442 ms -12 P(6, 6) 139.60.160.1 (139.60.160.1) 67.066/70.367/72.034/2.327 ms -13 P(6, 6) 139.60.160.135 (139.60.160.135) 62.542/64.001/66.941/2.020 ms - diff --git a/parser/testdata/20171208T00:00:04Z-37.220.21.130-5667-173.205.3.43-42487.paris b/parser/testdata/20171208T00:00:04Z-37.220.21.130-5667-173.205.3.43-42487.paris deleted file mode 100644 index 560e563..0000000 --- a/parser/testdata/20171208T00:00:04Z-37.220.21.130-5667-173.205.3.43-42487.paris +++ /dev/null @@ -1,19 +0,0 @@ -traceroute [(173.205.3.38:33459) -> (37.220.21.130:5667)], protocol icmp, algo exhaustive, duration 6 s - 1 P(6, 6) 173.205.3.1 (173.205.3.1) 0.194/1.031/5.031/1.789 ms - 2 P(6, 6) xe-10-0-0.cr3-sea2.ip4.gtt.net (89.149.184.166) 0.210/1.278/4.645/1.658 ms - 3 P(6, 6) as174.sea23.ip4.gtt.net (173.205.53.158) 0.578/0.663/0.752/0.057 ms - 4 P(6, 6) be2085.ccr21.slc01.atlas.cogentco.com (154.54.2.198) 28.728/28.784/28.914/0.064 ms - 5 P(6, 6) be3037.ccr21.den01.atlas.cogentco.com (154.54.41.146) 57.247/57.464/57.694/0.140 ms - 6 P(6, 6) be3035.ccr21.mci01.atlas.cogentco.com (154.54.5.90) 57.391/57.523/57.728/0.136 ms - 7 P(6, 6) be2831.ccr41.ord01.atlas.cogentco.com (154.54.42.166) 47.526/47.579/47.696/0.057 ms - 8 P(6, 6) be2717.ccr21.cle04.atlas.cogentco.com (154.54.6.222) 63.361/63.555/63.879/0.182 ms - 9 P(6, 6) be2878.ccr21.alb02.atlas.cogentco.com (154.54.26.130) 66.225/66.500/66.847/0.249 ms -10 P(6, 6) be2299.ccr31.bos01.atlas.cogentco.com (154.54.43.9) 69.491/69.725/70.180/0.277 ms -11 P(6, 6) be2982.ccr41.lon13.atlas.cogentco.com (154.54.1.118) 133.996/134.189/134.367/0.131 ms -12 P(6, 6) be2040.rcr21.lhr01.atlas.cogentco.com (130.117.50.42) 135.237/135.367/135.526/0.103 ms -13 P(6, 6) be5.asr01.ld5.as20860.net (149.11.166.210) 135.416/136.012/137.369/0.755 ms -14 P(6, 6) po200.dc9core2.as20860.net (62.128.205.130) 137.003/162.084/219.528/31.643 ms - MPLS Label 1309 TTL=1 -15 P(6, 6) 101.zone.1.r.dc10.redstation.co.uk (185.20.96.134) 139.700/158.051/174.860/13.826 ms -16 P(6, 6) lnman1.samknows.com (37.220.21.130) 137.103/137.118/137.154/0.018 ms - diff --git a/parser/testdata/20171208T00:00:14Z-139.60.160.135-2023-173.205.3.44-1101.paris b/parser/testdata/20171208T00:00:14Z-139.60.160.135-2023-173.205.3.44-1101.paris deleted file mode 100644 index 66f937f..0000000 --- a/parser/testdata/20171208T00:00:14Z-139.60.160.135-2023-173.205.3.44-1101.paris +++ /dev/null @@ -1,17 +0,0 @@ -traceroute [(173.205.3.38:33458) -> (139.60.160.135:2023)], protocol icmp, algo exhaustive, duration 4 s - 1 P(6, 6) 173.205.3.1 (173.205.3.1) 0.168/5.683/33.176/12.295 ms - 2 P(6, 6) xe-10-0-0.cr3-sea2.ip4.gtt.net (89.149.184.166) 0.222/0.251/0.301/0.025 ms - 3 P(6, 6) as2914.sea22.ip4.gtt.net (199.229.229.182) 0.313/5.189/14.536/5.375 ms - 4 P(6, 6) ae-14.r05.sttlwa01.us.bb.gin.ntt.net (129.250.5.133) 0.410/0.592/0.789/0.144 ms - 5 P(6, 6) ae-3.r20.sttlwa01.us.bb.gin.ntt.net (129.250.2.44) 0.510/1.487/6.164/2.092 ms - MPLS Label 337621 TTL=1 - 6 P(6, 6) ae-0.r24.nycmny01.us.bb.gin.ntt.net (129.250.4.14) 65.648/65.761/65.928/0.089 ms - MPLS Label 508627 TTL=1 - 7 P(6, 6) ae-1.r08.nycmny01.us.bb.gin.ntt.net (129.250.5.62) 65.716/65.741/65.767/0.019 ms - 8 P(6, 6) ae-1.webair.nycmny01.us.bb.gin.ntt.net (157.238.179.166) 66.071/66.421/67.569/0.524 ms - 9 P(6, 6) csd180.gsc.webair.net (173.239.28.18) 66.990/67.036/67.063/0.026 ms -10 P(6, 6) 173.239.11.1 (173.239.11.1) 66.666/66.685/66.710/0.016 ms -11 P(6, 6) 173.239.57.74 (173.239.57.74) 66.581/67.399/70.358/1.359 ms -12 P(6, 6) 139.60.160.1 (139.60.160.1) 66.769/66.845/66.896/0.050 ms -13 P(6, 6) 139.60.160.135 (139.60.160.135) 66.593/66.652/66.762/0.055 ms - diff --git a/parser/testdata/20171208T00:00:14Z-76.227.226.149-37156-173.205.3.37-52156.paris b/parser/testdata/20171208T00:00:14Z-76.227.226.149-37156-173.205.3.37-52156.paris deleted file mode 100644 index 73cf824..0000000 --- a/parser/testdata/20171208T00:00:14Z-76.227.226.149-37156-173.205.3.37-52156.paris +++ /dev/null @@ -1,21 +0,0 @@ -traceroute [(173.205.3.38:33459) -> (76.227.226.149:37156)], protocol icmp, algo exhaustive, duration 19 s - 1 P(6, 6) 173.205.3.1 (173.205.3.1) 0.149/17.564/67.412/26.087 ms - 2 P(6, 6) xe-10-0-0.cr3-sea2.ip4.gtt.net (89.149.184.166) 0.207/0.219/0.238/0.011 ms - 3 P(6, 6) as7018.ip4.gtt.net (216.221.156.158) 1.226/2.443/3.722/1.057 ms - 4 P(6, 6) cr82.st0wa.ip.att.net (12.122.158.134) 32.127/33.545/34.348/0.713 ms - MPLS Label 24953 TTL=1 - 5 P(6, 6) cr2.ptdor.ip.att.net (12.122.5.230) 29.830/30.878/32.020/0.835 ms !T2 - MPLS Label 0 TTL=1 | 24950 - 6 P(6, 6) cr1.ptdor.ip.att.net (12.122.30.141) 29.722/30.224/31.620/0.681 ms !T3 - MPLS Label 30808 TTL=1 | 24906 - 7 P(6, 6) cr2.la2ca.ip.att.net (12.122.28.178) 32.385/34.250/36.215/1.115 ms !T4 - MPLS Label 30046 TTL=2 | 24906 - 8 P(6, 6) 12.122.2.77 (12.122.2.77) 31.887/33.551/34.473/1.098 ms !T5 - MPLS Label 25016 TTL=3 | 24906 - 9 P(6, 6) 12.122.2.94 (12.122.2.94) 31.227/33.294/35.233/1.301 ms !T6 - MPLS Label 0 TTL=4 | 24906 -10 P(6, 6) 12.122.109.41 (12.122.109.41) 32.215/33.565/34.511/0.695 ms -11 P(0, 6) -12 P(0, 6) -13 P(0, 6) - diff --git a/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-7999.paris b/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-7999.paris deleted file mode 100644 index b216b2d..0000000 --- a/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-7999.paris +++ /dev/null @@ -1,26 +0,0 @@ -traceroute [(163.22.28.38:33459) -> (104.198.139.160:60574)], protocol icmp, algo exhaustive, duration 20 s - 1 P(6, 6) ip001.puli28.ncnu.edu.tw (163.22.28.1) 0.340/0.548/1.280/0.330 ms - 2 P(6, 6) ip091.puli255-64-203.ncnu.edu.tw (203.64.255.91) 0.815/0.921/1.052/0.073 ms - 3 P(6, 6) 192.192.61.130 (192.192.61.130) 2.529/2.805/3.081/0.180 ms - 4 P(6, 6) 192.192.61.29 (192.192.61.29) 6.386/6.452/6.583/0.068 ms - 5 P(6, 6) 192.192.61.1 (192.192.61.1) 4.730/4.960/5.261/0.165 ms - 6 P(6, 6) 192.192.61.185 (192.192.61.185) 7.133/8.672/14.818/2.789 ms - 7 P(6, 6) 192.192.61.198 (192.192.61.198) 5.097/5.915/8.284/1.205 ms - 8 P(6, 6) 72.14.196.229 (72.14.196.229) 5.356/5.407/5.512/0.054 ms - 9 P(6, 6) 108.170.244.136 (108.170.244.136) 5.994/6.275/7.168/0.408 ms -10 P(6, 6) 72.14.239.101 (72.14.239.101) 5.892/5.931/5.993/0.036 ms - MPLS Label 25916 TTL=1 -11 P(6, 6) 108.170.232.169 (108.170.232.169) 8.770/19.507/59.697/18.452 ms - MPLS Label 678646 TTL=1 -12 P(6, 6) 209.85.246.189 (209.85.246.189) 119.546/120.324/124.035/1.661 ms - MPLS Label 345164 TTL=1 -13 P(6, 6) 216.239.40.146 (216.239.40.146) 126.952/127.100/127.370/0.153 ms !T4 - MPLS Label 25825 TTL=1 -14 P(6, 6) 216.239.49.134 (216.239.49.134) 151.042/151.234/151.594/0.199 ms !T5 - MPLS Label 25389 TTL=1 -15 P(6, 6) 209.85.251.138 (209.85.251.138) 160.041/160.208/160.423/0.137 ms !T6 - MPLS Label 36454 TTL=1 -16 P(6, 6) 209.85.251.245 (209.85.251.245) 159.937/162.572/173.824/5.074 ms -17 P(0, 6) -18 P(6, 6) 139.60.160.135 (139.60.160.135) 3239.883/3240.534/3242.713/0.985 ms - diff --git a/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-8999.paris b/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-8999.paris deleted file mode 100644 index e7f05aa..0000000 --- a/parser/testdata/20171208T22:03:54Z-104.198.139.160-60574-163.22.28.37-8999.paris +++ /dev/null @@ -1,20 +0,0 @@ -traceroute [(173.205.3.38:33459) -> (76.227.226.149:37156)], protocol icmp, algo exhaustive, duration 19 s - 1 P(6, 6) 173.205.3.1 (173.205.3.1) 0.149/17.564/67.412/26.087 ms - 2 P(6, 6) xe-10-0-0.cr3-sea2.ip4.gtt.net (89.149.184.166) 0.207/0.219/0.238/0.011 ms - 3 P(6, 6) as7018.ip4.gtt.net (216.221.156.158) 1.226/2.443/3.722/1.057 ms - 4 P(6, 6) cr82.st0wa.ip.att.net (12.122.158.134) 32.127/33.545/34.348/0.713 ms - MPLS Label 24953 TTL=1 - 5 P(6, 6) cr2.ptdor.ip.att.net (12.122.5.230) 29.830/30.878/32.020/0.835 ms !T2 - MPLS Label 0 TTL=1 | 24950 - 6 P(6, 6) cr1.ptdor.ip.att.net (12.122.30.141) 29.722/30.224/31.620/0.681 ms !T3 - MPLS Label 30808 TTL=1 | 24906 - 7 P(6, 6) cr2.la2ca.ip.att.net (12.122.28.178) 32.385/34.250/36.215/1.115 ms !T4 - MPLS Label 30046 TTL=2 | 24906 - 8 P(6, 6) 12.122.2.77 (12.122.2.77) 31.887/33.551/34.473/1.098 ms !T5 - MPLS Label 25016 TTL=3 | 24906 - 9 P(6, 6) 12.122.2.94 (12.122.2.94) 31.227/33.294/35.233/1.301 ms !T6 - MPLS Label 0 TTL=4 | 24906 -10 P(6, 6) 12.122.109.41 (12.122.109.41) 32.215/33.565/34.511/0.695 ms -11 P(0, 6) -12 P(0, 6) -13 P(0, 6) diff --git a/parser/testdata/20171208T22:03:59Z-139.60.160.135-1519-163.22.28.44-1101.paris b/parser/testdata/20171208T22:03:59Z-139.60.160.135-1519-163.22.28.44-1101.paris deleted file mode 100644 index 4e65315..0000000 --- a/parser/testdata/20171208T22:03:59Z-139.60.160.135-1519-163.22.28.44-1101.paris +++ /dev/null @@ -1,21 +0,0 @@ -traceroute [(163.22.28.38:33459) -> (139.60.160.135:1519)], protocol icmp, algo exhaustive, duration 15 s - 1 P(6, 6) ip001.puli28.ncnu.edu.tw (163.22.28.1) 0.290/0.382/0.594/0.098 ms - 2 P(6, 6) ip091.puli255-64-203.ncnu.edu.tw (203.64.255.91) 0.715/0.919/1.161/0.135 ms - 3 P(6, 6) 192.192.61.130 (192.192.61.130) 2.729/2.879/3.047/0.106 ms - 4 P(6, 6) 192.192.61.29 (192.192.61.29) 6.427/6.706/7.950/0.557 ms - 5 P(6, 6) 192.192.61.69 (192.192.61.69) 5.317/5.779/6.701/0.576 ms - 6 P(6, 6) 9-84-21-113-static.chief.net.tw (113.21.84.9) 5.591/6.478/9.292/1.285 ms - 7 P(6, 6) 223-26-65-17-static.tpix.net.tw (223.26.65.17) 6.942/7.077/7.169/0.094 ms - 8 P(6, 6) 205-58-41-175.TWGATE-IP.twgate.net (175.41.58.205) 27.983/28.101/28.190/0.074 ms - 9 P(6, 6) 203.78.181.133 (203.78.181.133) 28.299/33.346/55.049/9.787 ms - MPLS Label 346801 TTL=1 -10 P(6, 6) 6-60-41-175.TWGATE-IP.twgate.net (175.41.60.6) 135.985/136.989/140.822/1.718 ms -11 P(6, 6) xe-9-0-0.bar1.SanFrancisco1.Level3.net (4.53.132.17) 136.783/137.392/140.016/1.175 ms -12 P(0, 6) -13 P(6, 6) es0-te49-ip4.nyc4.webair.net (4.7.2.146) 207.484/208.644/211.454/1.328 ms -14 P(6, 6) csc180.gsc.webair.net (173.239.0.26) 206.157/206.568/206.994/0.243 ms -15 P(6, 6) 173.239.0.21 (173.239.0.21) 205.448/206.782/211.816/2.292 ms -16 P(6, 6) 173.239.57.74 (173.239.57.74) 205.597/207.110/208.622/1.173 ms -17 P(6, 6) 139.60.160.1 (139.60.160.1) 206.336/335.449/463.834/99.001 ms -18 P(6, 6) 139.60.160.135 (139.60.160.135) 205.236/205.813/207.961/0.966 ms - diff --git a/parser/testdata/20180201T07:57:37Z-125.212.217.215-56622-208.177.76.115-9100.paris b/parser/testdata/20180201T07:57:37Z-125.212.217.215-56622-208.177.76.115-9100.paris deleted file mode 100644 index e69de29..0000000