diff --git a/platformapi/platformapi.go b/platformapi/platformapi.go index a98e6b93..48bb8762 100644 --- a/platformapi/platformapi.go +++ b/platformapi/platformapi.go @@ -98,30 +98,31 @@ func AccessPlatformAPIWithRetry(client *http.Client, handleRequest func() *http. request.Body = ioutil.NopCloser(io.TeeReader(request.Body, savedBuf)) } beginTime := time.Now() - // baseapi.SugarLogger.Debugf("begin AccessPlatformAPIWithRetry url:%v", request.URL) + trackID := utils.GetUUID() + baseapi.SugarLogger.Debugf("begin AccessPlatformAPIWithRetry:%s do url:%v", trackID, request.URL) response, err := client.Do(request) - // baseapi.SugarLogger.Debugf("end AccessPlatformAPIWithRetry url:%v, request:%s", request.URL, getClonedData(savedBuf)) + baseapi.SugarLogger.Debugf("end AccessPlatformAPIWithRetry:%s do url:%v, request:%s", trackID, request.URL, getClonedData(savedBuf)) if err != nil { - baseapi.SugarLogger.Debugf("AccessPlatformAPIWithRetry client.Get return err:%v", err) + baseapi.SugarLogger.Debugf("AccessPlatformAPIWithRetry:%s client.Get return err:%v", err) err, ok := err.(net.Error) if ok && err.Timeout() && recoverableErrorRetryCount <= config.MaxRecoverableRetryCount { recoverableErrorRetryCount++ continue } else { - baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry access api url:%v, request:%v, error:%v", request.URL, getClonedData(savedBuf), err) + baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry:%s access api url:%v, request:%v, error:%v", trackID, request.URL, getClonedData(savedBuf), err) return ErrAPIAccessFailed } } usedMilliSecond := time.Now().Sub(beginTime) / time.Millisecond if usedMilliSecond > 5000 { - baseapi.SugarLogger.Infof("AccessPlatformAPIWithRetry access api too slow, url:%v, request:%v, usedMilliSecond:%d", request.URL, getClonedData(savedBuf), usedMilliSecond) + baseapi.SugarLogger.Infof("AccessPlatformAPIWithRetry:%s access api too slow, url:%v, request:%v, usedMilliSecond:%d", trackID, request.URL, getClonedData(savedBuf), usedMilliSecond) } defer response.Body.Close() if response.StatusCode != 200 { if bodyData, err := ioutil.ReadAll(response.Body); err == nil { - baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry HTTP code is:%d, url:%v, request:%v, response:%s", response.StatusCode, request.URL, getClonedData(savedBuf), string(bodyData)) + baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry:%s HTTP code is:%d, url:%v, request:%v, response:%s", trackID, response.StatusCode, request.URL, getClonedData(savedBuf), string(bodyData)) } else { - baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry HTTP code is:%d, url:%v, request:%v", response.StatusCode, request.URL, getClonedData(savedBuf)) + baseapi.SugarLogger.Errorf("AccessPlatformAPIWithRetry:%s HTTP code is:%d, url:%v, request:%v", trackID, response.StatusCode, request.URL, getClonedData(savedBuf)) } return ErrHTTPCodeIsNot200 } @@ -132,7 +133,7 @@ func AccessPlatformAPIWithRetry(client *http.Client, handleRequest func() *http. } else { errLevel, err = handleResponse(bodyMap) } - // baseapi.SugarLogger.Debugf("AccessPlatformAPIWithRetry url:%v, request:%v, response:%s", request.URL, getClonedData(savedBuf), utils.Format4Output(bodyMap, true)) + // baseapi.SugarLogger.Debugf("AccessPlatformAPIWithRetry:%s url:%v, request:%v, response:%s", trackID, request.URL, getClonedData(savedBuf), utils.Format4Output(bodyMap, true)) if err == nil { return nil } else if errLevel == ErrLevelExceedLimit { @@ -147,7 +148,7 @@ func AccessPlatformAPIWithRetry(client *http.Client, handleRequest func() *http. continue } } - baseapi.SugarLogger.Infof("AccessPlatformAPIWithRetry failed, url:%v, request:%v, response:%s, error:%v", request.URL, getClonedData(savedBuf), utils.Format4Output(bodyMap, true), err) + baseapi.SugarLogger.Infof("AccessPlatformAPIWithRetry:%s failed, url:%v, request:%v, response:%s, error:%v", trackID, request.URL, getClonedData(savedBuf), utils.Format4Output(bodyMap, true), err) return err } }