Browse Source

feat:添加日志

zhaohaipeng 9 months ago
parent
commit
df26c86b3d

+ 3 - 0
ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/feature/Feature.java

@@ -7,6 +7,9 @@ import java.util.Map;
 
 @Data
 public class Feature {
+
+    private long elapsed;
+
     // k1:创意、k2:表、k3:特征、v:特征值
     private Map<String, Map<String, Map<String, String>>> cidFeature = new HashMap<>();
 

+ 2 - 1
ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/feature/FeatureService.java

@@ -82,9 +82,10 @@ public class FeatureService {
         long start = System.currentTimeMillis();
         Map<String, String> featureMap = remoteService.getFeature(protos);
         featureMap = this.featureStrCover(featureMap);
-        log.info("svc=invokeFeatureService, elapsed: {}", System.currentTimeMillis() - start);
 
         Feature feature = new Feature();
+        feature.setElapsed(System.currentTimeMillis() - start);
+
         for (Map.Entry<String, String> entry : featureMap.entrySet()) {
             String key = entry.getKey();
             String value = entry.getValue();

+ 1 - 14
ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/impl/LogHubServiceImpl.java

@@ -54,7 +54,6 @@ public class LogHubServiceImpl implements LogHubService {
                 logMap.put("abcode", param.getAdAbGroup());
                 logMap.put("expid", abCode);
                 logMap.put("apptype", context.getApptype());
-                logMap.put("extinfo", new JSONObject());
 
                 // 获取AB实验列表
                 Set<String> abExpCode = new HashSet<>();
@@ -102,6 +101,7 @@ public class LogHubServiceImpl implements LogHubService {
                 logMap.put("adid", top1.getId());
                 logMap.put("campaignid", top1.getCampaignId());
                 logMap.put("score", top1.getScore());
+                logMap.put("extinfo", JSON.toJSONString(top1.getExt()));
 
 
                 top1.getScoreMap().put("score", top1.getScore());
@@ -109,19 +109,6 @@ public class LogHubServiceImpl implements LogHubService {
                 logMap.put("allfeature", JSON.toJSONString(top1.getFeatureMap()));
                 logMap.put("metafeature", JSON.toJSONString(top1.getMetaFeatureMap()));
 
-
-                // logMap.put("scorestrategy", scoreStrategy);
-                // logMap.put("creativeList", JSON.toJSONString(adIdList));
-                // if (Objects.nonNull(requestParam.getStatisticsLog())) {
-                //     extInfo.put("earlyAdIds", requestParam.getStatisticsLog().getEarlyAdIds());
-                //     extInfo.put("earlyCidList", requestParam.getStatisticsLog().getEarlyCreativeIds());
-                //     extInfo.put("finalCidList", requestParam.getStatisticsLog().getFinalCreativeIds());
-                //     extInfo.put("commonFilterAfterAdIds", requestParam.getStatisticsLog().getCommonFilterAfterAdIds());
-                //     extInfo.put("commonFilterAfterCidList", requestParam.getStatisticsLog().getCommonFilterAfterCreativeIds());
-                //     extInfo.put("tacticsFilterAfterAdIds", requestParam.getStatisticsLog().getTacticsFilterAfterAdIds());
-                //     extInfo.put("tacticsFilterAfterCidList", requestParam.getStatisticsLog().getTacticsFilterAfterCreativeIds());
-                // }
-
                 aliyunLogManager.sendLog(project, logStore, "", logMap);
             }
         });

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

@@ -45,7 +45,9 @@ public class RankService680 {
         // 特征处理
         long start = System.currentTimeMillis();
         Feature feature = this.getFeature(scoreParam, request);
-        log.info("svc=getFeature, elapsed: {}", System.currentTimeMillis() - start);
+        long getFeatureElapsed = System.currentTimeMillis() - start;
+
+        long invokeFeatureServiceElapsed = feature.getElapsed();
 
         Map<String, Map<String, String>> userFeature = feature.getUserFeature();
         Map<String, Map<String, String>> videoFeature = feature.getVideoFeature();
@@ -77,6 +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));
 
             String cidStr = dto.getCreativeId().toString();
             Map<String, String> cidFeatureMap = new HashMap<>();

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

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