dnsx: Start time in summary

Author: ignoramous

intra/backend/dnsx_listener.go

@@ -19,15 +19,17 @@ type DNSSummary struct {
 	// Flow ID that spawned this DNS query, if Origin is "tunnel".
 	// Otherwise, it is randomly generated uint64 as hex.
 	FID string
-	// DNS Transport ID
+	// DNS Transport ID.
 	ID string
 	// owner uid that sent this request. May be empty.
 	UID string
-	// tunnel or internal originated query
+	// tunnel or internal originated query.
 	Origin string
-	// Response (or failure) latency in seconds
+	// Time this query was received (unix millis).
+	Start int64
+	// Response (or failure) latency in seconds.
 	Latency float64
-	// Queried domain name
+	// Queried domain name.
 	QName string
 	// Query type: A, AAAA, SVCB, HTTPS, etc. May be 0.
 	QType int
@@ -37,21 +39,21 @@ type DNSSummary struct {
 	Cached bool
 	// DNS Response data, ex: a csv of ips for A, AAAA.
 	RData string
-	// DNS Response code
+	// DNS Response code.
 	RCode int
-	// DNS Response TTL
+	// DNS Response TTL.
 	RTtl int
-	// DNS Server (ip, ip:port, host, host:port)
+	// DNS Server (ip, ip:port, host, host:port).
 	Server string
-	// Proxy or a relay server address
+	// Proxy or a relay server address.
 	PID string
-	// Relay server PID hops over, if any
+	// Relay server PID hops over, if any.
 	RPID string
-	// Transport status (Start, Complete, SendFailed, NoResponse, BadQuery, BadResponse, etc)
+	// Transport status (Start, Complete, SendFailed, NoResponse, BadQuery, BadResponse, etc).
 	Status int
 	// CSV of Rethink DNS+ blocklists (local or remote) names (if used).
 	Blocklists string
-	// Actual target (domain name) that was blocked (could be a CNAME or HTTPS/SVCB alias) by Blocklists
+	// Actual target (domain name) that was blocked (could be a CNAME or HTTPS/SVCB alias) by Blocklists.
 	BlockedTarget string
 	// True if any among upstream transports (primary or secondary) returned blocked ans.
 	// Only valid for A/AAAA queries. Unspecified IPs are considered as "blocked ans".
@@ -62,11 +64,11 @@ type DNSSummary struct {
 	AD bool
 	// True if TLS Encrypted Client Hello was used by this transport, if applicable.
 	ECH bool
-	// Diag message from Transport, if any. Typically, "no error"
+	// Diag message from Transport, if any. Typically, "no error".
 	Msg string
 	// Diag extras, if any. For example, list of proxy & transport overrides.
 	Extra string
-	// Region of the Rethink DNS+ server (if used)
+	// Region of the Rethink DNS+ server (if used).
 	Region string
 }
 

intra/dnscrypt/servers_test.go

@@ -13,6 +13,7 @@ import (
 	"net"
 	"net/netip"
 	"testing"
+	"time"
 
 	x "github.com/celzero/firestack/intra/backend"
 	"github.com/celzero/firestack/intra/dialers"
@@ -132,7 +133,7 @@ func TestOne(t *testing.T) {
 		t.Fatal(errors.Join(dnsx.ErrAddFailed, err))
 	}
 	q := aquery("google.com")
-	smm := &x.DNSSummary{}
+	smm := &x.DNSSummary{Start: time.Now().UnixMilli()}
 	netw := xdns.NetAndProxyID("udp", ipn.Base)
 	// FIXME: querying always fails with EOF
 	ans, err := tr.Query(netw, q, smm)

intra/dnsx/cacher.go

@@ -572,22 +572,23 @@ func fillSummary(s *x.DNSSummary, out *x.DNSSummary) {
 	if len(out.Origin) <= 0 {
 		out.Origin = s.Origin
 	}
+
 	if len(out.ID) <= 0 {
 		out.ID = s.ID
 		out.Server = s.Server
-		out.PID = s.PID
-		out.RPID = s.RPID
 	} else if len(out.Server) <= 0 {
 		out.Server = s.Server
-		out.PID = s.PID
-		out.RPID = s.RPID
-	} else if len(out.PID) <= 0 {
-		out.PID = s.PID
-		out.RPID = s.RPID
 	}
+
 	if len(out.FID) <= 0 {
 		out.FID = s.FID
 	}
+	if len(out.Origin) <= 0 {
+		out.Origin = s.Origin
+	}
+	if out.Start <= 0 {
+		out.Start = s.Start
+	}
 	if out.Latency <= 0 {
 		out.Latency = s.Latency
 	}
@@ -613,7 +614,10 @@ func fillSummary(s *x.DNSSummary, out *x.DNSSummary) {
 		out.DO = s.DO
 	}
 
-	out.Origin = s.Origin
+	if len(s.PID) > 0 {
+		out.PID = s.PID
+		out.RPID = s.RPID
+	}
 	out.ECH = s.ECH
 	out.Cached = s.Cached
 	out.RCode = s.RCode
@@ -624,7 +628,6 @@ func fillSummary(s *x.DNSSummary, out *x.DNSSummary) {
 	out.Msg = s.Msg
 	out.UpstreamBlocks = s.UpstreamBlocks
 	out.Extra = s.Extra
-	out.Region = s.Region
 }
 
 func rand33pc() bool {

intra/dnsx/transport.go

@@ -542,6 +542,7 @@ func (r *resolver) forward(q []byte, who, fid, uid string, chosenids ...string)
 		ID:     NoDNS,
 		FID:    fid,
 		Origin: who,
+		Start:  starttime.UnixMilli(),
 		UID:    uid, // may be overwritten to by Cacher via fillSummary
 		QName:  invalidQname,
 		Status: Start,