优化日志

ads_handler.go

@@ -66,6 +66,11 @@ func adsHandler(c *gin.Context) {
 	request.Parse(c)
 
 	log.Printf("%+v", request)
+
+	// 放这里主要为了拿到reqeust id做日志记录
+	dspInfo := utils.DspParam{}
+	dspInfo.Init()
+
 	advertiser := "xiaomi"
 	uaClient := request.UaClient
 	// 获取ua
@@ -144,7 +149,7 @@ func adsHandler(c *gin.Context) {
 
 	// 定制city code
 	cityCode, err := city.GetCityCode(ipInfo.City)
-	log.Infof("got city code: %d", cityCode)
+	log.WithField("request_id", dspInfo.RequestId).Infof("got city code: %d", cityCode)
 	if err != nil {
 		c.String(404, "get city code failed: %s", err)
 		return
@@ -164,12 +169,12 @@ func adsHandler(c *gin.Context) {
 		// 频率控制
 		freqControlConf, err := redis_data.GetFreqCrontolConf(request.ReqSource)
 		if err != nil {
-			log.Errorf("get freq control conf failed: %s", err)
+			log.WithField("request_id", dspInfo.RequestId).Errorf("get freq control conf failed: %s", err)
 			c.String(404, "get freq control conf failed: %s", err)
 			return
 		}
 
-		log.Infof("freq control conf: %+v", freqControlConf)
+		log.WithField("request_id", dspInfo.RequestId).Infof("freq control conf: %+v", freqControlConf)
 		hour, _ := strconv.Atoi(time.Now().Format("01"))
 		tmpControlInterval, ok := freqControlConf.GetControlTime(hour)
 		if ok {
@@ -187,7 +192,7 @@ func adsHandler(c *gin.Context) {
 	needControl := false
 	if request.ReqSource != "wzb_h5" && lastReqTime != 0 && time.Now().Unix()-lastReqTime < int64(freqControlInterval) {
 		// 需要凭空
-		log.Infof("need control: %d", lastReqTime)
+		log.WithField("request_id", dspInfo.RequestId).Infof("need control: %d", lastReqTime)
 		needControl = true
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_FREQ_0", cityCode)
 	} else {
@@ -197,7 +202,7 @@ func adsHandler(c *gin.Context) {
 	//### 检查是否是ip黑名单
 	isIpBlack, err := ads_checker.CheckBlackIp(ip)
 	if err != nil {
-		log.Errorf("check black ip failed: %s", err)
+		log.WithField("request_id", dspInfo.RequestId).Errorf("check black ip failed: %s", err)
 		c.String(404, "check black ip failed: %s", err)
 		return
 	}
@@ -209,7 +214,7 @@ func adsHandler(c *gin.Context) {
 	// 获取渠道的黑白性
 	reqChannelFlag, err := redis_data.GetChannelFlag(request.ReqSource, "ads_req")
 	if err != nil {
-		log.Errorf("get req channel flag failed: %s", err)
+		log.WithField("request_id", dspInfo.RequestId).Errorf("get req channel flag failed: %s", err)
 		c.String(404, "get req channel flag failed: %s", err)
 		return
 	}
@@ -241,12 +246,12 @@ func adsHandler(c *gin.Context) {
 		randomNum := 3
 		deviceConf, realRedisKey, err := device.GetMiDeviceConf(ip, randomNum, specialDeviceNum)
 		if err != nil {
-			log.Errorf("get mi device conf failed: %s", err)
+			log.WithField("request_id", dspInfo.RequestId).Errorf("get mi device conf failed: %s", err)
 			c.String(404, "get mi device conf failed: %s", err)
 			return
 		}
 		if deviceConf != nil {
-			log.Infof("use cache imei: %+v", deviceConf)
+			log.WithField("request_id", dspInfo.RequestId).Infof("use cache imei: %+v", deviceConf)
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_CACHE", cityCode) // 通过缓存请求
 			imei = deviceConf.Imei
 			uaClient = deviceConf.Ua
@@ -266,7 +271,7 @@ func adsHandler(c *gin.Context) {
 				fakeImei := ""
 				fakeDeviceConf, leftCnt, err := device.GetDailyFakeDeviceConfByCityCode(cityCode)
 				if err != nil {
-					log.Errorf("get device conf failed: %s", err)
+					log.WithField("request_id", dspInfo.RequestId).Errorf("get device conf failed: %s", err)
 					c.String(404, "get device conf failed: %s", err)
 					return
 				}
@@ -278,7 +283,7 @@ func adsHandler(c *gin.Context) {
 					device.SetAdsTagLog(advertiser, request.ReqSource, "DS_REPL", cityCode)
 					err := device.SetMiDeviceConf(realRedisKey, *fakeDeviceConf)
 					if err != nil {
-						log.Errorf("set mi device conf failed: %s", err)
+						log.WithField("request_id", dspInfo.RequestId).Errorf("set mi device conf failed: %s", err)
 					}
 					imei = fakeDeviceConf.Imei
 					uaClient = fakeDeviceConf.Ua
@@ -325,34 +330,37 @@ func adsHandler(c *gin.Context) {
 		// 解码ua_client
 		uaClient, _ = url.QueryUnescape(uaClient)
 	} else if request.IsMiDevice() {
-		log.Info("real mi")
+		log.WithField("request_id", dspInfo.RequestId).Info("real mi")
 		device.SetAdsTagLog(advertiser, request.ReqSource, "DS_MI_REAL", cityCode) // 是小米设备
 		userFlag = 3
 		sendPhoneType = 1
 	}
 
 	// 检查下,替换后的设备是否是黑名单, 再次检查， 防止放入cache后， 新增了黑名单
-	isBlackImei, err := device.CheckIsBlackImei(imei, false)
+	checkImei := imei
+	// 替换过的imei从redis取的， 都是md5后的， 不需要再md5
+	if replaceFlag != 1 {
+		checkImei = utils.Md5(imei)
+	}
+	isBlackImei, err := device.CheckIsBlackImei(checkImei)
 	if err != nil {
-		log.Errorf("get device conf failed: %s", err)
+		log.WithField("request_id", dspInfo.RequestId).Errorf("get device conf failed: %s", err)
 		c.String(404, "get device conf failed: %s", err)
 		return
 	}
 
-	log.Tracef("replace flag: %d", replaceFlag)
+	log.WithField("request_id", dspInfo.RequestId).Tracef("replace flag: %d", replaceFlag)
 	if isBlackImei {
 		if replaceFlag == 1 {
-			log.Trace("replace")
+			log.WithField("request_id", dspInfo.RequestId).Trace("replace")
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI_REPLACE", cityCode)
 		} else {
-			log.Trace("not replace")
+			log.WithField("request_id", dspInfo.RequestId).Trace("not replace")
 			device.SetAdsTagLog(advertiser, request.ReqSource, "DS_BLACK_IMEI", cityCode)
 		}
 	}
 
 	// 组装公共的dsp_info
-	dspInfo := utils.DspParam{}
-	dspInfo.Init()
 	dspInfo.DspCityCode = cityCode
 	dspInfo.Imei = imei
 	dspInfo.OriginImei = originImei
@@ -379,12 +387,12 @@ func adsHandler(c *gin.Context) {
 	dspInfo.RealReqSource = request.ReqSource
 	dspInfo.SendPhoneType = sendPhoneType
 	md5Imei := imei
-	if dspInfo.ReplaceFlag == 0 {
-		md5Imei = utils.Md5(imei)
+	if dspInfo.OriginImei != "" {
+		md5Imei = utils.Md5(dspInfo.OriginImei)
 	}
 
 	dspInfo.RealMd5Imei = md5Imei
-	log.Infof("dsp: %+v", dspInfo)
+	log.WithField("request_id", dspInfo.RequestId).Infof("dsp: %+v", dspInfo)
 	//ads_item = None
 	//xiaomi_response = []
 	hour, _ := strconv.Atoi(time.Now().Format("01"))
@@ -397,7 +405,7 @@ func adsHandler(c *gin.Context) {
 		}
 	}
 
-	log.Infof("can request: %t", canRequest)
+	log.WithField("request_id", dspInfo.RequestId).Infof("can request: %t", canRequest)
 
 	var adData *addata.AdData
 
@@ -405,11 +413,11 @@ func adsHandler(c *gin.Context) {
 	if canRequest && !isBlackImei && reqChannelFlag.ChannelFlag == 1 && flowFlag == 1 && !isIpBlack && advertiser == "xiaomi" && request.ReqSource != "" && !needControl && (replaceFlag == 1 || request.IsMiDevice()) {
 		adData, err = addata.GetAdsInfos(&dspInfo, advertiser)
 		if err != nil {
-			log.Errorf("get mi ad data failed: %s", err)
+			log.WithField("request_id", dspInfo.RequestId).Errorf("get mi ad data failed: %s", err)
 			c.String(404, "get mi ad data failed: %s", err)
 			return
 		}
-		log.Infof("get mi ads data: %+v", adData)
+		log.WithField("request_id", dspInfo.RequestId).Infof("get mi ads data: %+v", adData)
 	}
 
 	canMixFlag := 1
@@ -417,7 +425,7 @@ func adsHandler(c *gin.Context) {
 	response := Response{}
 	response.Msg = "ok"
 	if adData != nil && len(adData.TargetAddition) > 1 {
-		log.Infof("add target js order")
+		log.WithField("request_id", dspInfo.RequestId).Infof("add target js order")
 		xiaomiResponseFlag = 1
 		realTarget := ""
 		if adData.Target != "" {
@@ -432,11 +440,11 @@ func adsHandler(c *gin.Context) {
 		adData.Target = realTarget
 		adData.JsOrderId, err = redis_data.GetMinScriptOrderByAdv(advertiser)
 		if err != nil {
-			log.Errorf("get min script order by adv failed: %s", err)
+			log.WithField("request_id", dspInfo.RequestId).Errorf("get min script order by adv failed: %s", err)
 			c.String(404, "get min script order by adv failed: %s", err)
 			return
 		}
-		log.Infof("got min script order: %d", adData.JsOrderId)
+		log.WithField("request_id", dspInfo.RequestId).Infof("got min script order: %d", adData.JsOrderId)
 		adData.UserAgent = uaClient
 
 		if dspInfo.ReqSource == "kuxin" && adData.Target != "" {
@@ -452,11 +460,11 @@ func adsHandler(c *gin.Context) {
 		// // 判断这个渠道是否要去融合和融合的流量占比
 		// mixChannelFlag, err := redis_data.GetChannelFlag(dspInfo.ReqSource, "ads_mix")
 		// if err != nil {
-		// 	log.Errorf("get device conf failed: %s", err)
+		// 	log.WithField("request_id", dspInfo.RequestId).Errorf("get device conf failed: %s", err)
 		// 	c.String(404, "get device conf failed: %s", err)
 		// 	return
 		// }
-		flowRandomNum = rand.Intn(100)
+		// flowRandomNum = rand.Intn(100)
 		//isOverFlow := false
 		//if flowRandomNum > mixChannelFlag.Weigth {
 		//	isOverFlow = true
@@ -481,25 +489,25 @@ func adsHandler(c *gin.Context) {
 				serverActionResponse["server_video_timer"] = 1
 			}
 		}
-		log.Infof("server action response: %+v", serverActionResponse)
+		log.WithField("request_id", dspInfo.RequestId).Infof("server action response: %+v", serverActionResponse)
 		// 增加跟随订单
 		if len(adData.TargetAddition) == 2 && serverActionResponse["server_video_finish"] == 1 && (dspInfo.ReqSource == "kuxin" || dspInfo.ReqSource == "zhiku") {
-			log.Infof("add more order")
+			log.WithField("request_id", dspInfo.RequestId).Infof("add more order")
 			adData, err = addata.CombineOrderBy(adData, &dspInfo)
 			if err != nil {
-				log.Errorf("combine order failed: %s", err)
+				log.WithField("request_id", dspInfo.RequestId).Errorf("combine order failed: %s", err)
 				c.String(404, "combine order failed: %s", err.Error())
 				return
 			}
-			log.Infof("get custom order: %+v", adData)
+			log.WithField("request_id", dspInfo.RequestId).Infof("get custom order: %+v", adData)
 		}
 
 		//# 检查最后是否有click
-		log.Infof("check ads item new: %+v", adData)
+		log.WithField("request_id", dspInfo.RequestId).Infof("check ads item new: %+v", adData)
 
 		for _, targetAddition := range adData.TargetAddition {
 			if targetAddition.Type == "CLICK" || targetAddition.Type == "VIDEO_TIMER" {
-				log.Infof("can't mix, targetAddition: %+v", targetAddition)
+				log.WithField("request_id", dspInfo.RequestId).Infof("can't mix, targetAddition: %+v", targetAddition)
 				canMixFlag = 0
 				break
 			}
@@ -507,7 +515,7 @@ func adsHandler(c *gin.Context) {
 
 		if request.NewAdsFlag == 0 {
 			response.AdData = *adData
-			log.Infof("update response: +%v", response)
+			log.WithField("request_id", dspInfo.RequestId).Infof("update response: +%v", response)
 		} else {
 			jsonBytes, err := json.Marshal(*adData)
 			if err != nil {
@@ -519,7 +527,7 @@ func adsHandler(c *gin.Context) {
 		}
 	}
 
-	log.Infof("can mix: %d, xiaomi rsp flag: %d", canMixFlag, xiaomiResponseFlag)
+	log.WithField("request_id", dspInfo.RequestId).Infof("can mix: %d, xiaomi rsp flag: %d", canMixFlag, xiaomiResponseFlag)
 	if canMixFlag == 1 {
 		response.Result = 2
 		response.Msg = "no ads"
@@ -536,7 +544,7 @@ func adsHandler(c *gin.Context) {
 				c.String(404, "get custom ads info failed: %s", err.Error())
 				return
 			}
-			log.Infof("dingtou: %+v", customAdData)
+			log.WithField("request_id", dspInfo.RequestId).Infof("dingtou: %+v", customAdData)
 
 			// 定投没有就跑其他的
 			if customAdData == nil {
@@ -554,7 +562,7 @@ func adsHandler(c *gin.Context) {
 			if customAdData != nil && (shortMessage == "ads_vast_response" || shortMessage == "ads_tt_thirds") {
 				adDataBytes, err := json.Marshal(*customAdData)
 				if err != nil {
-					log.Errorf("marshal adData failed: %s\n", err)
+					log.WithField("request_id", dspInfo.RequestId).Errorf("marshal adData failed: %s\n", err)
 				}
 				grayLogData := struct {
 					Ip           string
@@ -606,7 +614,7 @@ func adsHandler(c *gin.Context) {
 
 					adDataBytes, err := json.Marshal(lastAdData)
 					if err != nil {
-						log.Errorf("marshal adData failed: %s", err)
+						log.WithField("request_id", dspInfo.RequestId).Errorf("marshal adData failed: %s", err)
 					}
 					grayLogData := struct {
 						ShortMessage string `json:"short_message"`
@@ -617,7 +625,7 @@ func adsHandler(c *gin.Context) {
 					}
 
 					graylog.Log(grayLogData)
-					log.Infof("replace addata: %+v", lastAdData)
+					log.WithField("request_id", dspInfo.RequestId).Infof("replace addata: %+v", lastAdData)
 					customAdData = &lastAdData
 				}
 			}
@@ -627,19 +635,19 @@ func adsHandler(c *gin.Context) {
 					response.Result = 0
 					response.Msg = "ok"
 
-					log.Infof("rsp1: %+v", customAdData)
+					log.WithField("request_id", dspInfo.RequestId).Infof("rsp1: %+v", customAdData)
 					jsonBytes, err := json.Marshal(customAdData)
 					if err != nil {
 						c.String(404, "marsha custom addata failed: %s", err.Error())
 						return
 					}
-					log.Infof("rsp1: %s", jsonBytes)
+					log.WithField("request_id", dspInfo.RequestId).Infof("rsp1: %s", jsonBytes)
 					encryptData, _ := encrypt.Encrypt(jsonBytes, []byte(adslib.GetConf().SecretKey))
 					response.AdsResult = encryptData
 
-					log.Infof("encrypt: %s", encryptData)
+					log.WithField("request_id", dspInfo.RequestId).Infof("encrypt: %s", encryptData)
 					s, err := encrypt.Decrypt(encryptData, []byte(adslib.GetConf().SecretKey))
-					log.Info(s, err)
+					log.WithField("request_id", dspInfo.RequestId).Info(s, err)
 
 					graylog.ReportGrayLog(request, dspInfo, 0, 0)
 					rspBytes, err := json.Marshal(response)
@@ -647,7 +655,7 @@ func adsHandler(c *gin.Context) {
 						c.String(404, "marshal Response failed: %s", err.Error())
 						return
 					}
-					log.Infof("rsp1: %s", rspBytes)
+					log.WithField("request_id", dspInfo.RequestId).Infof("rsp1: %s", rspBytes)
 					c.String(200, string(rspBytes))
 					return
 				} else {
@@ -676,6 +684,6 @@ func adsHandler(c *gin.Context) {
 		graylog.ReportGrayLog(request, dspInfo, 0, 0)
 	}
 	device.SetAdsTagLog(advertiser, dspInfo.ReqSource, "DS_REQ", cityCode) // 所有请求
-	log.Infof("rsp3: %s", rspBytes)
+	log.WithField("request_id", dspInfo.RequestId).Infof("rsp3: %s", rspBytes)
 	c.String(200, string(rspBytes))
 }

adslib/addata/custom.go

@@ -147,14 +147,14 @@ func getNeedDispatchCount(adData *redis_data.AdOrderInfo) (int, error) {
 func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHasFlag int) (*AdData, error) {
 	order, err := GetOneAds(dsp, orderType, fixFlag)
 	if err != nil {
-		log.Errorf("get one ads failed: %s", err)
+		log.WithField("request_id", dsp.RequestId).Errorf("get one ads failed: %s", err)
 		return nil, err
 	}
 	if order == nil {
 		return nil, nil
 	}
 
-	log.Infof("begin got custom ad info, xiaomi has flag: %d", xiaomiHasFlag)
+	log.WithField("request_id", dsp.RequestId).Infof("begin got custom ad info, xiaomi has flag: %d", xiaomiHasFlag)
 	if xiaomiHasFlag == 1 {
 		if strings.Index(order.Title, "_ios") > 0 {
 			return nil, nil
@@ -181,7 +181,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 
 	redis_data.SetPlanDispatchCount(order.OrderID, "show", needDispatchCnt, curTime)
 
-	log.Infof("all count: %d, over kpi: %d, show kpi: %d", needDispatchCnt, finishShowCnt, order.ShowKpi)
+	log.WithField("request_id", dsp.RequestId).Infof("all count: %d, over kpi: %d, show kpi: %d", needDispatchCnt, finishShowCnt, order.ShowKpi)
 	// 计算曲线比例
 	rate := float32(order.ShowKpi) / float32(needDispatchCnt)
 
@@ -195,7 +195,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 	if err != nil {
 		return nil, err
 	}
-	log.Infof("line value: %d, rate: %f", lineValue, rate)
+	log.WithField("request_id", dsp.RequestId).Infof("line value: %d, rate: %f", lineValue, rate)
 
 	// 当前分钟需要放出去的数量
 	curMinuteNeedDispatchCnt := int(float32(lineValue) * rate)
@@ -205,11 +205,11 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 
 	redis_data.SetOrderPlanDispatchCount(order.OrderID, "show", curMinuteNeedDispatchCnt, curTime)
 
-	log.Infof("tt thirds: %+v", order)
+	log.WithField("request_id", dsp.RequestId).Infof("tt thirds: %+v", order)
 	// 获取当前分钟已经完成的下发
 	curMinuteFinishedDispatchCnt, err := redis_data.GetPreMinuteFinishedDispatchCount(order.OrderID, "show", curTime)
 
-	log.Infof("o value: %d, w value: %d", curMinuteFinishedDispatchCnt, curMinuteNeedDispatchCnt)
+	log.WithField("request_id", dsp.RequestId).Infof("o value: %d, w value: %d", curMinuteFinishedDispatchCnt, curMinuteNeedDispatchCnt)
 	if curMinuteFinishedDispatchCnt < curMinuteNeedDispatchCnt {
 		data := AdData{
 			Duration:  5,
@@ -235,7 +235,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 		if strings.Index(order.Title, "_ios") != -1 {
 			iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 			if err != nil {
-				log.Errorf("get ios ua imei failed: %s", err)
+				log.WithField("request_id", dsp.RequestId).Errorf("get ios ua imei failed: %s", err)
 				return nil, err
 			}
 			if iosUa != "" {
@@ -270,7 +270,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 			if r < 40 && xiaomiHasFlag == 0 {
 				iosImei, iosUa, err := redis_data.GetIosUaImei(dsp.Ip)
 				if err != nil {
-					log.Errorf("get ios ua imei failed: %s", err)
+					log.WithField("request_id", dsp.RequestId).Errorf("get ios ua imei failed: %s", err)
 					return nil, err
 				}
 				if iosUa != "" {
@@ -320,7 +320,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 
 		r := rand.Intn(1000)
 		clickRate := int(float32(order.ClickKpi) / float32(order.ShowKpi) * 1000)
-		log.Infof("rand: %d, rate: %d", r, clickRate)
+		log.WithField("request_id", dsp.RequestId).Infof("rand: %d, rate: %d", r, clickRate)
 		if r < clickRate {
 			//下发点击
 			addi = genMonitorAction("CLICK", order.Title, dsp.ReqSource, clickUrl)
@@ -328,7 +328,7 @@ func GetCustomAdsInfos(dsp *utils.DspParam, orderType int, fixFlag int, xiaomiHa
 			md5Skip := utils.Md5(targetUrl)
 			_, err = redis_data.IncrFinishedDispatchCount(order.OrderID, "click", 1, curTime)
 			if err != nil {
-				log.Errorf("incr finished dispatch count failed: %s", err)
+				log.WithField("request_id", dsp.RequestId).Errorf("incr finished dispatch count failed: %s", err)
 			}
 			realTarget := adslib.GetConf().Host + fmt.Sprintf("?action=LOADING&req_source=%s&advertiser=%s&skip=%s&skip_other=%s",
 				dsp.ReqSource, order.Title, "", md5Skip)

adslib/addata/xiaomi.go

@@ -190,7 +190,7 @@ func GetAdsInfos(dsp *utils.DspParam, advertiser string) (*AdData, error) {
 		target := html.UnescapeString(target)
 		targetParseUrl, err := url.Parse(target)
 		if err != nil {
-			log.Errorf("parse url failed, url: %s, err: %s", target, err)
+			log.WithField("request_id", dsp.RequestId).Errorf("parse url failed, url: %s, err: %s", target, err)
 			continue
 		}
 
@@ -315,11 +315,11 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 
 	clickChannelFlag, err := redis_data.GetChannelFlag(dsp.ReqSource, "ads_click")
 	if err != nil {
-		log.Errorf("get ads_click channel flag failed: %s", err)
+		log.WithField("request_id", dsp.RequestId).Errorf("get ads_click channel flag failed: %s", err)
 		return nil, err
 	}
 
-	log.Tracef("click channel flag: %+v\n", clickChannelFlag)
+	log.WithField("request_id", dsp.RequestId).Tracef("click channel flag: %+v\n", clickChannelFlag)
 
 	clickRandom := rand.Intn(100)
 	needClick := false
@@ -461,7 +461,7 @@ func CombineLastAdsInfos(dsp *utils.DspParam, advertiser string, gotoUrls []stri
 
 		canReport, err := redis_data.GetDeviceIpReport(dsp.Imei, dsp.Ip)
 		if err != nil {
-			log.Errorf("get device ip report failed: %s", err)
+			log.WithField("request_id", dsp.RequestId).Errorf("get device ip report failed: %s", err)
 			return nil, err
 		}
 
@@ -520,7 +520,7 @@ func genAdsAction(urls []string, advertiser string,
 		lastUrls = append(urls, reportUrl)
 	}
 
-	log.Tracef("action: %s, all send: %d,  all show: %d, control: +%v %+v %t\n", action, allSendNum, allShowNum, flowControlConf, lastUrls, needControl)
+	log.WithField("request_id", dsp.RequestId).Tracef("action: %s, all send: %d,  all show: %d, control: +%v %+v %t\n", action, allSendNum, allShowNum, flowControlConf, lastUrls, needControl)
 
 	if len(lastUrls) == 0 {
 		duration = 0

adslib/device/device.go

@@ -7,7 +7,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"math/rand"
 	"miads/adslib/ads_redis"
-	"miads/adslib/utils"
 	"strconv"
 	"strings"
 	"time"
@@ -151,7 +150,7 @@ func GetDailyFakeDeviceConfByCityCode(cityCode int) (*DeviceConf, int, error) {
 			continue
 		}
 
-		isBlackItem, err := CheckIsBlackImei(d.Imei, false)
+		isBlackItem, err := CheckIsBlackImei(d.Imei)
 		if err != nil {
 			continue
 		}
@@ -182,17 +181,12 @@ func GetDailyFakeDeviceConfByCityCode(cityCode int) (*DeviceConf, int, error) {
 }
 
 // 检查是否是黑名单
-func CheckIsBlackImei(imei string, needMd5 bool) (bool, error) {
+func CheckIsBlackImei(imei string) (bool, error) {
 	conn := ads_redis.RedisConn.Get()
 	defer conn.Close()
 
-	checkImei := imei
-	if needMd5 {
-		checkImei = utils.Md5(imei)
-	}
-
-	redisKey := "ads_black_device_" + checkImei[0:2]
-	isBlackImei, err := redis.Bool(conn.Do("SISMEMBER", redisKey, checkImei))
+	redisKey := "ads_black_device_" + imei[0:2]
+	isBlackImei, err := redis.Bool(conn.Do("SISMEMBER", redisKey, imei))
 	if err != nil {
 		return false, err
 	}