update

all/prometheus/main.go

@@ -256,22 +256,22 @@ func (c *CustomCollector) Collect(ch chan<- prometheus.Metric) {
 		}
 	}
 
-	//resp, err = adOwnConvLogStore.GetLogs("", time.Now().Unix()-60, time.Now().Unix(), adOwnReportQuerySQL, 0, 0, true)
-	//if err != nil || resp == nil {
-	//	log.Printf("get own ad report logs error %+v resp is %+v.", err, resp)
-	//	return
-	//}
-	//for _, v := range resp.Logs {
-	//	for k, v2 := range v {
-	//		v3, _ := strconv.ParseFloat(v2, 64)
-	//		ch <- prometheus.MustNewConstMetric(
-	//			c.AdOwnConvDesc,
-	//			prometheus.GaugeValue,
-	//			v3,
-	//			v["appId"], v["eventType"], k,
-	//		)
-	//	}
-	//}
+	resp, err = adOwnConvLogStore.GetLogs("", time.Now().Unix()-60, time.Now().Unix(), adOwnReportQuerySQL, 0, 0, true)
+	if err != nil || resp == nil {
+		log.Printf("get own ad report logs error %+v resp is %+v.", err, resp)
+		return
+	}
+	for _, v := range resp.Logs {
+		for k, v2 := range v {
+			v3, _ := strconv.ParseFloat(v2, 64)
+			ch <- prometheus.MustNewConstMetric(
+				c.AdOwnConvDesc,
+				prometheus.GaugeValue,
+				v3,
+				v["appId"], v["eventType"], k,
+			)
+		}
+	}
 
 	resp, err = adRequestStore.GetLogs("", time.Now().Unix()-60, time.Now().Unix(), adConfigQuerySQL, 0, 0, true)
 	if err != nil || resp == nil {