all: sync with master, upd chlog

internal/filtering/filtering_test.go

@@ -661,8 +661,6 @@ func TestClientSettings(t *testing.T) {
 	}
 }
 
-// Benchmarks.
-
 func BenchmarkSafeBrowsing(b *testing.B) {
 	d, setts := newForTest(b, &Config{
 		SafeBrowsingEnabled: true,
@@ -670,15 +668,26 @@ func BenchmarkSafeBrowsing(b *testing.B) {
 	}, nil)
 	b.Cleanup(d.Close)
 
-	for range b.N {
-		res, err := d.CheckHost(sbBlocked, dns.TypeA, setts)
-		require.NoError(b, err)
-
-		assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked)
+	var res Result
+	var err error
+	b.ReportAllocs()
+	for b.Loop() {
+		res, err = d.CheckHost(sbBlocked, dns.TypeA, setts)
 	}
+
+	require.NoError(b, err)
+	assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked)
+
+	// Most recent results:
+	//
+	//	goos: darwin
+	//	goarch: amd64
+	//	pkg: github.com/AdguardTeam/AdGuardHome/internal/filtering
+	//	cpu: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+	//	BenchmarkSafeBrowsing-12    	  358934	      2994 ns/op	    1304 B/op	      40 allocs/op
 }
 
-func BenchmarkSafeBrowsingParallel(b *testing.B) {
+func BenchmarkSafeBrowsing_parallel(b *testing.B) {
 	d, setts := newForTest(b, &Config{
 		SafeBrowsingEnabled: true,
 		SafeBrowsingChecker: newChecker(sbBlocked),
@@ -693,4 +702,12 @@ func BenchmarkSafeBrowsingParallel(b *testing.B) {
 			assert.Truef(b, res.IsFiltered, "expected hostname %q to match", sbBlocked)
 		}
 	})
+
+	// Most recent results:
+	//
+	//	goos: darwin
+	//	goarch: amd64
+	//	pkg: github.com/AdguardTeam/AdGuardHome/internal/filtering
+	//	cpu: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+	//	BenchmarkSafeBrowsing_parallel-12    	  507327	      2382 ns/op	    1352 B/op	      42 allocs/op
 }

internal/filtering/http.go

@@ -244,7 +244,7 @@ func (d *DNSFilter) handleFilteringSetURL(w http.ResponseWriter, r *http.Request
 
 	restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
 	if err != nil {
-		aghhttp.Error(r, w, http.StatusBadRequest, err.Error())
+		aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
 
 		return
 	}

internal/filtering/rulelist/parser_test.go

@@ -202,34 +202,30 @@ func TestParser_Parse_checksums(t *testing.T) {
 	assert.Equal(t, gotWithoutComments, gotWithComments)
 }
 
-var (
-	resSink *rulelist.ParseResult
-	errSink error
-)
-
 func BenchmarkParser_Parse(b *testing.B) {
 	dst := &bytes.Buffer{}
 	src := strings.NewReader(strings.Repeat(testRuleTextBlocked, 1000))
 	buf := make([]byte, rulelist.DefaultRuleBufSize)
 	p := rulelist.NewParser()
 
+	var res *rulelist.ParseResult
+	var err error
 	b.ReportAllocs()
-	b.ResetTimer()
-	for range b.N {
-		resSink, errSink = p.Parse(dst, src, buf)
+	for b.Loop() {
+		res, err = p.Parse(dst, src, buf)
 		dst.Reset()
 	}
 
-	require.NoError(b, errSink)
-	require.NotNil(b, resSink)
+	require.NoError(b, err)
+	require.NotNil(b, res)
 
-	// Most recent result, on a ThinkPad X13 with a Ryzen Pro 7 CPU:
+	// Most recent results:
 	//
-	//	goos: linux
+	//	goos: darwin
 	//	goarch: amd64
 	//	pkg: github.com/AdguardTeam/AdGuardHome/internal/filtering/rulelist
-	//	cpu: AMD Ryzen 7 PRO 4750U with Radeon Graphics
-	//	BenchmarkParser_Parse-16        100000000              128.0 ns/op            48 B/op          1 allocs/op
+	//	cpu: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+	//	BenchmarkParser_Parse-12    	19635926	        53.70 ns/op	      48 B/op	       1 allocs/op
 }
 
 func FuzzParser_Parse(f *testing.F) {

internal/filtering/safesearch/safesearch_internal_test.go

@@ -88,16 +88,25 @@ func TestSafeSearchCacheYandex(t *testing.T) {
 	assert.Equal(t, cachedValue.Rules[0].IP, yandexIP)
 }
 
-const googleHost = "www.google.com"
+func BenchmarkDefault_SearchHost(b *testing.B) {
+	const googleHost = "www.google.com"
 
-var dnsRewriteSink *rules.DNSRewrite
-
-func BenchmarkSafeSearch(b *testing.B) {
 	ss := newForTest(b, defaultSafeSearchConf)
 
-	for range b.N {
-		dnsRewriteSink = ss.searchHost(googleHost, testQType)
+	var rewrite *rules.DNSRewrite
+	b.ReportAllocs()
+	for b.Loop() {
+		rewrite = ss.searchHost(googleHost, testQType)
 	}
 
-	assert.Equal(b, "forcesafesearch.google.com", dnsRewriteSink.NewCNAME)
+	require.NotNil(b, rewrite)
+	assert.Equal(b, "forcesafesearch.google.com", rewrite.NewCNAME)
+
+	// Most recent results:
+	//
+	//	goos: darwin
+	//	goarch: amd64
+	//	pkg: github.com/AdguardTeam/AdGuardHome/internal/filtering/safesearch
+	//	cpu: Intel(R) Core(TM) i7-9750H CPU @ 2.60GHz
+	//	BenchmarkDefault_SearchHost-12    	  751882	      1604 ns/op	     129 B/op	       5 allocs/op
 }