get all record analytics for the whole zone in one request

cf/cf.go

@@ -57,7 +57,8 @@ type Analytic struct {
 	Result struct {
 		Rows int `json:"rows"`
 		Data []struct {
-			Metrics []int `json:"metrics"`
+			Dimensions []string `json:"dimensions"`
+			Metrics    []int    `json:"metrics"`
 		} `json:"data"`
 		DataLag int `json:"data_lag"`
 		Min     struct {
@@ -154,8 +155,9 @@ func (c *Client) GetRecordAnalytic(record Record) (*Analytic, error) {
 
 	q := req.URL.Query()
 	q.Add("filters", fmt.Sprintf("queryName==%s", record.Name))
+
 	/*
-		 TBD: Why does this give HTTP 400?
+		 TBD: Why does this give HTTP 403?
 		q.Add("filters", fmt.Sprintf("queryName==%s,queryType==%s", record.Name, record.Type))
 	*/
 	req.URL.RawQuery = q.Encode()
@@ -184,3 +186,43 @@ func (c *Client) GetRecordAnalytic(record Record) (*Analytic, error) {
 
 	return analytic, nil
 }
+
+// getRecordAnalytic provides a pointer to an Analytic for the given
+func (c *Client) GetZoneAnalytic(zone Zone) (*Analytic, error) {
+	req, err := http.NewRequest("GET", fmt.Sprintf("%s/zones/%s/dns_analytics/report", c.APIURL, zone.ID), nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create new http request: %v", err)
+	}
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Add("Authorization", fmt.Sprintf("Bearer %s", c.APIKey))
+
+	q := req.URL.Query()
+	q.Add("metrics", "queryCount")
+	q.Add("dimensions", "queryName")
+
+	req.URL.RawQuery = q.Encode()
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to execute http request: %v", err)
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("http response has status '%d' but expected '%d'", resp.StatusCode, http.StatusOK)
+	}
+
+	b, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read http response body: %v", err)
+	}
+
+	analytic := &Analytic{}
+	err = json.Unmarshal(b, analytic)
+	if err != nil {
+		return nil, fmt.Errorf("failed to unmarshal response body to struct: %v", err)
+	}
+
+	return analytic, nil
+
+}

main.go

@@ -44,20 +44,25 @@ func main() {
 		}
 		log.Printf("processing zone '%s' with ID '%s'", zone.Name, zone.ID)
 
+		analytic, err := cfClient.GetZoneAnalytic(zone)
+		if err != nil {
+			log.Printf("failed to get zone analytic for zone '%s': %v", zone.Name, err)
+		}
+
 		records, err := cfClient.GetRecords(zone)
 		if err != nil {
 			log.Printf("failed to get records for zone '%s' with ID '%s': %v", zone.Name, zone.ID, err)
 		}
 
-		for _, record := range records {
-			log.Printf("processing record '%s' of type '%s'", record.Name, record.Type)
-			analytic, err := cfClient.GetRecordAnalytic(record)
-			if err != nil {
-				log.Printf("failed to get record report for record '%s' in zone '%s' with ID '%s': %v", record.Name, zone.Name, zone.ID, err)
-				continue
+		for i := range records {
+			for _, metric := range analytic.Result.Data {
+				if records[i].Name != metric.Dimensions[0] {
+					continue
+				}
+				records[i].NumberQueries = metric.Metrics[0]
+				break
 			}
-			record.NumberQueries = analytic.Result.Totals.QueryCount
-			outRows = append(outRows, record)
+			outRows = append(outRows, records[i])
 		}
 	}