modify reqeustMetrics request set logic

Author: YangSen-qn

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,12 +62,8 @@ - (void)URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)data
 }
 
 - (void)URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(nullable NSError *)error {
-    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:task.currentRequest.URL
-                                                           cachePolicy:task.currentRequest.cachePolicy
-                                                       timeoutInterval:task.currentRequest.timeoutInterval];
-    request.allHTTPHeaderFields = task.currentRequest.allHTTPHeaderFields;
     self.requestMetrics.endDate = [NSDate date];
-    self.requestMetrics.request = [request copy];
+    self.requestMetrics.request = task.currentRequest;
     self.requestMetrics.response = task.response;
     self.requestMetrics.countOfResponseBodyBytesReceived = task.response.expectedContentLength;
     self.requestMetrics.countOfRequestHeaderBytesSent = [NSString stringWithFormat:@"%@", task.currentRequest.allHTTPHeaderFields].length;