You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2019/03/20 06:41:44 UTC

[incubator-weex] branch master updated: [Android] check dup exception report for every instance (#2226)

This is an automated email from the ASF dual-hosted git repository.

kyork pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-weex.git


The following commit(s) were added to refs/heads/master by this push:
     new e6d373d  [Android] check dup exception report for every instance (#2226)
e6d373d is described below

commit e6d373dabf032eff8fbe0555800f8d58ef3b7ea0
Author: chen <lu...@users.noreply.github.com>
AuthorDate: Wed Mar 20 14:41:40 2019 +0800

    [Android] check dup exception report for every instance (#2226)
    
    [Android] add IConfigAdapter && check repeat report
---
 .../main/java/com/taobao/weex/WXSDKManager.java    | 10 ++++
 .../com/taobao/weex/adapter/IWXConfigAdapter.java  |  9 ++++
 .../com/taobao/weex/bridge/WXBridgeManager.java    |  9 +++-
 .../com/taobao/weex/performance/WXInstanceApm.java |  5 ++
 .../com/taobao/weex/utils/WXExceptionUtils.java    | 63 ++++++++++++++++++++++
 5 files changed, 95 insertions(+), 1 deletion(-)

diff --git a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
index afd2a4c..0bde6c8 100644
--- a/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/WXSDKManager.java
@@ -26,6 +26,7 @@ import android.text.TextUtils;
 import com.taobao.weex.adapter.ClassLoaderAdapter;
 import com.taobao.weex.adapter.DefaultUriAdapter;
 import com.taobao.weex.adapter.DefaultWXHttpAdapter;
+import com.taobao.weex.adapter.IWXConfigAdapter;
 import com.taobao.weex.adapter.ICrashInfoReporter;
 import com.taobao.weex.adapter.IDrawableLoader;
 import com.taobao.weex.adapter.IWXJscProcessManager;
@@ -90,6 +91,7 @@ public class WXSDKManager {
 
   private IWXJSExceptionAdapter mIWXJSExceptionAdapter;
 
+  private IWXConfigAdapter mConfigAdapter;
   private IWXStorageAdapter mIWXStorageAdapter;
   private IWXStatisticsListener mStatisticsListener;
   private URIAdapter mURIAdapter;
@@ -218,6 +220,14 @@ public class WXSDKManager {
     return mWXWorkThreadManager;
   }
 
+  public void setWxConfigAdapter(IWXConfigAdapter mConfigAdapter) {
+    this.mConfigAdapter = mConfigAdapter;
+  }
+
+  public IWXConfigAdapter getWxConfigAdapter() {
+    return mConfigAdapter;
+  }
+
   public @Nullable WXSDKInstance getSDKInstance(String instanceId) {
     return instanceId == null? null : mWXRenderManager.getWXSDKInstance(instanceId);
   }
diff --git a/android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java
new file mode 100644
index 0000000..7897352
--- /dev/null
+++ b/android/sdk/src/main/java/com/taobao/weex/adapter/IWXConfigAdapter.java
@@ -0,0 +1,9 @@
+package com.taobao.weex.adapter;
+
+/**
+ * @author zhongcang
+ * @date 2019/3/20
+ */
+public interface IWXConfigAdapter {
+    String getConfig(String nameSpace,String key,String defaultValue);
+}
diff --git a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
index d143d95..9e6d63f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
+++ b/android/sdk/src/main/java/com/taobao/weex/bridge/WXBridgeManager.java
@@ -1469,7 +1469,14 @@ public class WXBridgeManager implements Callback, BactchExecutor {
             } else {
               options.put(BUNDLE_TYPE, "Others");
             }
-            instance.getApmForInstance().addProperty(WXInstanceApm.KEY_PAGE_PROPERTIES_BUNDLE_TYPE, options.get(BUNDLE_TYPE));
+            Object recordBundleType = options.get(BUNDLE_TYPE);
+            if (recordBundleType instanceof String && "Others".equalsIgnoreCase((String)recordBundleType)){
+              //same as iOS record
+              recordBundleType = "other";
+            }
+            if (null != recordBundleType){
+              instance.getApmForInstance().addProperty(WXInstanceApm.KEY_PAGE_PROPERTIES_BUNDLE_TYPE, recordBundleType);
+            }
           }
           if (options.get("env") == null) {
             options.put("env", mInitParams.toMap());
diff --git a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
index 4cb4f8a..6d880bf 100644
--- a/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
+++ b/android/sdk/src/main/java/com/taobao/weex/performance/WXInstanceApm.java
@@ -20,7 +20,9 @@ package com.taobao.weex.performance;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 import android.graphics.Rect;
 import android.os.Handler;
@@ -133,6 +135,8 @@ public class WXInstanceApm {
     public boolean hasAddView;
     private Handler mUIHandler;
 
+    public Set<String> exceptionRecord = new CopyOnWriteArraySet<String>();
+
     /**
      * send performance value to js
      **/
@@ -302,6 +306,7 @@ public class WXInstanceApm {
         if (null == apmInstance || mEnd) {
             return;
         }
+        exceptionRecord.clear();
         mUIHandler.removeCallbacks(jsPerformanceCallBack);
         onStage(KEY_PAGE_STAGES_DESTROY);
         apmInstance.onEnd();
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
index 074e205..afeadec 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/WXExceptionUtils.java
@@ -25,14 +25,18 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import com.taobao.weex.WXEnvironment;
 import com.taobao.weex.WXSDKInstance;
 import com.taobao.weex.WXSDKManager;
+import com.taobao.weex.adapter.IWXConfigAdapter;
 import com.taobao.weex.adapter.IWXJSExceptionAdapter;
 import com.taobao.weex.common.WXErrorCode;
+import com.taobao.weex.common.WXErrorCode.ErrorGroup;
 import com.taobao.weex.common.WXJSExceptionInfo;
 import com.taobao.weex.common.WXPerformance;
 import com.taobao.weex.performance.WXAnalyzerDataTransfer;
@@ -44,11 +48,50 @@ import com.taobao.weex.performance.WXInstanceApm;
 
 public class WXExceptionUtils {
 
+    private static Set<String> sGlobalExceptionRecord = new CopyOnWriteArraySet<String>();
+
 	/**
 	 * degradeUrl for degrade case
 	 */
 	public static String degradeUrl = "BundleUrlDefaultDegradeUrl";
 
+	private static boolean checkNeedReportCauseRepeat(String instanceId,WXErrorCode errCode,String exception){
+
+	    if (TextUtils.isEmpty(exception)){
+	        return true;
+        }
+
+        if (null != errCode && errCode.getErrorGroup() != ErrorGroup.JS){
+	        return true;
+        }
+
+        if (TextUtils.isEmpty(instanceId)){
+            instanceId = "instanceIdNull";
+        }
+
+        String targetException = exception.length() > 200 ?exception.substring(0,200) : exception;
+        Set<String> recordExceptionHistory= null;
+
+        WXSDKInstance instance =  WXSDKManager.getInstance().getAllInstanceMap().get(instanceId);
+        if (null == instance){
+            recordExceptionHistory = sGlobalExceptionRecord;
+        }else {
+            recordExceptionHistory =  instance.getApmForInstance().exceptionRecord;
+        }
+
+        if (null == recordExceptionHistory){
+            return true;
+        }
+
+        if (recordExceptionHistory.contains(targetException)){
+            return false;
+        }
+        recordExceptionHistory.add(targetException);
+        return true;
+    }
+
+
+
 
 	/**
 	 * commitCriticalExceptionRT eg:JsRuntime Exception or JsFramework Init Exception
@@ -63,6 +106,26 @@ public class WXExceptionUtils {
 												 @Nullable final String function,
 												 @Nullable final String exception,
 												 @Nullable final Map<String,String> extParams ) {
+
+        try {
+            IWXConfigAdapter configAdapter = WXSDKManager.getInstance().getWxConfigAdapter();
+            boolean doCheck = true;
+            if (null != configAdapter){
+                String value = configAdapter.getConfig("wxapm","check_repeat_report","true");
+                doCheck = "true".equalsIgnoreCase(value);
+            }
+            boolean doReport =true;
+            if (doCheck){
+                doReport = checkNeedReportCauseRepeat(instanceId,errCode,exception);
+            }
+            if (!doReport){
+                return;
+            }
+        }catch (Throwable e){
+            e.printStackTrace();
+        }
+
+
 		commitCriticalExceptionWithDefaultUrl(
 		    "BundleUrlDefault",
             instanceId,