Fix avro tests

querylog/avro.go

@@ -192,7 +192,7 @@ func (l *AvroLogger) writer(ctx context.Context) {
 					continue
 				}
 				if size > int64(l.maxsize) {
-					log.Printf("rotating avro file for size")
+					// log.Printf("rotating avro file for size")
 					currentFile, err = openFile()
 					if err != nil {
 						log.Printf("could not open new avro file: %s", err)

querylog/avro_test.go

@@ -10,13 +10,18 @@ import (
 
 func TestAvro(t *testing.T) {
 
-	lg, err := NewAvroLogger("/tmp/avro", 5000000, 4*time.Second)
+	tmppath, err := os.MkdirTemp("", "geodns.avro")
+	if err != nil {
+		t.Fatalf("could not create temp dir: %s", err)
+	}
+
+	lg, err := NewAvroLogger(tmppath, 5000000, 4*time.Second)
 	if err != nil {
 		t.Log(err)
 		t.FailNow()
 	}
 
-	dataFh, err := os.Open("testdata/queries-2023-07-03T19-58-03.759.log")
+	dataFh, err := os.Open("testdata/queries.log")
 	if err != nil {
 		t.Log("no test data available")
 		t.SkipNow()

querylog/testdata/queries.log

@@ -0,0 +1,20 @@
+{"Time":1688414139649978091,"Origin":"pool.ntp.org","Name":"0.ubuntu.pool.ntp.org.","Qtype":2,"Rcode":0,"Answers":0,"Targets":["de","europe","@"],"LabelName":"","RemoteAddr":"141.35.40.33","ClientAddr":"141.35.40.33/32","HasECS":false}
+{"Time":1688414139650499477,"Origin":"pool.ntp.org","Name":"pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["in","asia","@"],"LabelName":"","RemoteAddr":"2405:200:1632:1957:78::4","ClientAddr":"2405:200:1632:1957:78::4/128","HasECS":false}
+{"Time":1688414139650694570,"Origin":"pool.ntp.org","Name":"2.debian.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["us","north-america","@"],"LabelName":"2.us","RemoteAddr":"192.178.36.9","ClientAddr":"70.225.160.0/24","HasECS":true}
+{"Time":1688414139650814098,"Origin":"pool.ntp.org","Name":"ru.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["br","south-america","@"],"LabelName":"ru","RemoteAddr":"187.58.136.98","ClientAddr":"187.58.136.98/32","HasECS":false}
+{"Time":1688414139650917846,"Origin":"pool.ntp.org","Name":"pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["in","asia","@"],"LabelName":"","RemoteAddr":"2405:200:1961:3937:78::5","ClientAddr":"2405:200:1961:3937:78::5/128","HasECS":false}
+{"Time":1688414139651209653,"Origin":"pool.ntp.org","Name":"0.fr.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["fr","europe","@"],"LabelName":"0.fr","RemoteAddr":"2a00:1db8:0:3::22","ClientAddr":"2a00:1db8:0:3::22/128","HasECS":false}
+{"Time":1688414139651529434,"Origin":"pool.ntp.org","Name":"android.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["de","europe","@"],"LabelName":"de","RemoteAddr":"85.22.54.58","ClientAddr":"85.22.54.58/32","HasECS":false}
+{"Time":1688414139651670493,"Origin":"pool.ntp.org","Name":"2.sonostime.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["cn","asia","@"],"LabelName":"2.cn","RemoteAddr":"2409:8018:2001::2","ClientAddr":"2409:8018:2001::2/128","HasECS":false}
+{"Time":1688414139651980436,"Origin":"pool.ntp.org","Name":"pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["in","asia","@"],"LabelName":"","RemoteAddr":"49.45.29.164","ClientAddr":"49.45.29.164/32","HasECS":false}
+{"Time":1688414139652110915,"Origin":"pool.ntp.org","Name":"ubnt.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["us","north-america","@"],"LabelName":"us","RemoteAddr":"67.146.32.23","ClientAddr":"67.146.32.23/32","HasECS":false}
+{"Time":1688414139652558730,"Origin":"pool.ntp.org","Name":"0.openwrt.pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["cn","asia","@"],"LabelName":"","RemoteAddr":"172.253.5.2","ClientAddr":"112.226.217.0/24","HasECS":true}
+{"Time":1688414139652799400,"Origin":"pool.ntp.org","Name":"0.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["us","north-america","@"],"LabelName":"0.us","RemoteAddr":"74.125.191.8","ClientAddr":"209.236.115.0/24","HasECS":true}
+{"Time":1688414139653295247,"Origin":"pool.ntp.org","Name":"hk.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["cn","asia","@"],"LabelName":"hk","RemoteAddr":"2409:8020:2000:924::d","ClientAddr":"2409:8020:2000:924::d/128","HasECS":false}
+{"Time":1688414139653833966,"Origin":"pool.ntp.org","Name":"pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["in","asia","@"],"LabelName":"","RemoteAddr":"2405:200:160b:1957:78::5","ClientAddr":"2405:200:160b:1957:78::5/128","HasECS":false}
+{"Time":1688414139653988631,"Origin":"pool.ntp.org","Name":"0.formlabs.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":2,"Targets":["kr","asia","@"],"LabelName":"0.kr","RemoteAddr":"106.241.133.17","ClientAddr":"106.241.133.17/32","HasECS":false}
+{"Time":1688414139654098471,"Origin":"pool.ntp.org","Name":"ru.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":4,"Targets":["bd","asia","@"],"LabelName":"ru","RemoteAddr":"2404:6800:4000:101d::105","ClientAddr":"103.206.231.0/24","HasECS":true}
+{"Time":1688414139654304414,"Origin":"pool.ntp.org","Name":"3.debian.pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["tw","asia","@"],"LabelName":"","RemoteAddr":"2001:b030:2154:fffc::1","ClientAddr":"2001:b030:2154:fffc::1/128","HasECS":false}
+{"Time":1688414139654809920,"Origin":"pool.ntp.org","Name":"0.pool.ntp.org.","Qtype":1,"Rcode":0,"Answers":2,"Targets":["bd","asia","@"],"LabelName":"0.bd","RemoteAddr":"2404:6800:4000:1002::102","ClientAddr":"103.106.164.0/24","HasECS":true}
+{"Time":1688414139654945178,"Origin":"pool.ntp.org","Name":"europe.pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["cn","asia","@"],"LabelName":"","RemoteAddr":"172.253.6.3","ClientAddr":"123.149.74.0/24","HasECS":true}
+{"Time":1688414139655044528,"Origin":"pool.ntp.org","Name":"sg.pool.ntp.org.","Qtype":28,"Rcode":0,"Answers":0,"Targets":["my","asia","@"],"LabelName":"","RemoteAddr":"123.136.100.101","ClientAddr":"123.136.100.101/32","HasECS":false}