update qcloud sdk to 1.5.31

tothetruth · tothetruth · commit 03476f6907a1 · 2021-07-21T11:51:37.000+08:00
diff --git a/QCloudFoundation/foundation/build.gradle b/QCloudFoundation/foundation/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     defaultConfig {
         minSdkVersion 15
-        targetSdkVersion 27
+        targetSdkVersion 28
 
-        versionCode 10529
-        versionName "1.5.29"
+        versionCode 10531
+        versionName "1.5.31"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
@@ -50,8 +50,10 @@ dependencies {
 
 project.extensions.add('artifactId', 'qcloud-foundation')
 project.extensions.add('artifactDesc', 'the core foundation for tencent cloud sdk')
+project.extensions.add('archiveFilePath', 'outputs/aar/qcloud-foundation-release.aar')
 
 
+apply from: '../../publishMavenCentral.gradle'
 
 /*
  * Copyright (c) 2010-2020 Tencent Cloud. All rights reserved.
diff --git a/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/CosUnitTest.java b/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/CosUnitTest.java
@@ -23,7 +23,8 @@
 package com.tencent.qcloud.core;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tencent.qcloud.core.auth.COSXmlSignSourceProvider;
diff --git a/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/HttpClientUnitTest.java b/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/HttpClientUnitTest.java
@@ -25,7 +25,7 @@
 import android.content.Context;
 import android.net.Uri;
 import androidx.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import android.util.Log;
 
diff --git a/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/LoggerUnitTest.java b/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/LoggerUnitTest.java
@@ -23,7 +23,8 @@
 package com.tencent.qcloud.core;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tencent.qcloud.core.logger.FileLogAdapter;
diff --git a/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/http/DnsTest.java b/QCloudFoundation/foundation/src/androidTest/java/com/tencent/qcloud/core/http/DnsTest.java
@@ -23,7 +23,8 @@
 package com.tencent.qcloud.core.http;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.tencent.qcloud.core.logger.QCloudLogger;
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/CallMetricsListener.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/CallMetricsListener.java
@@ -63,9 +63,7 @@ public class CallMetricsListener extends EventListener {
     /**
      * domainName inetAddressList connectAddress 都可能是空值
      */
-    private String domainName;
     private List<InetAddress> inetAddressList;
-    private InetAddress connectAddress;
 
     private long requestBodyByteCount;
     private long responseBodyByteCount;
@@ -92,7 +90,6 @@ public void dnsEnd(Call call, String domainName, List<InetAddress> inetAddressLi
         ipList.append("}");
         QCloudLogger.i(QCloudHttpClient.HTTP_LOG_TAG, "dns: " + domainName + ":" + ipList.toString());
         dnsLookupTookTime += System.nanoTime() - dnsStartTime;
-        this.domainName = domainName;
         this.inetAddressList = inetAddressList;
     }
 
@@ -176,15 +173,7 @@ public void responseBodyEnd(Call call, long byteCount) {
         responseBodyByteCount = byteCount;
     }
 
-    public void recordConnection(InetAddress address) {
-        if (address != null) {
-            domainName = address.getHostName();
-            connectAddress = address;
-        }
-    }
-
     public void dumpMetrics(HttpTaskMetrics metrics) {
-        metrics.domainName = domainName;
         metrics.remoteAddress = inetAddressList;
         metrics.dnsLookupTookTime += dnsLookupTookTime;
         metrics.connectTookTime += connectTookTime;
@@ -195,7 +184,6 @@ public void dumpMetrics(HttpTaskMetrics metrics) {
         metrics.readResponseBodyTookTime += readResponseBodyTookTime;
         metrics.requestBodyByteCount = requestBodyByteCount;
         metrics.responseBodyByteCount = responseBodyByteCount;
-        metrics.connectAddress = connectAddress;
     }
 
     public List<InetAddress> dumpDns() {
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTask.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTask.java
@@ -36,6 +36,8 @@
 import com.tencent.qcloud.core.task.TaskExecutors;
 
 import java.io.IOException;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -111,6 +113,10 @@ public HttpTask<T> attachMetric(HttpTaskMetrics httpMetric) {
         return this;
     }
 
+    public HttpTaskMetrics metrics() {
+        return metrics;
+    }
+
     public boolean isUploadTask() {
         if (httpRequest.getRequestBody() instanceof StreamingRequestBody) {
             return ((StreamingRequestBody) httpRequest.getRequestBody()).isLargeData();
@@ -160,6 +166,11 @@ public void cancel() {
         super.cancel();
     }
 
+    private boolean isCompleteMultipartRequest(HttpRequest httpRequest) {
+        Set<String> queryKeys = httpRequest.queries.keySet();
+        return queryKeys != null && queryKeys.size() == 1 && queryKeys.contains("uploadId");
+    }
+
     @Override
     protected HttpResult<T> execute() throws QCloudClientException, QCloudServiceException {
         if (metrics == null) {
@@ -168,6 +179,12 @@ protected HttpResult<T> execute() throws QCloudClientException, QCloudServiceExc
         networkProxy.metrics = metrics;
         metrics.onTaskStart();
 
+//        if (isCompleteMultipartRequest(httpRequest)) {
+//            QCloudServiceException serviceException = new QCloudServiceException("NoSuchUpload");
+//            serviceException.setErrorCode("Request is expired");
+//            throw serviceException;
+//        }
+
         // 准备请求，包括计算MD5和签名
         if (httpRequest.shouldCalculateContentMD5()) {
             metrics.onCalculateMD5Start();
@@ -267,7 +284,7 @@ private void calculateContentMD5() throws QCloudClientException {
             try {
                 requestBody.writeTo(sink);
             } catch (IOException e) {
-                throw new QCloudClientException("calculate md5 error", e);
+                throw new QCloudClientException("calculate md5 error" + e.getMessage(), e);
             }
 
             String md5 = sink.md5().base64();
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTaskMetrics.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTaskMetrics.java
@@ -29,7 +29,6 @@
 
 import com.tencent.qcloud.core.logger.QCloudLogger;
 
-import junit.framework.TestSuite;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -239,12 +238,18 @@ private double toSeconds(long nanotime) {
     }
 
     public static HttpTaskMetrics createMetricsWithHost(String host) {
-        QCloudLogger.i("QCloudTest", "create HttpTaskMetrics with domain name  is " + host);
         HttpTaskMetrics taskMetrics = new HttpTaskMetrics();
         taskMetrics.domainName = host;
         return taskMetrics;
     }
 
+    public void recordConnectAddress(InetAddress address) {
+        if (address != null) {
+            domainName = address.getHostName();
+            connectAddress = address;
+        }
+    }
+
     /**
      * 数据准备完毕时的回调，你可以重载此方法，实现数据完毕后的回调
      */
@@ -254,8 +259,6 @@ public void onDataReady() {
 
     synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
 
-        QCloudLogger.i("QCloudTest", "domainName is " + domainName + ", other is " + taskMetrics.domainName);
-
         if (!TextUtils.isEmpty(domainName) && !TextUtils.isEmpty(taskMetrics.domainName)
             && !domainName.equals(taskMetrics.domainName)) {
             return this;
@@ -278,8 +281,6 @@ synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
         httpTaskTookTime += taskMetrics.httpTaskTookTime;
         calculateMD5STookTime += taskMetrics.calculateMD5STookTime;
         signRequestTookTime += taskMetrics.signRequestTookTime;
-        QCloudLogger.i("QCloudTest", "upload request size requestBodyByteCount " + requestBodyByteCount);
-        QCloudLogger.i("QCloudTest", "upload response size responseBodyByteCount " + responseBodyByteCount);
         if (taskMetrics.getRemoteAddress() != null) {
             remoteAddress = taskMetrics.getRemoteAddress();
         }
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpProxy.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpProxy.java
@@ -25,17 +25,17 @@
 import com.tencent.qcloud.core.common.QCloudClientException;
 import com.tencent.qcloud.core.common.QCloudServiceException;
 
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.List;
+
 import okhttp3.Call;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
 import okhttp3.internal.Util;
 
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.util.List;
-
 public class OkHttpProxy<T> extends NetworkProxy<T> {
 
     private Call httpCall;
@@ -80,6 +80,7 @@ protected HttpResult<T> executeHttpRequest(HttpRequest<T> httpRequest) throws QC
                     eventListener = (CallMetricsListener) eventListenerFiled.get(httpCall);
                 } catch (NoSuchFieldException ignore) {
                 } catch (IllegalAccessException ignore) {
+                } catch (ClassCastException ignore) {
                 }
             }
 
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/HttpMetricsInterceptor.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/HttpMetricsInterceptor.java
@@ -1,12 +1,14 @@
 package com.tencent.qcloud.core.http.interceptor;
 
-import com.tencent.qcloud.core.http.CallMetricsListener;
+import com.tencent.qcloud.core.http.HttpTask;
+import com.tencent.qcloud.core.http.HttpTaskMetrics;
+import com.tencent.qcloud.core.logger.QCloudLogger;
+import com.tencent.qcloud.core.task.TaskManager;
 
 import java.io.IOException;
 import java.net.Socket;
 
 import okhttp3.Connection;
-import okhttp3.EventListener;
 import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -26,18 +28,21 @@ public Response intercept(Chain chain) throws IOException {
 
         Request request = chain.request();
 
-        if (chain instanceof RealInterceptorChain) {
-            RealInterceptorChain realChain = (RealInterceptorChain) chain;
-            Connection connection = chain.connection();
-            if (connection instanceof RealConnection) {
-                RealConnection realConnection = (RealConnection) connection;
-                Socket socket = realConnection.socket();
-                EventListener eventListener = realChain.eventListener();
-                if (eventListener instanceof CallMetricsListener && socket != null) {
-                    CallMetricsListener callMetricsListener = (CallMetricsListener) eventListener;
-                    callMetricsListener.recordConnection(socket.getInetAddress());
+        try {
+            if (chain instanceof RealInterceptorChain) {
+                Connection connection = chain.connection();
+                if (connection instanceof RealConnection) {
+                    RealConnection realConnection = (RealConnection) connection;
+                    Socket socket = realConnection.socket();
+                    HttpTask task = (HttpTask) TaskManager.getInstance().get((String) request.tag());
+                    HttpTaskMetrics metrics = task.metrics();
+                    if (metrics != null) {
+                        metrics.recordConnectAddress(socket.getInetAddress());
+                    }
                 }
             }
+        } catch (Exception e) {
+            QCloudLogger.d("HttpMetricsInterceptor", e.getMessage());
         }
 
         return chain.proceed(request);
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/RetryInterceptor.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/interceptor/RetryInterceptor.java
@@ -207,6 +207,10 @@ Response processRequest(Chain chain, Request request, HttpTask task) throws IOEx
             } else if (shouldRetry(request, response, attempts, task.getWeight(), startTime, e, statusCode) && !task.isCanceled()) {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s failed for %s, code is %d", request, e, statusCode);
                 retryStrategy.onTaskEnd(false, e);
+                if (response != null && response.body() != null) {
+                    response.close();
+                }
+
             } else {
                 QCloudLogger.i(HTTP_LOG_TAG, "%s ends for %s, code is %d", request, e, statusCode);
                 break;
@@ -327,6 +331,7 @@ private int getHostReliable(String host) {
 
 
     private boolean shouldRetry(Request request, Response response, int attempts, int weight, long startTime, IOException e, int statusCode) {
+
         if (isUserCancelled(e)) {
             return false;
         }
diff --git a/QCloudFoundation/quic/build.gradle b/QCloudFoundation/quic/build.gradle
@@ -31,9 +31,9 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10529
+        versionCode 10531
 
-        versionName "1.5.29"
+        versionName "1.5.31"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -80,4 +80,7 @@ project.extensions.add('packageType', 'aar')
 project.extensions.add('packageName', 'Quic')
 project.extensions.add('artifactId', 'quic')
 project.extensions.add('artifactDesc', 'the cos quic for tencent cloud sdk')
+project.extensions.add('archiveFilePath', 'outputs/aar/quic-release.aar')
 
+// 
+apply from: '../../publishMavenCentral.gradle'
