Merge pull request #365 from YangSen-qn/develop

up log quality add target_key and target_bucket

Author: bachue

QiniuSDK/Collect/QNReportItem.h

@@ -108,6 +108,8 @@ extern NSString *const QNReportBlockKeyClientTime;
 extern NSString *const QNReportQualityKeyLogType;
 extern NSString *const QNReportQualityKeyUpTime;
 extern NSString *const QNReportQualityKeyResult;
+extern NSString *const QNReportQualityKeyTargetBucket;
+extern NSString *const QNReportQualityKeyTargetKey;
 extern NSString *const QNReportQualityKeyTotalElapsedTime;
 extern NSString *const QNReportQualityKeyRequestsCount;
 extern NSString *const QNReportQualityKeyRegionsCount;

QiniuSDK/Collect/QNReportItem.m

@@ -216,8 +216,10 @@ - (NSString *)qualityResult{
 
 //MARK:-- 上传质量统计
 NSString * const QNReportQualityKeyLogType = @"log_type";
-NSString *const QNReportQualityKeyUpTime = @"up_time";
+NSString * const QNReportQualityKeyUpTime = @"up_time";
 NSString * const QNReportQualityKeyResult = @"result";
+NSString * const QNReportQualityKeyTargetBucket = @"target_bucket";
+NSString * const QNReportQualityKeyTargetKey = @"target_key";
 NSString * const QNReportQualityKeyTotalElapsedTime = @"total_elapsed_time";
 NSString * const QNReportQualityKeyRequestsCount = @"requests_count";
 NSString * const QNReportQualityKeyRegionsCount = @"regions_count";

QiniuSDK/Storage/QNUploadManager.m

@@ -393,7 +393,7 @@ + (void)complete:(NSString *)token
      taskMetrics:(QNUploadTaskMetrics *)taskMetrics
         complete:(QNUpCompletionHandler)completionHandler {
 
-    [QNUploadManager reportQuality:responseInfo taskMetrics:taskMetrics token:token];
+    [QNUploadManager reportQuality:key responseInfo:responseInfo taskMetrics:taskMetrics token:token];
 
     QNAsyncRunInMain(^{
         if (completionHandler) {
@@ -404,16 +404,21 @@ + (void)complete:(NSString *)token
 
 
 //MARK:-- 统计quality日志
-+ (void)reportQuality:(QNResponseInfo *)info
++ (void)reportQuality:(NSString *)key
+         responseInfo:(QNResponseInfo *)responseInfo
           taskMetrics:(QNUploadTaskMetrics *)taskMetrics
                 token:(NSString *)token{
 
+    QNUpToken *upToken = [QNUpToken parse:token];
     QNUploadTaskMetrics *taskMetricsP = taskMetrics ?: [QNUploadTaskMetrics emptyMetrics];
 
     QNReportItem *item = [QNReportItem item];
     [item setReportValue:QNReportLogTypeQuality forKey:QNReportQualityKeyLogType];
     [item setReportValue:@([[NSDate date] timeIntervalSince1970]) forKey:QNReportQualityKeyUpTime];
-    [item setReportValue:info.qualityResult forKey:QNReportQualityKeyResult];
+    [item setReportValue:responseInfo.qualityResult forKey:QNReportQualityKeyResult];
+    [item setReportValue:upToken.bucket forKey:QNReportQualityKeyTargetBucket];
+    [item setReportValue:key forKey:QNReportQualityKeyTargetKey];
+    [item setReportValue:taskMetricsP.totalElapsedTime forKey:QNReportQualityKeyTotalElapsedTime];
     [item setReportValue:taskMetricsP.totalElapsedTime forKey:QNReportQualityKeyTotalElapsedTime];
     [item setReportValue:taskMetricsP.requestCount forKey:QNReportQualityKeyRequestsCount];
     [item setReportValue:taskMetricsP.regionCount forKey:QNReportQualityKeyRegionsCount];