Merge pull request #368 from qiniu/develop

Develop

Author: Mei-Zhao

.travis.yml

@@ -5,7 +5,7 @@ sudo: true
 before_install:
   - rvm install 2.6.4
   - rvm use 2.6.4
-  - brew update
+#  - brew update
   - gem install cocoapods --pre
   - pod --version
   - rm -rf ~/.cocoapods

CHANGELOG.md

@@ -1,4 +1,9 @@
 #Changelog
+## 8.0.3(2020-09-23)
+## 修正
+- 修复内存峰值问题
+- 优化日志上传统计
+
 ## 8.0.2(2020-09-14)
 ## 修正
 - 修复日志上传失败问题

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '8.0.2'
+  s.version      = '8.0.3'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'

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

@@ -114,7 +114,7 @@ - (NSString *)requestReportErrorType{
         errorType = @"ssl_error";
     } else if (self.statusCode == -1015 || self.statusCode == -1016 || self.statusCode == -1017){
         errorType = @"parse_error";
-    } else if (self.statusCode == -1007 || self.statusCode == -1010 || kQNMaliciousResponseError){
+    } else if (self.statusCode == -1007 || self.statusCode == -1010 || self.statusCode == kQNMaliciousResponseError){
         errorType = @"malicious_response";
     } else if (self.statusCode == kQNRequestCancelled
             || self.statusCode == NSURLErrorCancelled){
@@ -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/Http/QNResponseInfo.m

@@ -164,6 +164,9 @@ - (instancetype)initWithResponseInfoHost:(NSString *)host
             _statusCode = (int)error.code;
             _message = [NSString stringWithFormat:@"%@", error];
             _responseDictionary = nil;
+        } else {
+            _statusCode = -9;
+            _message = @"no response";
         }
     }
     return self;

QiniuSDK/Http/QNUploadRequestMetrics.h

@@ -13,8 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface QNUploadSingleRequestMetrics : NSObject
 
-@property (copy) NSURLRequest *request;
-@property (nullable, copy) NSURLResponse *response;
+@property (nonatomic, copy) NSURLRequest *request;
+@property (nullable , copy) NSURLResponse *response;
 
 @property (nullable, copy) NSDate *startDate;
 @property (nullable, copy) NSDate *endDate;

QiniuSDK/Http/QNUploadRequestMetrics.m

@@ -33,6 +33,18 @@ - (void)initData{
     _countOfResponseBodyBytesReceived = 0;
 }
 
+- (void)setRequest:(NSURLRequest *)request{
+    NSMutableURLRequest *newRequest = [NSMutableURLRequest requestWithURL:request.URL
+                                                              cachePolicy:request.cachePolicy
+                                                          timeoutInterval:request.timeoutInterval];
+    newRequest.allHTTPHeaderFields = request.allHTTPHeaderFields;
+    
+    NSInteger headerLength = [NSString stringWithFormat:@"%@", self.request.allHTTPHeaderFields].length;
+    NSInteger bodyLength = [self.request.qn_getHttpBody length];
+    _totalBytes = @(headerLength + bodyLength);
+    _request = [newRequest copy];
+}
+
 - (NSNumber *)totalElapsedTime{
     return [self timeFromStartDate:self.startDate
                          toEndDate:self.endDate];
@@ -68,12 +80,6 @@ - (NSNumber *)totalResponseTime{
                          toEndDate:self.responseEndDate];
 }
 
-- (NSNumber *)totalBytes{
-    NSInteger headerLength = [NSString stringWithFormat:@"%@", self.request.allHTTPHeaderFields].length;
-    NSInteger bodyLength = [self.request.qn_getHttpBody length];
-    return @(headerLength + bodyLength);
-}
-
 - (NSNumber *)bytesSend{
     int64_t totalBytes = [self totalBytes].integerValue;
     int64_t senderBytes = self.countOfRequestBodyBytesSent + self.countOfRequestHeaderBytesSent;

QiniuSDK/Http/Request/HttpClient/QNUploadSystemClient.m

@@ -62,7 +62,6 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(nullable NSError *)error {
-    
     self.requestMetrics.endDate = [NSDate date];
     self.requestMetrics.request = task.currentRequest;
     self.requestMetrics.response = task.response;

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];