Please update project with this pull request, containing changes from all current forks

README_CN.md

@@ -1,5 +1,8 @@
 [English](https://github.com/markzhai/AndroidPerformanceMonitor/blob/master/README.md)
 
+# 修改说明
+本修正版删除了2个不需要的权限WRITE_EXTERNAL_STORAGE & READ_PHONE_STATE
+
 # Android Performance Monitor [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.markzhai/blockcanary-android/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.github.markzhai/blockcanary-android)
 BlockCanary是一个Android平台的一个非侵入式的性能监控组件，应用只需要实现一个抽象类，提供一些该组件需要的上下文环境，就可以在平时使用应用的时候检测主线程上的各种卡慢问题，并通过组件提供的各种信息分析出原因并进行修复。
 

blockcanary-analyzer/build.gradle

@@ -3,7 +3,6 @@ apply from: 'gradle-mvn-push.gradle'
 
 android {
     compileSdkVersion LIBRARY_COMPILE_SDK_VERSION
-    buildToolsVersion LIBRARY_BUILD_TOOLS_VERSION
 
     defaultConfig {
         minSdkVersion LIBRARY_MIN_SDK_VERSION
@@ -14,11 +13,14 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        checkAllWarnings true
+    }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
 }

blockcanary-analyzer/src/main/AndroidManifest.xml

@@ -3,8 +3,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- To store the heap dumps and leak analysis results. -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="18" />
+    <uses-permission
+        android:name="android.permission.READ_PHONE_STATE"
+        android:maxSdkVersion="18" />
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application/>
 

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/AbstractSampler.java

@@ -27,7 +27,7 @@ abstract class AbstractSampler {
     protected AtomicBoolean mShouldSample = new AtomicBoolean(false);
     protected long mSampleInterval;
 
-    private Runnable mRunnable = new Runnable() {
+    private final Runnable mRunnable = new Runnable() {
         @Override
         public void run() {
             doSample();
@@ -40,7 +40,7 @@ public void run() {
     };
 
     public AbstractSampler(long sampleInterval) {
-        if (0 == sampleInterval) {
+        if ( sampleInterval <= 0 ) {
             sampleInterval = DEFAULT_SAMPLE_INTERVAL;
         }
         mSampleInterval = sampleInterval;
@@ -53,8 +53,7 @@ public void start() {
         mShouldSample.set(true);
 
         HandlerThreadFactory.getTimerThreadHandler().removeCallbacks(mRunnable);
-        HandlerThreadFactory.getTimerThreadHandler().postDelayed(mRunnable,
-                BlockCanaryInternals.getInstance().getSampleDelay());
+        HandlerThreadFactory.getTimerThreadHandler().postDelayed(mRunnable, BlockCanaryInternals.getInstance().getSampleDelay());
     }
 
     public void stop() {

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/BlockCanaryInternals.java

@@ -15,6 +15,7 @@
  */
 package com.github.moduth.blockcanary;
 
+import android.os.Build;
 import android.os.Environment;
 import android.os.Looper;
 
@@ -35,13 +36,11 @@ public final class BlockCanaryInternals {
     private static BlockCanaryInternals sInstance;
     private static BlockCanaryContext sContext;
 
-    private List<BlockInterceptor> mInterceptorChain = new LinkedList<>();
+    private final List<BlockInterceptor> mInterceptorChain = new LinkedList<>();
 
     public BlockCanaryInternals() {
 
-        stackSampler = new StackSampler(
-                Looper.getMainLooper().getThread(),
-                sContext.provideDumpInterval());
+        stackSampler = new StackSampler(Looper.getMainLooper().getThread(), sContext.provideDumpInterval());
 
         cpuSampler = new CpuSampler(sContext.provideDumpInterval());
 
@@ -59,6 +58,7 @@ public void onBlockEvent(long realTimeStart, long realTimeEnd,
                             .setCpuBusyFlag(cpuSampler.isCpuBusy(realTimeStart, realTimeEnd))
                             .setRecentCpuRate(cpuSampler.getCpuRateInfo())
                             .setThreadStackEntries(threadStackEntries)
+                            .setStackTraceElements(stackSampler.getTraceElements())
                             .flushString();
                     LogWriter.save(blockInfo.toString());
 
@@ -117,12 +117,18 @@ long getSampleDelay() {
 
     static String getPath() {
         String state = Environment.getExternalStorageState();
-        String logPath = BlockCanaryInternals.getContext()
-                == null ? "" : BlockCanaryInternals.getContext().providePath();
+        String logPath = BlockCanaryInternals.getContext() == null ? "" :
+                BlockCanaryInternals.getContext().providePath();
 
-        if (Environment.MEDIA_MOUNTED.equals(state)
-                && Environment.getExternalStorageDirectory().canWrite()) {
-            return Environment.getExternalStorageDirectory().getPath() + logPath;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            if (Environment.MEDIA_MOUNTED.equals(state) ) {
+                return  BlockCanaryInternals.getContext().provideContext().getExternalFilesDir(logPath).getPath();
+            }
+        }else{
+            if (Environment.MEDIA_MOUNTED.equals(state)
+                    && Environment.getExternalStorageDirectory().canWrite()) {
+                return Environment.getExternalStorageDirectory().getPath() + logPath;
+            }
         }
         return getContext().provideContext().getFilesDir() + BlockCanaryInternals.getContext().providePath();
     }
@@ -145,7 +151,7 @@ public static File[] getLogFiles() {
 
     private static class BlockLogFileFilter implements FilenameFilter {
 
-        private String TYPE = ".log";
+        private final String TYPE = ".log";
 
         BlockLogFileFilter() {
 

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/CpuSampler.java

@@ -15,8 +15,8 @@
  */
 package com.github.moduth.blockcanary;
 
+import android.os.Build;
 import android.util.Log;
-
 import com.github.moduth.blockcanary.internal.BlockInfo;
 
 import java.io.BufferedReader;
@@ -56,8 +56,10 @@ public CpuSampler(long sampleInterval) {
 
     @Override
     public void start() {
-        super.start();
-        reset();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            super.start();
+            reset();
+        }
     }
 
     /**

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/HandlerThreadFactory.java

@@ -20,8 +20,8 @@
 
 final class HandlerThreadFactory {
 
-    private static HandlerThreadWrapper sLoopThread = new HandlerThreadWrapper("loop");
-    private static HandlerThreadWrapper sWriteLogThread = new HandlerThreadWrapper("writer");
+    private static final HandlerThreadWrapper sLoopThread = new HandlerThreadWrapper("loop");
+    private static final HandlerThreadWrapper sWriteLogThread = new HandlerThreadWrapper("writer");
 
     private HandlerThreadFactory() {
         throw new InstantiationError("Must not instantiate this class");
@@ -36,7 +36,7 @@ public static Handler getWriteLogThreadHandler() {
     }
 
     private static class HandlerThreadWrapper {
-        private Handler handler = null;
+        private final Handler handler;
 
         public HandlerThreadWrapper(String threadName) {
             HandlerThread handlerThread = new HandlerThread("BlockCanary-" + threadName);

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/LooperMonitor.java

@@ -21,12 +21,10 @@
 
 class LooperMonitor implements Printer {
 
-    private static final int DEFAULT_BLOCK_THRESHOLD_MILLIS = 3000;
-
-    private long mBlockThresholdMillis = DEFAULT_BLOCK_THRESHOLD_MILLIS;
+    private long mBlockThresholdMillis;
     private long mStartTimestamp = 0;
     private long mStartThreadTimestamp = 0;
-    private BlockListener mBlockListener = null;
+    private BlockListener mBlockListener;
     private boolean mPrintingStarted = false;
     private final boolean mStopWhenDebugging;
 
@@ -83,21 +81,21 @@ public void run() {
     }
 
     private void startDump() {
-        if (null != BlockCanaryInternals.getInstance().stackSampler) {
+        if (BlockCanaryInternals.getInstance().stackSampler != null) {
             BlockCanaryInternals.getInstance().stackSampler.start();
         }
 
-        if (null != BlockCanaryInternals.getInstance().cpuSampler) {
+        if (BlockCanaryInternals.getInstance().cpuSampler != null) {
             BlockCanaryInternals.getInstance().cpuSampler.start();
         }
     }
 
     private void stopDump() {
-        if (null != BlockCanaryInternals.getInstance().stackSampler) {
+        if (BlockCanaryInternals.getInstance().stackSampler != null) {
             BlockCanaryInternals.getInstance().stackSampler.stop();
         }
 
-        if (null != BlockCanaryInternals.getInstance().cpuSampler) {
+        if (BlockCanaryInternals.getInstance().cpuSampler != null) {
             BlockCanaryInternals.getInstance().cpuSampler.stop();
         }
     }

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/StackSampler.java

@@ -28,8 +28,16 @@ class StackSampler extends AbstractSampler {
     private static final int DEFAULT_MAX_ENTRY_COUNT = 100;
     private static final LinkedHashMap<Long, String> sStackMap = new LinkedHashMap<>();
 
-    private int mMaxEntryCount = DEFAULT_MAX_ENTRY_COUNT;
-    private Thread mCurrentThread;
+    private final int mMaxEntryCount;
+    private final Thread mCurrentThread;
+
+    public  StackTraceElement[] getTraceElements() {
+        synchronized (sStackMap) {
+            return traceElements;
+        }
+    }
+
+    private static  StackTraceElement[] traceElements;
 
     public StackSampler(Thread thread, long sampleIntervalMillis) {
         this(thread, DEFAULT_MAX_ENTRY_COUNT, sampleIntervalMillis);
@@ -59,8 +67,8 @@ public ArrayList<String> getThreadStackEntries(long startTime, long endTime) {
     @Override
     protected void doSample() {
         StringBuilder stringBuilder = new StringBuilder();
-
-        for (StackTraceElement stackTraceElement : mCurrentThread.getStackTrace()) {
+        traceElements = mCurrentThread.getStackTrace();
+        for (StackTraceElement stackTraceElement : traceElements) {
             stringBuilder
                     .append(stackTraceElement.toString())
                     .append(BlockInfo.SEPARATOR);

blockcanary-analyzer/src/main/java/com/github/moduth/blockcanary/internal/BlockInfo.java

@@ -19,7 +19,7 @@
 import android.content.pm.PackageInfo;
 import android.os.Build;
 import android.os.Build.VERSION;
-import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.github.moduth.blockcanary.BlockCanaryInternals;
@@ -46,7 +46,6 @@ public class BlockInfo {
     public static final String KEY_QUA = "qua";
     public static final String KEY_MODEL = "model";
     public static final String KEY_API = "api-level";
-    public static final String KEY_IMEI = "imei";
     public static final String KEY_UID = "uid";
     public static final String KEY_CPU_CORE = "cpu-core";
     public static final String KEY_CPU_BUSY = "cpu-busy";
@@ -63,20 +62,14 @@ public class BlockInfo {
     public static final String KEY_TOTAL_MEMORY = "totalMemory";
     public static final String KEY_FREE_MEMORY = "freeMemory";
 
-    public static String sQualifier;
-    public static String sModel;
-    public static String sApiLevel = "";
-    /**
-     * The International Mobile Equipment Identity or IMEI /aɪˈmiː/ is a number,
-     * usually unique, to identify 3GPP and iDEN mobile phones
-     */
-    public static String sImei = "";
-    public static int sCpuCoreNum = -1;
+    public static final String sQualifier;
+    public static final String sModel;
+    public static final String sApiLevel;
+    public static final int sCpuCoreNum;
 
     public String qualifier;
     public String model;
     public String apiLevel = "";
-    public String imei = "";
     public int cpuCoreNum = -1;
 
     // Per Block Info fields
@@ -94,28 +87,18 @@ public class BlockInfo {
     public boolean cpuBusy;
     public String cpuRateInfo;
     public ArrayList<String> threadStackEntries = new ArrayList<>();
+    public StackTraceElement[] stackTraceElements ;
 
-    private StringBuilder basicSb = new StringBuilder();
-    private StringBuilder cpuSb = new StringBuilder();
-    private StringBuilder timeSb = new StringBuilder();
-    private StringBuilder stackSb = new StringBuilder();
-    private static final String EMPTY_IMEI = "empty_imei";
+    private final StringBuilder basicSb = new StringBuilder();
+    private final StringBuilder cpuSb = new StringBuilder();
+    private final StringBuilder timeSb = new StringBuilder();
+    private final StringBuilder stackSb = new StringBuilder();
 
     static {
         sCpuCoreNum = PerformanceUtils.getNumCores();
         sModel = Build.MODEL;
         sApiLevel = Build.VERSION.SDK_INT + " " + VERSION.RELEASE;
         sQualifier = BlockCanaryInternals.getContext().provideQualifier();
-        try {
-            TelephonyManager telephonyManager = (TelephonyManager) BlockCanaryInternals
-                    .getContext()
-                    .provideContext()
-                    .getSystemService(Context.TELEPHONY_SERVICE);
-            sImei = telephonyManager.getDeviceId();
-        } catch (Exception exception) {
-            Log.e(TAG, NEW_INSTANCE_METHOD, exception);
-            sImei = EMPTY_IMEI;
-        }
     }
 
     public BlockInfo() {
@@ -124,7 +107,7 @@ public BlockInfo() {
     public static BlockInfo newInstance() {
         BlockInfo blockInfo = new BlockInfo();
         Context context = BlockCanaryInternals.getContext().provideContext();
-        if (blockInfo.versionName == null || blockInfo.versionName.length() == 0) {
+        if (TextUtils.isEmpty(blockInfo.versionName)) {
             try {
                 PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
                 blockInfo.versionCode = info.versionCode;
@@ -138,7 +121,6 @@ public static BlockInfo newInstance() {
         blockInfo.model = sModel;
         blockInfo.apiLevel = sApiLevel;
         blockInfo.qualifier = sQualifier;
-        blockInfo.imei = sImei;
         blockInfo.uid = BlockCanaryInternals.getContext().provideUid();
         blockInfo.processName = ProcessUtils.myProcessName();
         blockInfo.network = BlockCanaryInternals.getContext().provideNetworkType();
@@ -163,6 +145,11 @@ public BlockInfo setThreadStackEntries(ArrayList<String> threadStackEntries) {
         return this;
     }
 
+    public BlockInfo setStackTraceElements(StackTraceElement[] stackTraceElements) {
+        this.stackTraceElements = stackTraceElements;
+        return this;
+    }
+
     public BlockInfo setMainThreadTimeCost(long realTimeStart, long realTimeEnd, long threadTimeStart, long threadTimeEnd) {
         timeCost = realTimeEnd - realTimeStart;
         threadTimeCost = threadTimeEnd - threadTimeStart;
@@ -176,7 +163,6 @@ public BlockInfo flushString() {
         basicSb.append(KEY_QUA).append(KV).append(qualifier).append(separator);
         basicSb.append(KEY_VERSION_NAME).append(KV).append(versionName).append(separator);
         basicSb.append(KEY_VERSION_CODE).append(KV).append(versionCode).append(separator);
-        basicSb.append(KEY_IMEI).append(KV).append(imei).append(separator);
         basicSb.append(KEY_UID).append(KV).append(uid).append(separator);
         basicSb.append(KEY_NETWORK).append(KV).append(network).append(separator);
         basicSb.append(KEY_MODEL).append(KV).append(model).append(separator);
@@ -220,4 +206,22 @@ public String getTimeString() {
     public String toString() {
         return String.valueOf(basicSb) + timeSb + cpuSb + stackSb;
     }
+
+    public Exception buildException(){
+        StringBuilder sb = new StringBuilder("threadTimeCost time cost:")
+                .append(threadTimeCost)
+                .append("ms,real time cost:")
+                .append(timeCost)
+                .append("ms");
+        if(timeCost - threadTimeCost > 300){
+            sb.append(",thread waiting a long time!!!");
+        }
+        if(cpuBusy){
+            sb.append(",cpu is busy !!!");
+        }
+        Exception exception = new BlockcanaryException(sb.toString());
+        exception.setStackTrace(stackTraceElements);
+        return exception;
+
+    }
 }