up log: block add target_bucket/target_key/os_name/os_version/sdk_name/sdk_version, quality add os_name/os_version/sdk_name/sdk_version

Author: YangSen-qn

QiniuSDK/Collect/QNReportItem.h

@@ -82,16 +82,19 @@ extern NSString *const QNReportRequestKeyOsVersion;
 extern NSString *const QNReportRequestKeySDKName;
 extern NSString *const QNReportRequestKeySDKVersion;
 extern NSString *const QNReportRequestKeyClientTime;
+extern NSString *const QNReportRequestKeyHttpClient;
 extern NSString *const QNReportRequestKeyNetworkType;
 extern NSString *const QNReportRequestKeySignalStrength;
-extern NSString * const QNReportRequestKeyPrefetchedDnsSource;
-extern NSString * const QNReportRequestKeyPrefetchedBefore;
-extern NSString * const QNReportRequestKeyPrefetchedErrorMessage;
+extern NSString *const QNReportRequestKeyPrefetchedDnsSource;
+extern NSString *const QNReportRequestKeyPrefetchedBefore;
+extern NSString *const QNReportRequestKeyPrefetchedErrorMessage;
 
 
 //MARK:-- 分块上传统计⽇志
 extern NSString *const QNReportBlockKeyLogType;
 extern NSString *const QNReportBlockKeyUpTime;
+extern NSString *const QNReportBlockKeyTargetBucket;
+extern NSString *const QNReportBlockKeyTargetKey;
 extern NSString *const QNReportBlockKeyTargetRegionId;
 extern NSString *const QNReportBlockKeyCurrentRegionId;
 extern NSString *const QNReportBlockKeyTotalElapsedTime;
@@ -102,7 +105,10 @@ extern NSString *const QNReportBlockKeyPid;
 extern NSString *const QNReportBlockKeyTid;
 extern NSString *const QNReportBlockKeyUpApiVersion;
 extern NSString *const QNReportBlockKeyClientTime;
-
+extern NSString *const QNReportBlockKeyOsName;
+extern NSString *const QNReportBlockKeyOsVersion;
+extern NSString *const QNReportBlockKeySDKName;
+extern NSString *const QNReportBlockKeySDKVersion;
 
 //MARK:-- 上传质量统计
 extern NSString *const QNReportQualityKeyLogType;
@@ -115,7 +121,12 @@ extern NSString *const QNReportQualityKeyRequestsCount;
 extern NSString *const QNReportQualityKeyRegionsCount;
 extern NSString *const QNReportQualityKeyBytesSent;
 extern NSString *const QNReportQualityKeyCloudType;
-extern NSString * const QNReportQualityKeyErrorType;
-extern NSString * const QNReportQualityKeyErrorDescription;
+extern NSString *const QNReportQualityKeyErrorType;
+extern NSString *const QNReportQualityKeyErrorDescription;
+extern NSString *const QNReportQualityKeyOsName;
+extern NSString *const QNReportQualityKeyOsVersion;
+extern NSString *const QNReportQualityKeySDKName;
+extern NSString *const QNReportQualityKeySDKVersion;
+
 
 NS_ASSUME_NONNULL_END

QiniuSDK/Collect/QNReportItem.m

@@ -197,6 +197,7 @@ - (NSString *)qualityResult{
 NSString * const QNReportRequestKeySDKName = @"sdk_name";
 NSString * const QNReportRequestKeySDKVersion = @"sdk_version";
 NSString * const QNReportRequestKeyClientTime = @"client_time";
+NSString * const QNReportRequestKeyHttpClient = @"http_client";
 NSString * const QNReportRequestKeyNetworkType = @"network_type";
 NSString * const QNReportRequestKeySignalStrength = @"signal_strength";
 NSString * const QNReportRequestKeyPrefetchedDnsSource = @"prefetched_dns_source";
@@ -205,7 +206,9 @@ - (NSString *)qualityResult{
 
 //MARK:-- 分块上传统计⽇志
 NSString * const QNReportBlockKeyLogType = @"log_type";
-NSString *const QNReportBlockKeyUpTime = @"up_time";
+NSString * const QNReportBlockKeyUpTime = @"up_time";
+NSString * const QNReportBlockKeyTargetBucket = @"target_bucket";
+NSString * const QNReportBlockKeyTargetKey = @"target_key";
 NSString * const QNReportBlockKeyTargetRegionId = @"target_region_id";
 NSString * const QNReportBlockKeyCurrentRegionId = @"current_region_id";
 NSString * const QNReportBlockKeyTotalElapsedTime = @"total_elapsed_time";
@@ -216,6 +219,10 @@ - (NSString *)qualityResult{
 NSString * const QNReportBlockKeyTid = @"tid";
 NSString * const QNReportBlockKeyUpApiVersion = @"up_api_version";
 NSString * const QNReportBlockKeyClientTime = @"client_time";
+NSString * const QNReportBlockKeyOsName = @"os_name";
+NSString * const QNReportBlockKeyOsVersion = @"os_version";
+NSString * const QNReportBlockKeySDKName = @"sdk_name";
+NSString * const QNReportBlockKeySDKVersion = @"sdk_version";
 
 
 //MARK:-- 上传质量统计
@@ -231,3 +238,7 @@ - (NSString *)qualityResult{
 NSString * const QNReportQualityKeyCloudType = @"cloud_type";
 NSString * const QNReportQualityKeyErrorType = @"error_type";
 NSString * const QNReportQualityKeyErrorDescription = @"error_description";
+NSString * const QNReportQualityKeyOsName = @"os_name";
+NSString * const QNReportQualityKeyOsVersion = @"os_version";
+NSString * const QNReportQualityKeySDKName = @"sdk_name";
+NSString * const QNReportQualityKeySDKVersion = @"sdk_version";

QiniuSDK/Storage/QNPartsUpload.m

@@ -257,6 +257,8 @@ - (void)reportBlock{
     QNReportItem *item = [QNReportItem item];
     [item setReportValue:QNReportLogTypeBlock forKey:QNReportBlockKeyLogType];
     [item setReportValue:@([[NSDate date] timeIntervalSince1970]) forKey:QNReportBlockKeyUpTime];
+    [item setReportValue:self.token.bucket forKey:QNReportBlockKeyTargetBucket];
+    [item setReportValue:self.key forKey:QNReportBlockKeyTargetKey];
     [item setReportValue:[self getTargetRegion].zoneInfo.regionId forKey:QNReportBlockKeyTargetRegionId];
     [item setReportValue:[self getCurrentRegion].zoneInfo.regionId forKey:QNReportBlockKeyCurrentRegionId];
     [item setReportValue:metrics.totalElapsedTime forKey:QNReportBlockKeyTotalElapsedTime];
@@ -267,6 +269,10 @@ - (void)reportBlock{
     [item setReportValue:@([QNUtils getCurrentThreadID]) forKey:QNReportBlockKeyTid];
     [item setReportValue:@(1) forKey:QNReportBlockKeyUpApiVersion];
     [item setReportValue:[QNUtils getCurrentNetworkType] forKey:QNReportBlockKeyClientTime];
+    [item setReportValue:[QNUtils systemName] forKey:QNReportBlockKeyOsName];
+    [item setReportValue:[QNUtils systemVersion] forKey:QNReportBlockKeyOsVersion];
+    [item setReportValue:[QNUtils sdkLanguage] forKey:QNReportBlockKeySDKName];
+    [item setReportValue:[QNUtils sdkVersion] forKey:QNReportBlockKeySDKVersion];
 
     [kQNReporter reportItem:item token:self.token.token];
 }

QiniuSDK/Storage/QNUploadManager.m

@@ -34,6 +34,7 @@
 #import "QNConfiguration.h"
 #import "QNCrc32.h"
 #import "QNFile.h"
+#import "QNUtils.h"
 #import "QNResponseInfo.h"
 
 #import "QNFormUpload.h"
@@ -424,6 +425,11 @@ + (void)reportQuality:(NSString *)key
     [item setReportValue:taskMetricsP.regionCount forKey:QNReportQualityKeyRegionsCount];
     [item setReportValue:taskMetricsP.bytesSend forKey:QNReportQualityKeyBytesSent];
 
+    [item setReportValue:[QNUtils systemName] forKey:QNReportQualityKeyOsName];
+    [item setReportValue:[QNUtils systemVersion] forKey:QNReportQualityKeyOsVersion];
+    [item setReportValue:[QNUtils sdkLanguage] forKey:QNReportQualityKeySDKName];
+    [item setReportValue:[QNUtils sdkVersion] forKey:QNReportQualityKeySDKVersion];
+    
     [item setReportValue:responseInfo.requestReportErrorType forKey:QNReportQualityKeyErrorType];
     NSString *errorDesc = responseInfo.requestReportErrorType ? responseInfo.message : nil;
     [item setReportValue:errorDesc forKey:QNReportQualityKeyErrorDescription];