Add ASN to logtail, collector, aggregator, frontend and CLI

cmd/collector/parser.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"net"
+	"strconv"
 	"strings"
 )
 
@@ -13,18 +14,20 @@ type LogRecord struct {
 	URI          string
 	Status       string
 	IsTor        bool
+	ASN          int32
 }
 
 // ParseLine parses a tab-separated logtail log line:
 //
-//	$host \t $remote_addr \t $msec \t $request_method \t $request_uri \t $status \t $body_bytes_sent \t $request_time \t $is_tor
+//	$host \t $remote_addr \t $msec \t $request_method \t $request_uri \t $status \t $body_bytes_sent \t $request_time \t $is_tor \t $asn
 //
-// The is_tor field (0 or 1) is optional for backward compatibility with
-// older log files that omit it; it defaults to false when absent.
+// The is_tor (field 9) and asn (field 10) fields are optional for backward
+// compatibility with older log files that omit them; they default to false/0
+// when absent.
 // Returns false for lines with fewer than 8 fields.
 func ParseLine(line string, v4bits, v6bits int) (LogRecord, bool) {
-	// SplitN caps allocations; we need up to 9 fields.
-	fields := strings.SplitN(line, "\t", 9)
+	// SplitN caps allocations; we need up to 10 fields.
+	fields := strings.SplitN(line, "\t", 10)
 	if len(fields) < 8 {
 		return LogRecord{}, false
 	}
@@ -39,7 +42,14 @@ func ParseLine(line string, v4bits, v6bits int) (LogRecord, bool) {
 		return LogRecord{}, false
 	}
 
-	isTor := len(fields) == 9 && fields[8] == "1"
+	isTor := len(fields) >= 9 && fields[8] == "1"
+
+	var asn int32
+	if len(fields) == 10 {
+		if n, err := strconv.ParseInt(fields[9], 10, 32); err == nil {
+			asn = int32(n)
+		}
+	}
 
 	return LogRecord{
 		Website:      fields[0],
@@ -47,6 +57,7 @@ func ParseLine(line string, v4bits, v6bits int) (LogRecord, bool) {
 		URI:          uri,
 		Status:       fields[5],
 		IsTor:        isTor,
+		ASN:          asn,
 	}, true
 }