resumeUp[ci skip]

Author: JemyCheung

library/src/main/java/com/qiniu/android/collect/UploadInfoElement.java

@@ -427,6 +427,9 @@ public static class UploadQuality {
         private String log_type;
         private String result;
         private long total_elapsed_time;
+        /**
+         * 在未实现双活之前总是 = 1;
+         */
         private long requests_counts;
         private long regions_counts;
         private long bytes_sent;
@@ -435,6 +438,7 @@ public static class UploadQuality {
 
         UploadQuality() {
             this.log_type = "quality";
+            this.regions_counts = 1L;
         }
 
         public void setLog_type(String log_type) {

library/src/main/java/com/qiniu/android/http/ResponseInfo.java

@@ -100,7 +100,6 @@ public final class ResponseInfo {
     public final UpToken upToken;
 
     public final long totalSize;
-    public static long regions_count;
     public static long bytes_sent;
     public static long requests_count;
 
@@ -159,7 +158,7 @@ public String toRecordMsg() {
                             logHandler.send("remote_ip", ip);
                             logHandler.send("port", port);
                             if (upToken.token != "" && upToken.token != null) {
-                                logHandler.send("target_bucket", StringUtils.getScope(upToken.token));
+                                logHandler.send("target_bucket", StringUtils.getBucket(upToken.token));
                             }
                             logHandler.send("bytes_sent", (long) sent);
                             List<InetAddress> resolveResults = DnsPrefetcher.getDnsPrefetcher().getInetAddressByHost(host);

library/src/main/java/com/qiniu/android/storage/ResumeUploader.java

@@ -2,14 +2,17 @@
 
 import com.qiniu.android.collect.LogHandler;
 import com.qiniu.android.collect.UploadInfo;
+import com.qiniu.android.collect.UploadInfoCollector;
 import com.qiniu.android.collect.UploadInfoElement;
 import com.qiniu.android.collect.UploadInfoElementCollector;
 import com.qiniu.android.http.Client;
 import com.qiniu.android.http.CompletionHandler;
+import com.qiniu.android.http.DnsPrefetcher;
 import com.qiniu.android.http.ProgressHandler;
 import com.qiniu.android.http.ResponseInfo;
 import com.qiniu.android.utils.AndroidNetwork;
 import com.qiniu.android.utils.Crc32;
+import com.qiniu.android.utils.Json;
 import com.qiniu.android.utils.StringMap;
 import com.qiniu.android.utils.StringUtils;
 import com.qiniu.android.utils.UrlSafeBase64;
@@ -279,7 +282,34 @@ public void onProgress(long bytesWritten, long totalSize) {
         // 分片上传,七牛响应内容固定,若缺少reqId,可通过响应体判断
         CompletionHandler complete = new CompletionHandler() {
             @Override
-            public void complete(ResponseInfo info, JSONObject response) {
+            public void complete(final ResponseInfo info, JSONObject response) {
+                //分块上传统计，每一片上传后，此处记录
+                final long tid = android.os.Process.myTid();
+                UploadInfoCollector.handleHttp(token,
+                        // 延迟序列化.如果判断不记录,则不执行序列化
+                        new UploadInfoCollector.RecordMsg() {
+                            @Override
+                            public String toRecordMsg() {
+                                //所有请求先记录，无论失败与否
+                                LogHandler logHandler = UploadInfoElementCollector.getUplogHandler(UploadInfo.getBlockInfo());
+                                //current_region_id 双活时upHost对应区域可能变
+                                UpToken.setCurrent_region_id(logHandler, upHost);
+                                //target_region_id
+                                logHandler.send("target_region_id", DnsPrefetcher.target_region_id);
+                                logHandler.send("total_elapsed_time", info.duration);
+                                logHandler.send("bytes_sent", info.sent);
+                                logHandler.send("recovered_from", recover_from);
+                                logHandler.send("file_size", totalSize);
+                                logHandler.send("pid", (long) android.os.Process.myPid());
+                                logHandler.send("tid", tid);
+                                logHandler.send("up_api_version", 1);
+                                logHandler.send("up_time", System.currentTimeMillis() / 1000);
+                                UploadInfoElement.BlockInfo blockInfo = (UploadInfoElement.BlockInfo) logHandler.getUploadInfo();
+                                String upBlock = Json.object2Json(blockInfo);
+                                return upBlock;
+                            }
+                        });
+
                 if (info.isNetworkBroken() && !AndroidNetwork.isNetWorkReady()) {
                     options.netReadyHandler.waitReady();
                     if (!AndroidNetwork.isNetWorkReady()) {

library/src/main/java/com/qiniu/android/storage/ResumeUploaderFast.java

@@ -373,7 +373,6 @@ public void complete(ResponseInfo info, JSONObject response) {
                     retried.addAndGet(1);
                     return;
                 }
-                info.regions_count = retried.get();
                 completionHandler.complete(key, info, response);
             }
         };

library/src/main/java/com/qiniu/android/storage/UploadManager.java

@@ -346,11 +346,9 @@ public String toRecordMsg() {
                                 logHandler.send("result", UploadInfoElement.resultCode(res.statusCode));
                                 logHandler.send("total_elapsed_time", after - before);
                                 logHandler.send("requests_counts", res.requests_count);
-                                logHandler.send("regions_counts", res.regions_count);
                                 logHandler.send("bytes_sent", res.bytes_sent);
 
                                 logHandler.send("up_time", System.currentTimeMillis() / 1000);
-                                ResponseInfo.regions_count = 0L;
                                 ResponseInfo.requests_count = 0L;
                                 ResponseInfo.bytes_sent = 0L;
 

library/src/main/java/com/qiniu/android/utils/StringUtils.java

@@ -199,7 +199,7 @@ public static String getAkAndScope(String token) {
         return null;
     }
 
-    public static String getScope(String token) {
+    public static String getBucket(String token) {
         String[] strings = token.split(":");
         String policy = null;
         try {