Tencent · BelongsH · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022 · Jul 26, 2022
diff --git a/README.md b/README.md
@@ -1,25 +1,27 @@
 ![Matrix-icon](assets/img/readme/header.png)
 [![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)
-[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-2.0.5-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-2.1.0-red.svg)](https://github.com/Tencent/matrix/wiki)
 [![CircleCI](https://circleci.com/gh/Tencent/matrix.svg?style=shield)](https://app.circleci.com/pipelines/github/Tencent/matrix)
 
 (中文版本请参看[这里](#matrix_cn))  
 
 [Matrix for iOS/macOS 中文版](#matrix_ios_cn)  
 [Matrix for android 中文版](#matrix_android_cn)   
 [Matrix for iOS/macOS](#matrix_ios_en)   
-[Matrix for android ](#matrix_android_en)   
+[Matrix for android](#matrix_android_en)   
 
 **Matrix** is an APM (Application Performance Manage) used in Wechat to monitor, locate and analyse performance problems. It is a **plugin style**, **non-invasive** solution and is currently available on iOS, macOS and Android.
 
 # <a name='matrix_ios_en'> Matrix for iOS/macOS </a>
 
-The monitoring scope of the current tool includes: crash, lag, and out-of-memory, which includes the following two plugins:
+The monitoring scope of the current tool includes: crash, lag, and memory, which includes the following three plugins:
 
 * **WCCrashBlockMonitorPlugin：** Based on [KSCrash](https://github.com/kstenerud/KSCrash) framework, it features cutting-edge lag stack capture capabilities with crash capture.
 
-* **WCMemoryStatPlugin：** A performance-optimized out-of-memory monitoring tool that captures memory allocation and the callstack of an application's out-of-memory event.
+* **WCMemoryStatPlugin：** A memory monitoring tool that captures memory allocation and the callstack of an application's memory event.
+
+* **WCFPSMonitorPlugin：** A fps monitoring tool that captures main thread's callstack while user scrolling.
 
 ## Features
 
@@ -32,18 +34,10 @@ The monitoring scope of the current tool includes: crash, lag, and out-of-memory
 #### WCMemoryStatPlugin
 
 * Live recording every object's creating and the corresponding callstack of its creation, and report it when the application out-of-memory is detected.
-* Use a balanced binary tree to store living objects and a hash table to store the callstack to optimize performance to the extreme
 
 ## Getting Started
 #### Install
 
-* **Install via Cocoapods**
-  1. Install [CocoaPods](https://guides.cocoapods.org/using/getting-started.html);
-  2. Run `pod repo update` to make CocoaPods aware of the latest available `matrix` versions;
-  3. In your Podfile, add `pod 'matrix-wechat'` to your app target, from the command line, run `pod install`;
-  4. Use the .xcworkspace file generated by CocoaPods to work on your project;
-  5. Add `#import <Matrix/Matrix.h>` , then you can use the performance probe tool of WeChat.
-
 * **Install with static framework**
   1. Get source code of Matrix;
   2. Open terminal, execute `make` in the `matrix/matrix-iOS` directory to compile and generate static library. After compiling, the iOS platform library is in the `matrix/matrix-iOS/build_ios` directory, and the macOS platform library is in the `matrix/matrix-iOS/build_macos` directory.
@@ -73,15 +67,16 @@ WCCrashBlockMonitorPlugin *crashBlockPlugin = [[WCCrashBlockMonitorPlugin alloc]
 [curBuilder addPlugin:crashBlockPlugin]; // add lag and crash monitor.
 
 WCMemoryStatPlugin *memoryStatPlugin = [[WCMemoryStatPlugin alloc] init];
-[curBuilder addPlugin:memoryStatPlugin]; // add out-of-memory monitor.
+[curBuilder addPlugin:memoryStatPlugin]; // add memory monitor.
+
+WCFPSMonitorPlugin *fpsMonitorPlugin = [[WCFPSMonitorPlugin alloc] init];
+[curBuilder addPlugin:fpsMonitorPlugin]; // add fps monitor.
 
 [matrix addMatrixBuilder:curBuilder];
 
 [crashBlockPlugin start]; // start the lag and crash monitor.
-// [memoryStatPlugin start];  
-// start out-of-memory monitor
-// Be careful, WCMemoryStatPlugin has a large performance loss after it is turned on. It is recommended to turn it on as needed.
-
+[memoryStatPlugin start]; // start memory monitor
+[fpsMonitorPlugin start]; // start fps monitor
 ```
 
 #### Receive callbacks to obtain monitoring data
@@ -109,7 +104,7 @@ Each plugin added to `MatrixBuilder` will call back the corresponding event via
 
 ## Tutorials
 
-At this point, Matrix has been integrated into the app and is beginning to collect crash, lag, and out-of-memory data. If you still have questions, check out the example: `samples/sample-apple/MatrixDemo`.
+At this point, Matrix has been integrated into the app and is beginning to collect crash, lag, and memory data. If you still have questions, check out the example: `samples/sample-iOS/MatrixDemo`.
 
 
 
@@ -220,7 +215,7 @@ At this point, Matrix has been integrated into the app and is beginning to colle
 
 1. Configure `MATRIX_VERSION` in gradle.properties.
 ``` gradle
-  MATRIX_VERSION=2.0.5
+  MATRIX_VERSION=2.1.0
 ```
 
 2. Add `matrix-gradle-plugin` in your build.gradle:
@@ -369,11 +364,11 @@ Then other components in Matrix could use Quikcen Backtrace to unwind stacktrace
 
 #### APK Checker Usage
 
-APK Checker can run independently in Jar ([matrix-apk-canary-2.0.5.jar](https://repo.maven.apache.org/maven2/com/tencent/matrix/matrix-apk-canary/2.0.5/matrix-apk-canary-2.0.5.jar)）  mode, usage:
+APK Checker can run independently in Jar ([matrix-apk-canary-2.1.0.jar](https://repo.maven.apache.org/maven2/com/tencent/matrix/matrix-apk-canary/2.1.0/matrix-apk-canary-2.1.0.jar)）  mode, usage:
 
 
 ```shell
-java -jar matrix-apk-canary-2.0.5.jar
+java -jar matrix-apk-canary-2.1.0.jar
 Usages: 
     --config CONFIG-FILE-PATH
 or
@@ -432,18 +427,20 @@ Matrix is under the BSD license. See the [LICENSE](https://github.com/Tencent/Ma
 
 # <a name="matrix_cn">Matrix</a>
 ![Matrix-icon](assets/img/readme/header.png)
-[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-2.0.5-red.svg)](https://github.com/Tencent/matrix/wiki)
+[![license](http://img.shields.io/badge/license-BSD3-brightgreen.svg?style=flat)](https://github.com/Tencent/matrix/blob/master/LICENSE)[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/Tencent/matrix/pulls)  [![WeChat Approved](https://img.shields.io/badge/Wechat%20Approved-2.1.0-red.svg)](https://github.com/Tencent/matrix/wiki)
 
 **Matrix** 是一款微信研发并日常使用的应用性能接入框架，支持iOS, macOS和Android。
 Matrix 通过接入各种性能监控方案，对性能监控项的异常数据进行采集和分析，输出相应的问题分析、定位与优化建议，从而帮助开发者开发出更高质量的应用。
 
 # <a name='matrix_ios_cn'>Matrix for iOS/macOS </a>
 
-当前工具监控范围包括：崩溃、卡顿和爆内存，包含以下两款插件：
+Matrix-iOS 当前工具监控范围包括：崩溃、卡顿和内存，包含以下三款插件：
+
+* **WCCrashBlockMonitorPlugin：** 基于 [KSCrash](https://github.com/kstenerud/KSCrash) 框架开发，具有业界领先的卡顿堆栈捕获能力，同时兼备崩溃捕获能力
 
-* **WCCrashBlockMonitorPlugin：** 基于 [KSCrash](https://github.com/kstenerud/KSCrash) 框架开发，具有业界领先的卡顿堆栈捕获能力，同时兼备崩溃捕获能力。
+* **WCMemoryStatPlugin：** 一款性能极致的内存监控工具，能够全面捕获应用 OOM 时的内存分配以及调用堆栈情况
 
-* **WCMemoryStatPlugin：** 一款性能优化到极致的爆内存监控工具，能够全面捕获应用爆内存时的内存分配以及调用堆栈情况。
+* **WCFPSMonitorPlugin：** 一款 FPS 监控工具，当用户滑动界面时，记录主线程调用栈
 
 ## 特性
 
@@ -455,18 +452,11 @@ Matrix 通过接入各种性能监控方案，对性能监控项的异常数据
 
 #### WCMemoryStatPlugin
 
-* 在应用运行期间获取对象存活以及相应的堆栈信息，在检测到应用爆内存时进行上报
-* 使用平衡二叉树存储存活对象，使用 Hash Table 存储堆栈，将性能优化到极致
+* 在应用运行期间获取对象存活以及相应的堆栈信息，在检测到应用 OOM 时进行上报
 
 ## 使用方法
 
 #### 安装
-* **通过 Cocoapods 安装**
-  1. 先安装 [CocoaPods](https://guides.cocoapods.org/using/getting-started.html)；
-  2. 通过 pod repo update 更新 matrix 的 Cocoapods 版本；
-  3. 在 Podfile 对应的 target 中，添加 pod 'matrix-wechat'，并执行 pod install；
-  4. 在项目中使用 Cocoapods 生成的 .xcworkspace运行工程；
-  5. 在你的代码文件头引入头文件 #import <Matrix/Matrix.h>，就可以接入微信的性能探针工具了！
 
 * **通过静态库安装**
   1. 获取 Matrix 源码；
@@ -499,13 +489,15 @@ WCCrashBlockMonitorPlugin *crashBlockPlugin = [[WCCrashBlockMonitorPlugin alloc]
 
 WCMemoryStatPlugin *memoryStatPlugin = [[WCMemoryStatPlugin alloc] init];
 [curBuilder addPlugin:memoryStatPlugin]; // 添加内存监控功能
+
+WCFPSMonitorPlugin *fpsMonitorPlugin = [[WCFPSMonitorPlugin alloc] init];
+[curBuilder addPlugin:fpsMonitorPlugin]; // 添加 fps 监控功能
 
 [matrix addMatrixBuilder:curBuilder];
 
 [crashBlockPlugin start]; // 开启卡顿和崩溃监控
-// [memoryStatPlugin start]; 
-// 开启内存监控，注意 memoryStatPlugin 开启之后对性能损耗较大，建议按需开启
-
+[memoryStatPlugin start]; // 开启内存监控
+[fpsMonitorPlugin start]; // 开启 fps 监控
 ```
 
 #### 接收回调获得监控数据
@@ -533,7 +525,7 @@ curBuilder.pluginListener = <一个遵循 MatrixPluginListenerDelegate 的对象
 
 ## Demo
 
-至此，Matrix 已经集成到应用中并且开始收集崩溃、ANR、卡顿和爆内存数据，如仍有疑问，请查看示例：`samples/sample-apple/MatrixDemo`。
+至此，Matrix 已经集成到应用中并且开始收集崩溃、卡顿和爆内存数据，如仍有疑问，请查看示例：`samples/sample-iOS/MatrixDemo`
 
 
 # <a name='matrix_android_cn'>Matrix for Android </a>
@@ -636,7 +628,7 @@ Matrix-android 当前监控范围包括：应用安装包大小，帧率变化
 
 1. 在你项目根目录下的 gradle.properties 中配置要依赖的 Matrix 版本号，如：
 ``` gradle
-  MATRIX_VERSION=2.0.5
+  MATRIX_VERSION=2.1.0
 ```
 
 2. 在你项目根目录下的 build.gradle 文件添加 Matrix 依赖，如：
@@ -782,10 +774,10 @@ WeChatBacktrace.instance().configure(getApplicationContext()).commit();
 
 #### APK Checker
 
-APK Check 以独立的 jar 包提供 ([matrix-apk-canary-2.0.5.jar](https://repo.maven.apache.org/maven2/com/tencent/matrix/matrix-apk-canary/2.0.5/matrix-apk-canary-2.0.5.jar)），你可以运行：
+APK Check 以独立的 jar 包提供 ([matrix-apk-canary-2.1.0.jar](https://repo.maven.apache.org/maven2/com/tencent/matrix/matrix-apk-canary/2.1.0/matrix-apk-canary-2.1.0.jar)），你可以运行：
 
 ```cmd
-java -jar matrix-apk-canary-2.0.5.jar
+java -jar matrix-apk-canary-2.1.0.jar
 ```
 
 查看 Usages 来使用它。
@@ -846,3 +838,12 @@ Options:
 # License
 
 Matrix is under the BSD license. See the [LICENSE](https://github.com/Tencent/Matrix/blob/master/LICENSE) file for details
+
+# 信息公示
+
+- SDK名称：Matrix
+- 版本号：2.1.0
+- 开发者：深圳市腾讯计算机系统有限公司
+- 主要功能：Matrix是微信研发并日常使用的应用性能监控工具，支持iOS、macOS和Android。Matrix通过接入闪退、卡顿、耗电、内存等方面的监控方案，对性能监控项的异常数据进行采集和分析，输出相应的问题分析、定位与优化建议，从而帮助开发者开发出更高质量的应用。
+- [Matrix SDK使用说明](https://github.com/Tencent/matrix)
+- [Matrix SDK个人信息保护规则](https://support.weixin.qq.com/cgi-bin/mmsupportacctnodeweb-bin/pages/yTezupX6yF028Mpf)
diff --git a/matrix/matrix-android/.gitignore b/matrix/matrix-android/.gitignore
@@ -8,4 +8,5 @@
 .idea/
 **/.*
 **/bin/
-/gradle/oss-android-template.gradle
+/gradle/oss-android-template.gradle
+local.gradle
diff --git a/matrix/matrix-android/build.gradle b/matrix/matrix-android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
 
-    gradle.ext.KOTLIN_VERSION = "1.3.72"
+    gradle.ext.KOTLIN_VERSION = "1.4.32"
 
     dependencies {
         // classpath
@@ -52,7 +52,7 @@ ext {
     // For android sub-projects
     minSdkVersion = 19
     targetSdkVersion = 29
-    compileSdkVersion = 29
+    compileSdkVersion = 31
     buildToolsVersion = '29.0.2'
 
     MIN_SDK_VERSION_FOR_HOOK = 21
@@ -86,6 +86,8 @@ ext {
 
     ABI_FILTERS = ['armeabi-v7a', 'arm64-v8a']
     LOGGER_VERSION = 1.1 // fixme logger
+
+    LIFECYCLE_VERSION = '2.3.1'
 }
 
 // Build sample project

diff --git a/matrix/matrix-android/gradle.properties b/matrix/matrix-android/gradle.properties
@@ -14,7 +14,7 @@ org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryErro
 # org.gradle.parallel=true
 #Tue Jun 20 10:24:33 CST 2017
 
-VERSION_NAME_PREFIX=2.0.5
+VERSION_NAME_PREFIX=2.1.0
 VERSION_NAME_SUFFIX=
 ## two options: Internal (for wechat),  External (for public repo)
 PUBLISH_CHANNEL=Internal

diff --git a/matrix/matrix-android/gradle/android-publish-private.gradle b/matrix/matrix-android/gradle/android-publish-private.gradle
@@ -206,4 +206,19 @@ task buildAndPublishRepo(type: Copy, dependsOn: ['build', 'publish']) {
     }
 }
 
+task publishRepo(type: Copy, dependsOn: ['publish']) {
+    group = "publishing"
+
+    // save artifacts files to artifacts folder
+    from configurations.archives.allArtifacts.files
+    into "${rootProject.buildDir}/outputs/artifacts/"
+    rename { String fileName ->
+        fileName.replace("release.aar", "${version}.aar")
+    }
+
+    doLast {
+        println "* published to repo: ${project.group}:${project.name}:${project.version}"
+    }
+}
+
 apply from: rootProject.file('gradle/check.gradle')
diff --git a/matrix/matrix-android/gradle/java-publish-private.gradle b/matrix/matrix-android/gradle/java-publish-private.gradle
@@ -143,4 +143,19 @@ task buildAndPublishRepo(type: Copy, dependsOn: ['build', 'publish']) {
     }
 }
 
+task publishRepo(type: Copy, dependsOn: ['publish']) {
+    group = "publishing"
+
+    // save artifacts files to artifacts folder
+    from configurations.archives.allArtifacts.files
+    into "${rootProject.buildDir}/outputs/artifacts/"
+    rename { String fileName ->
+        fileName.replace("release.aar", "${version}.aar")
+    }
+
+    doLast {
+        println "* published to repo: ${project.group}:${project.name}:${project.version}"
+    }
+}
+
 apply from: rootProject.file('gradle/check.gradle')
diff --git a/matrix/matrix-android/gradle/java-publish.gradle b/matrix/matrix-android/gradle/java-publish.gradle
@@ -141,7 +141,7 @@ task buildAndPublishToLocalMaven(type: Copy, dependsOn: ['build', 'publishToMave
     }
 }
 
-task buildAndPublishRepo(type: Copy, dependsOn: ['build', 'publish']) {
+task buildAndPublishRepo(type: Copy, dependsOn: ['publish']) {
     group = "publishing"
 
     // save artifacts files to artifacts folder

diff --git a/matrix/matrix-android/matrix-android-commons/CMakeLists.txt b/matrix/matrix-android/matrix-android-commons/CMakeLists.txt
@@ -1,6 +1,11 @@
 cmake_minimum_required(VERSION 3.4.1)
-project(android-commons C)
+project(android-commons)
+
+option(EnableLOG "Enable Logs" ON)
+if(EnableLOG)
+  add_definitions(-DEnableLOG)
+endif()
 
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libsemi_dlfcn)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libenhance_dlsym)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libsemi_dlfcn)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/libxhook)
diff --git a/matrix/matrix-android/matrix-android-commons/build.gradle b/matrix/matrix-android/matrix-android-commons/build.gradle
@@ -19,6 +19,7 @@ android {
         externalNativeBuild {
             cmake {
                 targets = ['xhook', 'semi_dlfcn', 'enhance_dlsym']
+                arguments = ["-DEnableLOG=${gradle.enableLog() ? "ON" : "OFF"}" as String]
             }
             exportHeaders {
                 from('src/main/cpp/libxhook') {

diff --git a/matrix/matrix-android/matrix-android-commons/src/main/AndroidManifest.xml b/matrix/matrix-android/matrix-android-commons/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.tencent.matrix.android.commoms"
+          package="com.tencent.matrix.android.commons"
 >
 
     <application>

diff --git a/matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/CMakeLists.txt b/matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/CMakeLists.txt
@@ -3,17 +3,21 @@ project(libenhance_dlsym CXX)
 
 set(enhance_dlsym_source_dir ${CMAKE_CURRENT_SOURCE_DIR})
 
-set(enhance_dlsym_source
-      ${enhance_dlsym_source_dir}/EnhanceDlsym.cpp)
+set(
+  enhance_dlsym_source
+  ${enhance_dlsym_source_dir}/EnhanceDlsym.cpp
+)
 
 add_library(enhance_dlsym STATIC ${enhance_dlsym_source})
 
+find_library(log-lib log)
+
 target_include_directories(
-      enhance_dlsym
-      PUBLIC ${enhance_dlsym_source_dir}
+  enhance_dlsym
+  PUBLIC ${enhance_dlsym_source_dir}
 )
 
 target_link_libraries(
-      enhance_dlsym
-      PUBLIC ${log-lib}
+  enhance_dlsym
+  PUBLIC ${log-lib}
 )
diff --git a/matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/EnhanceDlsym.cpp b/matrix/matrix-android/matrix-android-commons/src/main/cpp/libenhance_dlsym/EnhanceDlsym.cpp
@@ -32,10 +32,15 @@
 #include <dlfcn.h>
 #include <set>
 #include "EnhanceDlsym.h"
-#include "../../../../../matrix-jectl/src/main/cpp/jectl/JeLog.h"
 
 #define TAG "Matrix.EnhanceDl"
 
+#include <android/log.h>
+
+#define LOGD(TAG, FMT, args...) //__android_log_print(ANDROID_LOG_DEBUG, TAG, FMT, ##args)
+#define LOGI(TAG, FMT, args...) //__android_log_print(ANDROID_LOG_INFO, TAG, FMT, ##args)
+#define LOGE(TAG, FMT, args...) //__android_log_print(ANDROID_LOG_ERROR, TAG, FMT, ##args)
+
 namespace enhance {
 
     static std::set<DlInfo *> m_opened_info;