Merge branch 'feature_20240722_add_log' of algorithm/ad-engine into master

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/RankService680.java

@@ -79,8 +79,8 @@ public class RankService680 {
             adRankItem.setCpa(dto.getCpa());
             adRankItem.setId(dto.getAdId());
             adRankItem.setCampaignId(dto.getCampaignId());
-            adRankItem.getExt().put("getFeatureElapsed", String.valueOf(getFeatureElapsed));
-            adRankItem.getExt().put("invokeFeatureServiceElapsed", String.valueOf(invokeFeatureServiceElapsed));
+            adRankItem.getExt().put("getFeatureElapsed", getFeatureElapsed);
+            adRankItem.getExt().put("invokeFeatureServiceElapsed", invokeFeatureServiceElapsed);
 
             String cidStr = dto.getCreativeId().toString();
             Map<String, String> cidFeatureMap = new HashMap<>();
@@ -114,21 +114,25 @@ public class RankService680 {
         }
 
         // 分桶
+        long featureBucketStart = System.currentTimeMillis();
         this.readBucketFile();
         userFeatureMap = this.featureBucket(userFeatureMap);
         for (AdRankItem adRankItem : adRankItems) {
             Map<String, String> featureMap = adRankItem.getFeatureMap();
             adRankItem.setFeatureMap(this.featureBucket(featureMap));
+            adRankItem.getExt().put("featureBucketElapsed", System.currentTimeMillis() - featureBucketStart);
         }
 
         // 打分排序
+        long scoreStart = System.currentTimeMillis();
         List<AdRankItem> result = ScorerUtils.getScorerPipeline(ScorerUtils.LR_ROV_SCORE_20240626)
                 .scoring(new HashMap<>(), userFeatureMap, adRankItems);
-
+        long scoreElapsed = System.currentTimeMillis() - scoreStart;
         for (AdRankItem item : result) {
             item.setScore(item.getLrScore() * item.getCpa());
             item.getScoreMap().put("cpa", item.getCpa());
             item.getFeatureMap().putAll(userFeatureMap);
+            item.getExt().put("scoreElapsed", scoreElapsed);
 
             for (Map.Entry<String, Map<String, String>> entry : videoFeature.entrySet()) {
                 if (MapUtils.isNotEmpty(entry.getValue())) {

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -92,8 +92,9 @@ public class RankServiceImpl implements RankService {
         ScoreParam scoreParam = RequestConvert.requestConvert(request);
         long start = System.currentTimeMillis();
         List<AdRankItem> adRankItems = fmRankService.adItemRank(request, scoreParam);
+        long elapsed = System.currentTimeMillis() - start;
         for (AdRankItem adRankItem : adRankItems) {
-            adRankItem.getExt().put("rankElapsed", String.valueOf(System.currentTimeMillis() - start));
+            adRankItem.getExt().put("rankElapsed", elapsed);
         }
         logHubService.scoreLogUpload(scoreParam, request.getAdIdList(), adRankItems, request, "LRModelScore", "680");
         return adRankItems.get(0);