From 67e466bb49b86eed21b379356eb3c5bd7e6cba8b Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Tue, 28 Dec 2021 19:36:54 +0800
Subject: [PATCH] =?UTF-8?q?8.0.17=20apm=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              | 57 ++++++++-----------
 .../function/main/MainMoGoApplication.java    |  5 +-
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7806511c2..15e0c233d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -149,29 +149,7 @@ aspectjx {
     include "com.mogo.chat"
 }
 
-ApmPlugin {
-    // 是否进行插桩
-    enable true
-    // 是否在Debug包插桩，默认不插桩
-    enableInDebug true
-    // DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR");
-    // INFO 级别Log会汇总所有被插桩处理的类供查看，路径 app/build/ByteX/ApmPlugin
-    logLevel "DEBUG"
-    // 启动分析开关：监控App启动耗时，需要同时开启pageLoadSwitch
-    startSwitch = true
-    // 页面响应开关：监控Activity的生命周期耗时
-    pageLoadSwitch = true
-    // 网络监控开关：监控okhttp3的网络请求
-    okHttp3Switch = true
-    // 白名单下的包进行插桩，需要填写要插装类所在的包名，支持前缀配置
-    whiteList = [
-            "com.mogo"
-    ]
-    // 黑名单包下类不进行插桩，可以配置包名和类名，没有可以填空
-    blackList = [
 
-    ]
-}
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar'])
@@ -196,21 +174,32 @@ dependencies {
     apply from: "./functions/tts.gradle"
     apply from: "./functions/och.gradle"
 
-//    implementation group: "com.tencent.matrix", name: "matrix-android-lib", version: '0.6.6', changing: true
-//    implementation group: "com.tencent.matrix", name: "matrix-android-commons", version: '0.6.6', changing: true
-//    implementation group: "com.tencent.matrix", name: "matrix-trace-canary", version:'0.6.6', changing: true
-//    implementation group: "com.tencent.matrix", name: "matrix-io-canary", version: '0.6.6', changing: true
 
 }
 
-//apply plugin: 'com.tencent.matrix-plugin'
-//matrix {
-//    trace {
-//        enable = true	//if you don't want to use trace canary, set false
-//        baseMethodMapFile = "${project.projectDir}/matrixOutput/Debug.methodmap"
-//        blackListFile = "${project.projectDir}/matrixTrace/blackMethodList.txt"
-//    }
-//}
+ApmPlugin {
+    // 是否进行插桩
+    enable true
+    // 是否在Debug包插桩，默认不插桩
+    enableInDebug true
+    // DEBUG("DEBUG"), INFO("INFO"), WARN("WARN"), ERROR("ERROR");
+    // INFO 级别Log会汇总所有被插桩处理的类供查看，路径 app/build/ByteX/ApmPlugin
+    logLevel "DEBUG"
+    // 启动分析开关：监控App启动耗时，需要同时开启pageLoadSwitch
+    startSwitch = true
+    // 页面响应开关：监控Activity的生命周期耗时
+    pageLoadSwitch = true
+    // 网络监控开关：监控okhttp3的网络请求
+    okHttp3Switch = true
+    // 白名单下的包进行插桩，需要填写要插装类所在的包名，支持前缀配置
+    whiteList = [
+            "com.mogo"
+    ]
+    // 黑名单包下类不进行插桩，可以配置包名和类名，没有可以填空
+    blackList = [
+
+    ]
+}
 
 android.applicationVariants.all { variant ->
     def buildTime = new Date().format("yyyyMMdd", TimeZone.getTimeZone("GMT+08:00"))
diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
index 5b85300f54..850d548990 100644
--- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
+++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java
@@ -36,6 +36,7 @@ import com.mogo.module.share.constant.ShareConstants;
 import com.mogo.module.v2x.V2XConst;
 import com.mogo.service.IMogoServiceApis;
 import com.mogo.service.cloud.socket.IMogoLifecycleListener;
+import com.mogo.test.crashreport.CrashReportConstants;
 import com.mogo.test.crashreport.upgrade.UpgradeReportConstants;
 import com.zhidao.boot.persistent.lib.PersistentManager;
 import com.zhidao.support.obu.ami.AmiClientManager;
@@ -283,8 +284,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication {
 
         // 初始化 bugly 升级
         MogoModulePaths.addBaseModule(new MogoModule(UpgradeReportConstants.PATH, UpgradeReportConstants.NAME));
-        // 初始化 bugly 日志采集
-        //MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME));
+        // 初始化 apm 日志采集
+        MogoModulePaths.addBaseModule(new MogoModule(CrashReportConstants.PATH, CrashReportConstants.NAME));
         if (DebugConfig.isMapBased()) {
             MogoModulePaths.addModule(new MogoModule(CallChatConstant.PROVIDER, CallChatConstant.MODULE_NAME));
         }