Merge pull Tencent#844

ifshuaishuai · Sep 28, 2024 · 73ed478 · 73ed478
1 parent 772d9e3
commit 73ed478
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...ndroid/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/compat/AgpCompat.kt b/...ndroid/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/compat/AgpCompat.kt
@@ -40,6 +40,7 @@ class AgpCompat {
         @JvmStatic
         val asmApi: Int
             get() = when {
+                VersionsCompat.greatThanOrEqual(AGPVersion.AGP_7_3_1) -> Opcodes.ASM7
                 VersionsCompat.greatThanOrEqual(AGPVersion.AGP_7_0_0) -> Opcodes.ASM6
                 else -> Opcodes.ASM5
             }

diff --git a/...d/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/compat/VersionsCompat.kt b/...d/matrix-gradle-plugin/src/main/kotlin/com/tencent/matrix/plugin/compat/VersionsCompat.kt
@@ -24,7 +24,8 @@ enum class AGPVersion(
     AGP_3_6_0("3.6.0"),
     AGP_4_0_0("4.0.0"),
     AGP_4_1_0("4.1.0"),
-    AGP_7_0_0("7.0.0")
+    AGP_7_0_0("7.0.0"),
+    AGP_7_3_1("7.3.1")
 }
 
 class VersionsCompat {

diff --git a/...d/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/EvilMethodTracer.java b/...d/matrix-trace-canary/src/main/java/com/tencent/matrix/trace/tracer/EvilMethodTracer.java
@@ -81,10 +81,18 @@ public boolean isValid() {
     @Override
     public void onDispatchBegin(String log) {
         indexRecord = AppMethodBeat.getInstance().maskIndex("EvilMethodTracer#dispatchBegin");
+
+        if (config.isAppMethodBeatEnable()) {
+            AppMethodBeat.i(AppMethodBeat.METHOD_ID_DISPATCH);
+        }
     }
 
     @Override
     public void onDispatchEnd(String log, long beginNs, long endNs) {
+        if (config.isAppMethodBeatEnable()) {
+            AppMethodBeat.o(AppMethodBeat.METHOD_ID_DISPATCH);
+        }
+
         long dispatchCost = (endNs - beginNs) / Constants.TIME_MILLIS_TO_NANO;
         try {
             if (dispatchCost >= evilThresholdMs) {