update qcloud sdk to 1.5.29

tothetruth · tothetruth · commit d92ad1038d39 · 2021-04-25T20:34:16.000+08:00
diff --git a/QCloudFoundation/foundation/build.gradle b/QCloudFoundation/foundation/build.gradle
@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10528
-        versionName "1.5.28"
+        versionCode 10529
+        versionName "1.5.29"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
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
@@ -65,7 +65,7 @@ public class CallMetricsListener extends EventListener {
      */
     private String domainName;
     private List<InetAddress> inetAddressList;
-    private InetSocketAddress connectAddress;
+    private InetAddress connectAddress;
 
     private long requestBodyByteCount;
     private long responseBodyByteCount;
@@ -99,7 +99,6 @@ public void dnsEnd(Call call, String domainName, List<InetAddress> inetAddressLi
     @Override
     public void connectStart(Call call, InetSocketAddress inetSocketAddress, Proxy proxy) {
         super.connectStart(call, inetSocketAddress, proxy);
-        connectAddress = inetSocketAddress;
         connectStartTime = System.nanoTime();
     }
 
@@ -177,6 +176,13 @@ 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;
@@ -187,13 +193,9 @@ public void dumpMetrics(HttpTaskMetrics metrics) {
         metrics.writeRequestBodyTookTime += writeRequestBodyTookTime;
         metrics.readResponseHeaderTookTime += readResponseHeaderTookTime;
         metrics.readResponseBodyTookTime += readResponseBodyTookTime;
-        metrics.connectAddress = connectAddress;
         metrics.requestBodyByteCount = requestBodyByteCount;
         metrics.responseBodyByteCount = responseBodyByteCount;
-    }
-
-    public InetSocketAddress getConnectAddress() {
-        return connectAddress;
+        metrics.connectAddress = connectAddress;
     }
 
     public List<InetAddress> dumpDns() {
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/ConnectionRepository.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/ConnectionRepository.java
@@ -50,8 +50,6 @@ public class ConnectionRepository {
 
     private Map<String, List<InetAddress>> dnsRecords;
 
-    private Map<String, InetSocketAddress> connectAddressRecords;
-
     private static volatile ConnectionRepository instance;
 
     private LocalDnsCache localDnsCache;
@@ -77,7 +75,6 @@ private ConnectionRepository() {
         localDnsCache = new LocalDnsCache(ContextHolder.getAppContext());
         dnsFetcher = new DnsFetcher();
         dnsRecords = new ConcurrentHashMap<>();
-        connectAddressRecords = new ConcurrentHashMap<>();
         singleExecutor = Executors.newSingleThreadExecutor();
     }
 
@@ -106,14 +103,6 @@ public void insertDnsRecordCache(final String host, final List<InetAddress> inet
         insertDnsRecordCache(host, inetAddresses, null);
     }
 
-    public void setConnectAddress(String host, InetSocketAddress socketAddress) {
-        connectAddressRecords.put(host, socketAddress);
-    }
-
-    public @Nullable InetSocketAddress getConnectAddress(String host) {
-        return connectAddressRecords.get(host);
-    }
-
     // public void deleteDnsRecordCache
 
     /**
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
@@ -68,7 +68,7 @@ public class HttpTaskMetrics {
 
     @Nullable String domainName;
     @Nullable List<InetAddress> remoteAddress;
-    @Nullable InetSocketAddress connectAddress;
+    @Nullable InetAddress connectAddress;
 
     void onTaskStart() {
         fullTaskStartTime = System.nanoTime();
@@ -218,7 +218,7 @@ public double fullTaskTookTime() {
         return remoteAddress;
     }
 
-    @Nullable public InetSocketAddress getConnectAddress() {
+    @Nullable public InetAddress getConnectAddress() {
         return connectAddress;
     }
 
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpClientImpl.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpClientImpl.java
@@ -22,6 +22,7 @@
 
 package com.tencent.qcloud.core.http;
 
+import com.tencent.qcloud.core.http.interceptor.HttpMetricsInterceptor;
 import com.tencent.qcloud.core.http.interceptor.RetryInterceptor;
 import com.tencent.qcloud.core.http.interceptor.TrafficControlInterceptor;
 
@@ -30,6 +31,7 @@
 import javax.net.ssl.HostnameVerifier;
 
 import okhttp3.Call;
+import okhttp3.ConnectionPool;
 import okhttp3.Dns;
 import okhttp3.OkHttpClient;
 
@@ -60,6 +62,7 @@ public void init(QCloudHttpClient.Builder b, HostnameVerifier hostnameVerifier,
                 .readTimeout(b.socketTimeout, TimeUnit.MILLISECONDS)
                 .writeTimeout(b.socketTimeout, TimeUnit.MILLISECONDS)
                 .eventListenerFactory(mEventListenerFactory)
+                .addNetworkInterceptor(new HttpMetricsInterceptor())
                 .addInterceptor(logInterceptor)
                 .addInterceptor(new RetryInterceptor(b.retryStrategy))
                 .addInterceptor(new TrafficControlInterceptor())
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
@@ -87,10 +87,6 @@ protected HttpResult<T> executeHttpRequest(HttpRequest<T> httpRequest) throws QC
 
             if (eventListener != null) {
                 eventListener.dumpMetrics(metrics);
-                if (eventListener.getConnectAddress() != null) {
-                    ConnectionRepository.getInstance().setConnectAddress(httpRequest.host(),
-                            eventListener.getConnectAddress());
-                }
             }
 
             if (response != null) {
@@ -120,9 +116,9 @@ protected HttpResult<T> executeHttpRequest(HttpRequest<T> httpRequest) throws QC
         } else if (serviceException != null) {
             throw serviceException;
         } else {
-            if (isCosResponse(response)) {
-                recordDns(httpRequest.host(), eventListener);
-            }
+//            if (isCosResponse(response)) {
+//                recordDns(httpRequest.host(), eventListener);
+//            }
             return httpResult;
         }
     }
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpClient.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/QCloudHttpClient.java
@@ -86,22 +86,44 @@ public boolean verify(String hostname, SSLSession session) {
 
         @Override
         public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+
+            List<InetAddress> dns = null;
+
+            // 首先使用用户设置的 dns
             if (dnsMap.containsKey(hostname)) {
-                return dnsMap.get(hostname);
+                dns = dnsMap.get(hostname);
             }
 
-            try {
-                return Dns.SYSTEM.lookup(hostname);
-            } catch (UnknownHostException e) {
-                // e.printStackTrace();
-                QCloudLogger.w(HTTP_LOG_TAG, "system dns failed, retry cache dns records.");
+            // 然后使用系统的 dns
+            if (dns == null) {
+                try {
+                    dns = Dns.SYSTEM.lookup(hostname);
+                } catch (UnknownHostException e) {
+                    // e.printStackTrace();
+                    QCloudLogger.w(HTTP_LOG_TAG, "system dns failed, retry cache dns records.");
+                }
             }
 
-            if (!dnsCache) {
+            if (dns == null && !dnsCache) {
                 throw new UnknownHostException("can not resolve host name " + hostname);
             }
 
-            return connectionRepository.getDnsRecord(hostname);
+            // 最后使用缓存的 dns
+            if (dns == null) {
+                try {
+                    dns = connectionRepository.getDnsRecord(hostname);
+                } catch (UnknownHostException e) {
+                    QCloudLogger.w(HTTP_LOG_TAG, "Not found dns in cache records.");
+                }
+            }
+
+            if (dns != null) {
+                ConnectionRepository.getInstance().insertDnsRecordCache(hostname, dns);
+            } else {
+                throw new UnknownHostException(hostname);
+            }
+
+            return dns;
         }
     };
 
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
@@ -0,0 +1,45 @@
+package com.tencent.qcloud.core.http.interceptor;
+
+import com.tencent.qcloud.core.http.CallMetricsListener;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import okhttp3.Connection;
+import okhttp3.EventListener;
+import okhttp3.Interceptor;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.internal.connection.RealConnection;
+import okhttp3.internal.http.RealInterceptorChain;
+
+/**
+ * <p>
+ * Created by rickenwang on 2021/4/25.
+ * Copyright 2010-2021 Tencent Cloud. All Rights Reserved.
+ */
+public class HttpMetricsInterceptor implements Interceptor {
+
+
+    @Override
+    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());
+                }
+            }
+        }
+
+        return chain.proceed(request);
+    }
+}
diff --git a/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/QCloudTask.java b/QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/task/QCloudTask.java
@@ -375,8 +375,10 @@ protected void onFailure() {
             for (QCloudResultListener resultListener : listeners) {
                 if (exception instanceof QCloudClientException) {
                     resultListener.onFailure((QCloudClientException) exception, null);
-                } else {
+                } else if (exception instanceof QCloudServiceException){
                     resultListener.onFailure(null, (QCloudServiceException) exception);
+                } else {
+                    resultListener.onFailure(new QCloudClientException(exception.getCause()), null);
                 }
             }
         }
diff --git a/QCloudFoundation/quic/build.gradle b/QCloudFoundation/quic/build.gradle
@@ -31,9 +31,9 @@ android {
         minSdkVersion 15
         targetSdkVersion 27
 
-        versionCode 10528
+        versionCode 10529
 
-        versionName "1.5.28"
+        versionName "1.5.29"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public class HttpTaskMetrics {`
`68`	`68`
`69`	`69`	`@Nullable String domainName;`
`70`	`70`	`@Nullable List<InetAddress> remoteAddress;`
`71`		`- @Nullable InetSocketAddress connectAddress;`
	`71`	`+ @Nullable InetAddress connectAddress;`
`72`	`72`
`73`	`73`	`void onTaskStart() {`
`74`	`74`	`fullTaskStartTime = System.nanoTime();`
`@@ -218,7 +218,7 @@ public double fullTaskTookTime() {`
`218`	`218`	`return remoteAddress;`
`219`	`219`	`}`
`220`	`220`
`221`		`- @Nullable public InetSocketAddress getConnectAddress() {`
	`221`	`+ @Nullable public InetAddress getConnectAddress() {`
`222`	`222`	`return connectAddress;`
`223`	`223`	`}`
`224`	`224`
Original file line number	Diff line number	Diff line change
`@@ -375,8 +375,10 @@ protected void onFailure() {`
`375`	`375`	`for (QCloudResultListener resultListener : listeners) {`
`376`	`376`	`if (exception instanceof QCloudClientException) {`
`377`	`377`	`resultListener.onFailure((QCloudClientException) exception, null);`
`378`		`- } else {`
	`378`	`+ } else if (exception instanceof QCloudServiceException){`
`379`	`379`	`resultListener.onFailure(null, (QCloudServiceException) exception);`
	`380`	`+ } else {`
	`381`	`+ resultListener.onFailure(new QCloudClientException(exception.getCause()), null);`
`380`	`382`	`}`
`381`	`383`	`}`
`382`	`384`	`}`