concurrent resume upload add reporter

XiaopingSun · XiaopingSun · commit ef91cfe9924a · 2019-10-17T17:02:52.000+08:00
diff --git a/QiniuDemo/QiniuDemo.xcodeproj/xcshareddata/xcschemes/QiniuDemo.xcscheme b/QiniuDemo/QiniuDemo.xcodeproj/xcshareddata/xcschemes/QiniuDemo.xcscheme
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1100"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
+               BuildableName = "QiniuDemo.app"
+               BlueprintName = "QiniuDemo"
+               ReferencedContainer = "container:QiniuDemo.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
+            BuildableName = "QiniuDemo.app"
+            BlueprintName = "QiniuDemo"
+            ReferencedContainer = "container:QiniuDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "93D2301E1C86D7F700434F6D"
+            BuildableName = "QiniuDemo.app"
+            BlueprintName = "QiniuDemo"
+            ReferencedContainer = "container:QiniuDemo.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/QiniuSDK.xcodeproj/project.pbxproj b/QiniuSDK.xcodeproj/project.pbxproj
@@ -17,14 +17,9 @@
 		93D01E661C7065C200E7F47C /* QNPHAssetResource.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D01E631C7065C200E7F47C /* QNPHAssetResource.m */; };
 		A31ADA71DBBF1F4D8A065061 /* libPods-QiniuSDK_Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B66D8E78B0B3A0BEEA45A6 /* libPods-QiniuSDK_Mac.a */; };
 		BA8408541BE251010093B013 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BA8408521BE250C80093B013 /* SystemConfiguration.framework */; };
-		CC3F321C22C0CC3700F23681 /* QNReportConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = CC3F321A22C0CC3700F23681 /* QNReportConfig.h */; };
-		CC3F321D22C0CC3700F23681 /* QNReportConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3F321B22C0CC3700F23681 /* QNReportConfig.m */; };
-		CC3F321F22C0CC3700F23681 /* QNReportConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3F321B22C0CC3700F23681 /* QNReportConfig.m */; };
 		CC3F322322C0CCDF00F23681 /* QNUploadInfoReporter.h in Headers */ = {isa = PBXBuildFile; fileRef = CC3F322122C0CCDF00F23681 /* QNUploadInfoReporter.h */; };
 		CC3F322422C0CCDF00F23681 /* QNUploadInfoReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3F322222C0CCDF00F23681 /* QNUploadInfoReporter.m */; };
 		CC3F322622C0CCDF00F23681 /* QNUploadInfoReporter.m in Sources */ = {isa = PBXBuildFile; fileRef = CC3F322222C0CCDF00F23681 /* QNUploadInfoReporter.m */; };
-		CC4B347522C496A800130D51 /* QNReporterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4B347422C496A800130D51 /* QNReporterTest.m */; };
-		CC4B347622C496A800130D51 /* QNReporterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = CC4B347422C496A800130D51 /* QNReporterTest.m */; };
 		CCC3A50822DC10CB00D835B1 /* QNConcurrentResumeUpload.h in Headers */ = {isa = PBXBuildFile; fileRef = CCC3A50622DC10CB00D835B1 /* QNConcurrentResumeUpload.h */; };
 		CCC3A50922DC10CB00D835B1 /* QNConcurrentResumeUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC3A50722DC10CB00D835B1 /* QNConcurrentResumeUpload.m */; };
 		CCC3A50A22DC10CB00D835B1 /* QNConcurrentResumeUpload.m in Sources */ = {isa = PBXBuildFile; fileRef = CCC3A50722DC10CB00D835B1 /* QNConcurrentResumeUpload.m */; };
@@ -152,8 +147,6 @@
 		B62E937FF4E75CDD482C35E8 /* Pods-QiniuSDK_MacTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuSDK_MacTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuSDK_MacTests/Pods-QiniuSDK_MacTests.release.xcconfig"; sourceTree = "<group>"; };
 		BA8408521BE250C80093B013 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
 		C1D8890E270C769A9E798A8E /* libPods-QiniuSDK_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuSDK_iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CC3F321A22C0CC3700F23681 /* QNReportConfig.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNReportConfig.h; sourceTree = "<group>"; };
-		CC3F321B22C0CC3700F23681 /* QNReportConfig.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNReportConfig.m; sourceTree = "<group>"; };
 		CC3F322122C0CCDF00F23681 /* QNUploadInfoReporter.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNUploadInfoReporter.h; sourceTree = "<group>"; };
 		CC3F322222C0CCDF00F23681 /* QNUploadInfoReporter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QNUploadInfoReporter.m; sourceTree = "<group>"; };
 		CCC3A50622DC10CB00D835B1 /* QNConcurrentResumeUpload.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QNConcurrentResumeUpload.h; sourceTree = "<group>"; };
@@ -400,8 +393,6 @@
 				DF609A041A58E39D00AC7297 /* QNFormUpload.m */,
 				DF482FD61B0DA8A2000DAD98 /* QNConfiguration.h */,
 				DF482FD71B0DA8A2000DAD98 /* QNConfiguration.m */,
-				CC3F321A22C0CC3700F23681 /* QNReportConfig.h */,
-				CC3F321B22C0CC3700F23681 /* QNReportConfig.m */,
 				CC3F322122C0CCDF00F23681 /* QNUploadInfoReporter.h */,
 				CC3F322222C0CCDF00F23681 /* QNUploadInfoReporter.m */,
 				DF437CD71B2429E10099587B /* QNUpToken.h */,
@@ -428,7 +419,6 @@
 				DF437CDE1B243A2C0099587B /* QNUpTokenTest.m */,
 				FDEA88651DAC10D000D037E5 /* QNAutoZoneTest.m */,
 				FD4FEE431F298D58003A38B8 /* QNPipelineTest.m */,
-				CC4B347422C496A800130D51 /* QNReporterTest.m */,
 			);
 			path = QiniuSDKTests;
 			sourceTree = SOURCE_ROOT;
@@ -463,7 +453,6 @@
 				FDEA5BFE1F27A21900D9D731 /* QNPipeline.h in Headers */,
 				DFBF63711BCCE2A600A771D8 /* QNSystem.h in Headers */,
 				DFF126F61B63ABED0005C39C /* QNALAssetFile.h in Headers */,
-				CC4B347722C4995100130D51 /* QiniuSDK.h in Headers */,
 				DF437CD21B2426270099587B /* QN_GTM_Base64.h in Headers */,
 				DF293C9E19DBC2AE00799011 /* QNUserAgent.h in Headers */,
 				DF2CDE6719DAC6A400CE01FB /* QNVersion.h in Headers */,
@@ -480,7 +469,6 @@
 				DFF126F11B639F3B0005C39C /* QNFile.h in Headers */,
 				CCF661082355C5120018A41E /* QiniuSDK.h in Headers */,
 				DFA9B63B19DF904000A15FD1 /* QNEtag.h in Headers */,
-				CC3F321C22C0CC3700F23681 /* QNReportConfig.h in Headers */,
 				DF2CDE5C19DAC6A400CE01FB /* QNUrlSafeBase64.h in Headers */,
 				93D01E641C7065C200E7F47C /* QNPHAssetResource.h in Headers */,
 				DFA9B64919E0018800A15FD1 /* QNUploadOption.h in Headers */,
@@ -710,7 +698,6 @@
 			files = (
 				DF2CDE5D19DAC6A400CE01FB /* QNUrlSafeBase64.m in Sources */,
 				DFBF636E1BCCE28300A771D8 /* QNSystem.m in Sources */,
-				CC3F321D22C0CC3700F23681 /* QNReportConfig.m in Sources */,
 				DF0D23CF19DCE6E500D6B68F /* QNResponseInfo.m in Sources */,
 				DFA9B63C19DF904000A15FD1 /* QNEtag.m in Sources */,
 				DF437CD31B2426270099587B /* QN_GTM_Base64.m in Sources */,
@@ -760,7 +747,6 @@
 			files = (
 				DF24DDA11B63FF1800EF57E6 /* QNALAssetFile.m in Sources */,
 				DFBF636F1BCCE28300A771D8 /* QNSystem.m in Sources */,
-				CC3F321F22C0CC3700F23681 /* QNReportConfig.m in Sources */,
 				DF24DDA01B63FF0E00EF57E6 /* QNFile.m in Sources */,
 				DF2CDE5E19DAC6A400CE01FB /* QNUrlSafeBase64.m in Sources */,
 				DF0D23D019DCE6E500D6B68F /* QNResponseInfo.m in Sources */,
diff --git a/QiniuSDK/Http/QNHttpDelegate.h b/QiniuSDK/Http/QNHttpDelegate.h
@@ -6,13 +6,6 @@ typedef void (^QNInternalProgressBlock)(long long totalBytesWritten, long long t
 typedef void (^QNCompleteBlock)(QNResponseInfo *info, NSDictionary *resp);
 typedef BOOL (^QNCancelBlock)(void);
 
-typedef NS_ENUM(NSUInteger, QNUploadRequestType) {
-    RequestType_mkblk,
-    RequestType_bput,
-    RequestType_mkfile,
-    RequestType_form,
-};
-
 /**
  *    Http 客户端接口
  */
diff --git a/QiniuSDK/Http/QNResponseInfo.h b/QiniuSDK/Http/QNResponseInfo.h
@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "QNHttpDelegate.h"
 
 /**
  *    中途取消的状态码
@@ -204,17 +203,4 @@ extern const int kQNFileError;
         withDuration:(double)duration
             withBody:(NSData *)body;
 
-/**
- *    上报信息字符串生成api
- *
- *    @param requestType 请求类型
- *    @param bytesSent  已发送的字节数
- *    @param fileSize   总字节数
- *
- *    @return 上报信息字符串
- */
-- (NSString *)buildUploadInfoWithRequestType:(QNUploadRequestType)requestType
-                                   bytesSent:(UInt32)bytesSent
-                                    fileSize:(UInt32)fileSize;
-
 @end
diff --git a/QiniuSDK/Http/QNResponseInfo.m b/QiniuSDK/Http/QNResponseInfo.m
@@ -207,23 +207,4 @@ - (BOOL)couldRetry {
     return (_statusCode >= 500 && _statusCode < 600 && _statusCode != 579) || _statusCode == kQNNetworkError || _statusCode == 996 || _statusCode == 406 || (_statusCode == 200 && _error != nil) || _statusCode < -1000 || self.isNotQiniu;
 }
 
-- (NSString *)buildUploadInfoWithRequestType:(QNUploadRequestType)requestType bytesSent:(UInt32)bytesSent fileSize:(UInt32)fileSize {
-    
-    NSArray *requestTypeItems = @[@"mkblk", @"bput", @"mkfile", @"form"];
-    NSString *nullString = @"";
-    NSArray *reportItems = @[
-                              [NSString stringWithFormat:@"%d", _statusCode] ? [NSString stringWithFormat:@"%d", _statusCode] : nullString,
-                              _reqId ? _reqId : nullString,
-                              _host ? _host : nullString,
-                              _serverIp ? _serverIp : nullString,
-                              nullString,
-                              [NSString stringWithFormat:@"%.1f", _duration * 1000] ? [NSString stringWithFormat:@"%.1f", _duration * 1000] : nullString,
-                              [NSString stringWithFormat:@"%llu", _timeStamp] ? [NSString stringWithFormat:@"%llu", _timeStamp] : nullString,
-                              [NSString stringWithFormat:@"%d", bytesSent] ? [NSString stringWithFormat:@"%d", bytesSent] : nullString,
-                              requestTypeItems[requestType],
-                              [NSString stringWithFormat:@"%d", fileSize] ? [NSString stringWithFormat:@"%d", fileSize] : nullString
-                              ];
-    return [reportItems componentsJoinedByString:@","];
-}
-
 @end
diff --git a/QiniuSDK/QiniuSDK.h b/QiniuSDK/QiniuSDK.h
@@ -16,4 +16,3 @@
 #import "QNUploadOption.h"
 #import "QNUrlSafeBase64.h"
 #import "QNUploadInfoReporter.h"
-#import "QNReportConfig.h"
diff --git a/QiniuSDK/Storage/QNConcurrentResumeUpload.m b/QiniuSDK/Storage/QNConcurrentResumeUpload.m
@@ -13,6 +13,7 @@
 #import "QNResponseInfo.h"
 #import "QNUrlSafeBase64.h"
 #import "QNCrc32.h"
+#import "QNUploadInfoReporter.h"
 
 @interface QNConcurrentTask: NSObject
 
@@ -325,6 +326,11 @@ - (void)putBlockWithHost:(NSString *)uphost taskQueue:(QNConcurrentTask *)task r
     };
     
     QNCompleteBlock completionHandler = ^(QNResponseInfo *info, NSDictionary *resp) {
+        [UploadInfoReporter recordWithRequestType:ReportType_mkblk
+                                     responseInfo:info
+                                        bytesSent:task.size
+                                         fileSize:self.size
+                                            token:self.token.token];
         if (info.error != nil) {
             if (retried >= self.config.retryMax || !info.couldRetry) {
                 [self invalidateTasksWithErrorInfo:info resp:resp];
@@ -391,6 +397,11 @@ - (void)makeFileWithHost:(NSString *)uphost retriedTimes:(int)retried {
     [postData appendData:[bodyStr dataUsingEncoding:NSUTF8StringEncoding]];
     
     QNCompleteBlock completionHandler = ^(QNResponseInfo *info, NSDictionary *resp) {
+        [UploadInfoReporter recordWithRequestType:ReportType_mkfile
+                                     responseInfo:info
+                                        bytesSent:self.size
+                                         fileSize:self.size
+                                            token:self.token.token];
         if (info.isOK) {
             [self removeRecord];
             self.option.progressHandler(self.key, 1.0);
diff --git a/QiniuSDK/Storage/QNConfiguration.h b/QiniuSDK/Storage/QNConfiguration.h
@@ -7,9 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
 #import "QNRecorderDelegate.h"
-#import "QNReportConfig.h"
 
 /**
  *    断点上传时的分块大小
@@ -27,6 +25,7 @@ typedef NSString * (^QNUrlConvert)(NSString *url);
 
 @class QNConfigurationBuilder;
 @class QNZone;
+@class QNReportConfig;
 /**
  *    Builder block
  *
diff --git a/QiniuSDK/Storage/QNConfiguration.m b/QiniuSDK/Storage/QNConfiguration.m
@@ -11,6 +11,7 @@
 #import "QNSessionManager.h"
 #import "QNSystem.h"
 #import "QNUpToken.h"
+#import "QNUploadInfoReporter.h"
 
 const UInt32 kQNBlockSize = 4 * 1024 * 1024;
 
diff --git a/QiniuSDK/Storage/QNFormUpload.m b/QiniuSDK/Storage/QNFormUpload.m
@@ -82,7 +82,11 @@ - (void)put {
     };
     __block NSString *upHost = [_config.zone up:_token isHttps:_config.useHttps frozenDomain:nil];
     QNCompleteBlock complete = ^(QNResponseInfo *info, NSDictionary *resp) {
-        [UploadInfoReporter recordWithUploadResult:[info buildUploadInfoWithRequestType:RequestType_form bytesSent:(UInt32)_data.length fileSize:(UInt32)_data.length] uploadToken:_token.token];
+        [UploadInfoReporter recordWithRequestType:ReportType_form
+                                     responseInfo:info
+                                        bytesSent:(UInt32)_data.length
+                                         fileSize:(UInt32)_data.length
+                                            token:_token.token];
         if (info.isOK) {
             _option.progressHandler(_key, 1.0);
         }
@@ -99,7 +103,11 @@ - (void)put {
             nextHost = [_config.zone up:_token isHttps:_config.useHttps frozenDomain:nextHost];
         }
         QNCompleteBlock retriedComplete = ^(QNResponseInfo *info, NSDictionary *resp) {
-            [UploadInfoReporter recordWithUploadResult:[info buildUploadInfoWithRequestType:RequestType_form bytesSent:(UInt32)_data.length fileSize:(UInt32)_data.length] uploadToken:_token.token];
+            [UploadInfoReporter recordWithRequestType:ReportType_form
+                                         responseInfo:info
+                                            bytesSent:(UInt32)_data.length
+                                             fileSize:(UInt32)_data.length
+                                                token:_token.token];
             if (info.isOK) {
                 _option.progressHandler(_key, 1.0);
             }
@@ -116,7 +124,11 @@ - (void)put {
                 thirdHost = [_config.zone up:_token isHttps:_config.useHttps frozenDomain:nextHost];
             }
             QNCompleteBlock thirdComplete = ^(QNResponseInfo *info, NSDictionary *resp) {
-                [UploadInfoReporter recordWithUploadResult:[info buildUploadInfoWithRequestType:RequestType_form bytesSent:(UInt32)_data.length fileSize:(UInt32)_data.length] uploadToken:_token.token];
+                [UploadInfoReporter recordWithRequestType:ReportType_form
+                                             responseInfo:info
+                                                bytesSent:(UInt32)_data.length
+                                                 fileSize:(UInt32)_data.length
+                                                    token:_token.token];
                 if (info.isOK) {
                     _option.progressHandler(_key, 1.0);
                 }
diff --git a/QiniuSDK/Storage/QNReportConfig.h b/QiniuSDK/Storage/QNReportConfig.h
diff --git a/QiniuSDK/Storage/QNReportConfig.m b/QiniuSDK/Storage/QNReportConfig.m
diff --git a/QiniuSDK/Storage/QNResumeUpload.m b/QiniuSDK/Storage/QNResumeUpload.m
diff --git a/QiniuSDK/Storage/QNUploadInfoReporter.h b/QiniuSDK/Storage/QNUploadInfoReporter.h
diff --git a/QiniuSDK/Storage/QNUploadInfoReporter.m b/QiniuSDK/Storage/QNUploadInfoReporter.m
