Pull request #13118: REPORT-106669 报表埋点补充

Merge in DESIGN/design from ~DESTINY.LIN/design:feature/x to feature/x

* commit '9543ce2f75bb1b110044e7e4f85dc5eb5367bfb1':
  REPORT-106669 报表埋点补充开发文档 去除多余commit
  REPORT-106669 报表埋点补充开发文档 去除多余commit
  REPORT-106669 报表埋点补充开发文档 去除多余commit
  REPORT-106669 报表埋点补充开发文档 去除多余commit
  REPORT-106669 报表埋点补充开发文档 常量处理一下
  REPORT-106669 报表埋点补充开发文档 收集异常埋点信息
  REPORT-106669 报表埋点补充开发文档 启动埋点新增JDK属性
  REPORT-106669 报表埋点补充开发文档 保存埋点提交
  REPORT-102875 决策报表拖入的图表都报错

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.Parameter;
 import com.fr.base.TRL;
 import com.fr.base.extension.FileExtension;
+import com.fr.base.info.TemplateSaveInfoContext;
 import com.fr.base.io.BaseBook;
 import com.fr.base.iofile.attr.DesignBanCopyAttrMark;
 import com.fr.base.iofile.attr.TemplateIdAttrMark;
@@ -1884,6 +1885,8 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         CallbackSaveWorker worker = new CallbackSaveWorker(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
+                TemplateSaveInfoContext.getInstance().startRecord();
+                TemplateSaveInfoContext.getInstance().collectInfo(template.suffix());
                 return saveRealFileByWorker();
             }
         }, this);

designer-base/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfo.java

@@ -33,6 +33,10 @@ public class ErrorInfo {
     private String log;
     private String stackTrace;
 
+    private boolean starting;
+
+    private boolean remote;
+
     public ErrorInfo(String username, String uuid, String activekey) {
         this.username = username;
         this.uuid = uuid;
@@ -51,6 +55,22 @@ public class ErrorInfo {
         this.username = username;
     }
 
+    public boolean isStarting() {
+        return starting;
+    }
+
+    public void setStarting(boolean starting) {
+        this.starting = starting;
+    }
+
+    public boolean isRemote() {
+        return remote;
+    }
+
+    public void setRemote(boolean remote) {
+        this.remote = remote;
+    }
+
     public String getUuid() {
         return uuid;
     }
@@ -126,6 +146,8 @@ public class ErrorInfo {
         jo.put("logid", logid);
         jo.put("log", log);
         jo.put("stacktrace", stackTrace);
+        jo.put("starting", starting);
+        jo.put("remote", remote);
         saveFileToCache(jo);
     }
 

designer-base/src/main/java/com/fr/design/mainframe/messagecollect/StartErrorMessageCollector.java

@@ -4,6 +4,8 @@ import com.fr.design.DesignerEnvManager;
 import com.fr.design.mainframe.errorinfo.ErrorInfo;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
+import com.fr.start.common.DesignerStartupContext;
+import com.fr.workspace.WorkContext;
 
 /**
  *
@@ -35,6 +37,8 @@ public class StartErrorMessageCollector {
         errorInfo.setLogid(id);
         errorInfo.setLog(msg);
         errorInfo.setStackTrace(detail);
+        errorInfo.setStarting(DesignerStartupContext.getInstance().isOnStartup());
+        errorInfo.setRemote(!WorkContext.getCurrent().isLocal());
         errorInfo.saveAsJSON();
     }
 

designer-base/src/main/java/com/fr/design/worker/save/CallbackSaveWorker.java

@@ -1,5 +1,6 @@
 package com.fr.design.worker.save;
 
+import com.fr.base.info.TemplateSaveInfoContext;
 import com.fr.common.util.Collections;
 import com.fr.design.mainframe.JTemplate;
 import java.util.LinkedList;
@@ -34,6 +35,8 @@ public class CallbackSaveWorker extends SaveWorker {
         }
         successRunnableList = null;
         failRunnableList = null;
+        TemplateSaveInfoContext.getInstance().stopRecord();
+        TemplateSaveInfoContext.getInstance().setSaveCompleted(success);
     }
 
     private void fireRunnable(List<Runnable> list) {

designer-base/src/main/java/com/fr/startup/metric/DesignerStartupModel.java

@@ -39,6 +39,11 @@ public class DesignerStartupModel {
      * mode：模式，0-有设计器起动页；1-无设计器起始页
      */
     private int mode;
+
+    /**
+     * jdkVersion:JDK版本
+     */
+    private String jdkVersion;
     
     public DesignerStartupModel() {
     }
@@ -73,7 +78,15 @@ public class DesignerStartupModel {
     public void setInfo(MachineInfo info) {
         this.info = info;
     }
-    
+
+    public String getJdkVersion() {
+        return jdkVersion;
+    }
+
+    public void setJdkVersion(String jdkVersion) {
+        this.jdkVersion = jdkVersion;
+    }
+
     public int getMode() {
         return mode;
     }
@@ -83,7 +96,7 @@ public class DesignerStartupModel {
     }
     
     private void fillInfo() {
-    
+        this.setJdkVersion(System.getProperty("java.runtime.version"));
         MachineInfo info = new MachineInfo();
         AbstractOperatingSystem operatingSystem = OperatingSystem.getOperatingSystem();
         info.setSystem(operatingSystem.getDisplayString());

designer-realize/src/main/java/com/fr/design/mainframe/InformationCollector.java

@@ -57,6 +57,10 @@ public class InformationCollector implements XMLReadable, XMLWriter {
      */
     private static final long DELTA = 24 * 3600 * 1000L;
     private static final long SEND_DELAY = 300 * 1000L;
+    /**
+     * 10分钟后再收集信息
+     */
+    private static final long SEND_DELAY_4_ERROR_INFO = 300 * 1000L * 2;
     private static final String FILE_NAME = "fr.info";
     private static final String XML_START_STOP_LIST = "StartStopList";
     private static final String XML_START_STOP = "StartStop";
@@ -64,6 +68,8 @@ public class InformationCollector implements XMLReadable, XMLWriter {
     private static final String ATTR_START = "start";
     private static final String ATTR_STOP = "stop";
 
+    private static final String THREAD_NAME = "ErrorInfoCollector";
+
     private static InformationCollector collector;
 
     /**
@@ -143,9 +149,22 @@ public class InformationCollector implements XMLReadable, XMLWriter {
      */
     public void collectStartTime() {
         this.current.setStartDate(dateToString());
+        dealWithErrorInfo();
         sendInfo();
     }
 
+    private void dealWithErrorInfo() {
+        ScheduledExecutorService service = Executors
+                .newSingleThreadScheduledExecutor(new NamedThreadFactory(THREAD_NAME));
+        service.schedule(() -> {
+            ErrorInfoUploader.getInstance().dealErrorInfo(false);
+        }, SEND_DELAY_4_ERROR_INFO, TimeUnit.MILLISECONDS);
+        service.shutdown();
+    }
+
+    /**
+     * 目前来看这些数据好像没啥用了，但是还是先留着吧，单独把错误信息拿出来用云端运维统一提交
+     */
     private void sendInfo() {
         if (!DesignerEnvManager.getEnvManager().isJoinProductImprove() || !FRContext.isChineseEnv()) {
             return;
@@ -157,7 +176,6 @@ public class InformationCollector implements XMLReadable, XMLWriter {
             SolidCollector.getInstance().sendToCloudCenterAndDeleteFile();
             FocusPointMessageUploader.getInstance().sendToCloudCenter();
             ChartInfoCollector.getInstance().sendPointInfo();
-            ErrorInfoUploader.getInstance().sendErrorInfo();
             sendInfoSuccessCallback();
         }, SEND_DELAY, TimeUnit.MILLISECONDS);
         service.shutdown();

designer-realize/src/main/java/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -20,9 +20,10 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,6 +38,8 @@ public class ErrorInfoUploader {
     public static final String SUFFIX = ".json";
     public static final String FOLDER_NAME = "errorInfo";
 
+    private static final String CLOUD_KEY = "design.error";
+
     private static ErrorInfoUploader collector;
     // 在一台不能上网的电脑里发现了10w个errorinfo...
     private static final int MAX_ERROR_SIZE = 2000;
@@ -148,6 +151,15 @@ public class ErrorInfoUploader {
         // 判断更新解决方案缓存.
         checkUpdateSolution();
 
+        dealErrorInfo(true);
+    }
+
+    /**
+     * 处理错误信息
+     *
+     * @param needSend2Cloud 是否需要上传到云中心
+     */
+    public void dealErrorInfo(boolean needSend2Cloud) {
         //读取文件夹里的json, 加入上传队列中.
         File folder = new File(StableUtils.pathJoin(ProductConstants.getEnvHome(), FOLDER_NAME));
         if (!folder.exists()) {
@@ -164,41 +176,65 @@ public class ErrorInfoUploader {
         }
 
         try {
-            if (ArrayUtils.isNotEmpty(files)) {
+            dealFiles(files, needSend2Cloud);
-                JSONArray jsonArray = new JSONArray();
+        } catch (Exception ignore) {
-                List<File> tempFiles = new ArrayList<>();
+
-                int count = 0;
+        }
-                for (File file : files) {
+    }
-                    count++;
+
-                    String filePath = file.getPath();
+    private void dealFiles(File[] files, boolean needSend2Cloud) throws IOException {
-                    String suffix = filePath.substring(filePath.lastIndexOf("."));
+        if (ArrayUtils.isNotEmpty(files)) {
-
+            JSONArray jsonArray = new JSONArray();
-                    if (suffix.endsWith(SUFFIX)) {
+            List<File> tempFiles = new ArrayList<>();
-                        String content = IOUtils.inputStream2String(new FileInputStream(file));
+            int count = 0;
-                        if (content.length() > MAX_ERROR_SIZE) {
+            for (File file : files) {
-                            CommonIOUtils.deleteFile(file);
+                count++;
-                            continue;
+                String filePath = file.getPath();
-                        }
+                String suffix = filePath.substring(filePath.lastIndexOf("."));
-                        jsonArray.put(new JSONObject(content));
+
-                        tempFiles.add(file);
+                if (suffix.endsWith(SUFFIX)) {
-                        if (jsonArray.length() == MAX_ITEMS || count == files.length) {
+                    String content = IOUtils.inputStream2String(Files.newInputStream(file.toPath()));
-                            String url = CloudCenter.getInstance().acquireUrlByKind("design.error");
+                    if (content.length() > MAX_ERROR_SIZE) {
-                            if (StringUtils.isBlank(url)) {
+                        CommonIOUtils.deleteFile(file);
-                                return;
+                        continue;
-                            }
+                    }
-                            if (sendErrorInfo(url, jsonArray)) {
+                    jsonArray.put(new JSONObject(content));
-                                deleteFiles(tempFiles);
+                    tempFiles.add(file);
-                            }
+                    if (jsonArray.length() == MAX_ITEMS || count == files.length) {
-                            jsonArray = new JSONArray();
+                        processInfos(jsonArray, needSend2Cloud, tempFiles);
-                        }
                     }
                 }
             }
-        } catch (Exception ignore) {
+        }
+    }
 
+    private void processInfos(JSONArray jsonArray, boolean needSend2Cloud, List<File> tempFiles) {
+        if (needSend2Cloud) {
+            String url = CloudCenter.getInstance().acquireUrlByKind(CLOUD_KEY);
+            if (StringUtils.isBlank(url)) {
+                return;
+            }
+            if (sendErrorInfo(url, jsonArray)) {
+                deleteFiles(tempFiles);
+            }
+            jsonArray = new JSONArray();
+        } else {
+            sendInfos4AnalysisAndClearFiles(jsonArray, tempFiles);
         }
     }
 
+
+    /**
+     * 提供给云端运维监听的方法(beforeExecute)
+     *
+     * @param jsonArray 要提交的信息
+     * @param tempFiles 要删除的文件
+     */
+    private void sendInfos4AnalysisAndClearFiles(JSONArray jsonArray, List<File> tempFiles) {
+        deleteFiles(tempFiles);
+    }
+
+
     private void deleteFiles(List<File> files) {
         for (File file : files) {
             CommonIOUtils.deleteFile(file);