refactor: reduce complexity of shouldTrack

Author: astappiev

umami.go

@@ -303,7 +303,7 @@ func (h *UmamiFeeder) verifyConfig(config *Config) error {
 	return nil
 }
 
-func (h *UmamiFeeder) shouldTrack(req *http.Request) bool {
+func (h *UmamiFeeder) shouldTrackRequest(req *http.Request) bool {
 	if len(h.ignoreHosts) > 0 {
 		for _, disabledHost := range h.ignoreHosts {
 			if strings.EqualFold(req.Host, disabledHost) {
@@ -353,6 +353,14 @@ func (h *UmamiFeeder) shouldTrack(req *http.Request) bool {
 		}
 	}
 
+	return true
+}
+
+func (h *UmamiFeeder) shouldTrack(req *http.Request) bool {
+	if !h.shouldTrackRequest(req) {
+		return false
+	}
+
 	if !h.shouldTrackResource(req.URL.Path) {
 		h.debugf("ignoring resource %s", req.URL.Path)
 		return false

umami_test.go

@@ -88,7 +88,7 @@ func assertIgnoreIP(t *testing.T, plugin *UmamiFeeder, expected bool, clientIP s
 	req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://localhost", nil)
 	req.Header.Set(plugin.headerIp, clientIP)
 
-	if expected != plugin.shouldTrack(req) {
+	if expected != plugin.shouldTrackRequest(req) {
 		t.Fatalf("expected %v for %s", expected, clientIP)
 	}
 }
@@ -125,7 +125,7 @@ func assertIgnoreUrl(t *testing.T, plugin *UmamiFeeder, expected bool, url strin
 	t.Helper()
 	req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, url, nil)
 
-	if expected != plugin.shouldTrack(req) {
+	if expected != plugin.shouldTrackRequest(req) {
 		t.Fatalf("expected %v for %s", expected, url)
 	}
 }
@@ -148,7 +148,7 @@ func assertIgnoreUa(t *testing.T, plugin *UmamiFeeder, expected bool, ua string)
 	req, _ := http.NewRequestWithContext(context.Background(), http.MethodGet, "http://localhost/", nil)
 	req.Header.Set("User-Agent", ua)
 
-	if expected != plugin.shouldTrack(req) {
+	if expected != plugin.shouldTrackRequest(req) {
 		t.Fatalf("expected %v for %s", expected, ua)
 	}
 }