update qcloud sdk to 1.5.57

Author: jordanqin

QCloudFoundation/foundation/build.gradle

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10556
-        versionName "1.5.56"
+        versionCode 10557
+        versionName "1.5.57"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/CallMetricsListener.java

@@ -69,10 +69,8 @@ public class CallMetricsListener extends EventListener {
     private long readResponseBodyStartTime;
     private long readResponseBodyTookTime;
 
-    /**
-     * domainName inetAddressList connectAddress 都可能是空值
-     */
-    private List<InetAddress> inetAddressList;
+    private List<InetAddress> dnsInetAddressList;
+    private InetAddress connectAddress;
 
     private long requestBodyByteCount;
     private long responseBodyByteCount;
@@ -100,7 +98,7 @@ 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.inetAddressList = inetAddressList;
+        this.dnsInetAddressList = inetAddressList;
     }
 
     @Override
@@ -114,12 +112,14 @@ public void connectStart(Call call, InetSocketAddress inetSocketAddress, Proxy p
     public void connectEnd(Call call, InetSocketAddress inetSocketAddress, Proxy proxy, Protocol protocol) {
         super.connectEnd(call, inetSocketAddress, proxy, protocol);
         connectTookTime += System.nanoTime() - connectStartTime;
+        connectAddress = inetSocketAddress.getAddress();
     }
 
     @Override
     public void connectFailed(Call call, InetSocketAddress inetSocketAddress, Proxy proxy, Protocol protocol, IOException ioe) {
         super.connectFailed(call, inetSocketAddress, proxy, protocol, ioe);
         connectTookTime += System.nanoTime() - connectStartTime;
+        connectAddress = inetSocketAddress.getAddress();
     }
 
     @Override
@@ -190,7 +190,8 @@ public void responseBodyEnd(Call call, long byteCount) {
     }
 
     public void dumpMetrics(HttpTaskMetrics metrics) {
-        metrics.remoteAddress = inetAddressList;
+        metrics.recordConnectAddress(connectAddress);
+        metrics.remoteAddress = dnsInetAddressList;
         metrics.dnsStartTimestamp += dnsStartTimestamp;
         metrics.dnsLookupTookTime += dnsLookupTookTime;
         metrics.connectStartTimestamp += connectStartTimestamp;
@@ -210,7 +211,7 @@ public void dumpMetrics(HttpTaskMetrics metrics) {
     }
 
     public List<InetAddress> dumpDns() {
-        return inetAddressList;
+        return dnsInetAddressList;
     }
 
     @NonNull
@@ -231,7 +232,8 @@ public String toString() {
                 ", readResponseHeaderTookTime=" + readResponseHeaderTookTime +
                 ", readResponseBodyTimestamp=" + readResponseBodyStartTimestamp +
                 ", readResponseBodyTookTime=" + readResponseBodyTookTime +
-                ", inetAddressList=" + inetAddressList +
+                ", inetAddressList=" + dnsInetAddressList +
+                ", connectAddress=" + connectAddress +
                 ", requestBodyByteCount=" + requestBodyByteCount +
                 ", responseBodyByteCount=" + responseBodyByteCount +
                 '}';

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpConstants.java

@@ -23,6 +23,10 @@
 package com.tencent.qcloud.core.http;
 
 public final class HttpConstants {
+    /**
+     * 腾讯云COS服务响应标识: 接收请求并返回响应的服务器的名称
+     */
+    public static final String TENCENT_COS_SERVER = "tencent-cos";
 
     public static final class ContentType {
 
@@ -73,6 +77,8 @@ public static final class Header {
         public final static String DATE = "Date";
 
         public final static String EXPECT = "Expect";
+
+        public final static String SERVER = "Server";
     }
 
     public static final class RequestMethod {

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpLoggingInterceptor.java

@@ -21,28 +21,15 @@
  */
 package com.tencent.qcloud.core.http;
 
-import java.io.EOFException;
 import java.io.IOException;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
 import java.util.concurrent.TimeUnit;
 
 import okhttp3.Connection;
-import okhttp3.Headers;
 import okhttp3.Interceptor;
-import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;
 import okhttp3.Request;
-import okhttp3.RequestBody;
 import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.internal.http.HttpHeaders;
-import okhttp3.internal.platform.Platform;
-import okio.Buffer;
-import okio.BufferedSource;
-
-import static okhttp3.internal.platform.Platform.INFO;
 
 /**
  * An OkHttp interceptor which logs request and response information. Can be applied as an
@@ -54,8 +41,6 @@
  * fork from okhttp3.logging.
  */
 final public class HttpLoggingInterceptor implements Interceptor {
-    private static final Charset UTF8 = Charset.forName("UTF-8");
-
     public enum Level {
         /**
          * No logs.
@@ -118,30 +103,6 @@ public interface Logger {
         void logRequest(String message);
         void logResponse(Response response, String message);
         void logException(Exception exception, String message);
-
-        /**
-         * A {@link Logger} defaults output appropriate for the current platform.
-         */
-        Logger DEFAULT = new Logger() {
-            @Override
-            public void logRequest(String message) {
-                Platform.get().log(INFO, message, null);
-            }
-
-            @Override
-            public void logResponse(Response response, String message) {
-                Platform.get().log(INFO, message, null);
-            }
-
-            @Override
-            public void logException(Exception exception, String message) {
-                Platform.get().log(INFO, message, null);
-            }
-        };
-    }
-
-    public HttpLoggingInterceptor() {
-        this(Logger.DEFAULT);
     }
 
     public HttpLoggingInterceptor(Logger logger) {

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/HttpTaskMetrics.java

@@ -319,9 +319,10 @@ synchronized public HttpTaskMetrics merge(HttpTaskMetrics taskMetrics) {
     public String toString() {
         return new StringBuilder().append("Http Metrics: \n")
                 .append("domain : ").append(domainName).append("\n")
+                .append("connectAddress : ").append(connectAddress != null ? connectAddress.getHostAddress() : "null").append("\n")
                 .append("retryCount : ").append(retryCount).append("\n")
                 .append("isClockSkewedRetry : ").append(isClockSkewedRetry).append("\n")
-                .append("dns : ").append(connectAddress != null ? connectAddress.getHostAddress() : "null").append("\n")
+                .append("dns : ").append(remoteAddress != null ? remoteAddress : "null").append("\n")
                 .append("fullTaskTookTime : ").append(fullTaskTookTime()).append("\n")
                 .append("calculateMD5STookTime : ").append(calculateMD5STookTime()).append("\n")
                 .append("signRequestTookTime : ").append(signRequestTookTime()).append("\n")

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/MultipartStreamRequestBody.java

@@ -29,6 +29,7 @@
 
 import com.tencent.qcloud.core.common.QCloudDigistListener;
 import com.tencent.qcloud.core.common.QCloudProgressListener;
+import com.tencent.qcloud.core.util.OkhttpInternalUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -40,7 +41,6 @@
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
-import okhttp3.internal.Util;
 import okio.BufferedSink;
 import okio.BufferedSource;
 import okio.Okio;
@@ -146,7 +146,7 @@ public void writeTo(BufferedSink sink) throws IOException {
        try {
            multipartBody.writeTo(sink);
        }finally {
-           if(streamingRequestBody.countingSink != null)Util.closeQuietly(streamingRequestBody.countingSink);
+           if(streamingRequestBody.countingSink != null) OkhttpInternalUtils.closeQuietly(streamingRequestBody.countingSink);
        }
     }
 
@@ -243,8 +243,8 @@ public void writeTo(BufferedSink sink) throws IOException {
                 }
             } finally {
 
-               if(inputStream != null) Util.closeQuietly(inputStream);
-               if(source != null) Util.closeQuietly(source);
+               if(inputStream != null) OkhttpInternalUtils.closeQuietly(inputStream);
+               if(source != null) OkhttpInternalUtils.closeQuietly(source);
             }
         }
     }

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpClientImpl.java

@@ -23,7 +23,6 @@
 package com.tencent.qcloud.core.http;
 
 import com.tencent.qcloud.core.BuildConfig;
-import com.tencent.qcloud.core.http.interceptor.HttpMetricsInterceptor;
 import com.tencent.qcloud.core.http.interceptor.RetryInterceptor;
 import com.tencent.qcloud.core.http.interceptor.TrafficControlInterceptor;
 
@@ -66,7 +65,7 @@ public void init(QCloudHttpClient.Builder b, HostnameVerifier hostnameVerifier,
                 .readTimeout(b.socketTimeout, TimeUnit.MILLISECONDS)
                 .writeTimeout(b.socketTimeout, TimeUnit.MILLISECONDS)
                 .eventListenerFactory(mEventListenerFactory)
-                .addNetworkInterceptor(new HttpMetricsInterceptor())
+//                .addNetworkInterceptor(new HttpMetricsInterceptor())
                 .addInterceptor(logInterceptor)
                 .addInterceptor(new RetryInterceptor(b.retryStrategy))
                 .addInterceptor(new TrafficControlInterceptor())

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpLoggingUtils.java

@@ -1,6 +1,6 @@
 package com.tencent.qcloud.core.http;
 
-import com.tencent.qcloud.core.http.HttpLoggingInterceptor;
+import com.tencent.qcloud.core.util.OkhttpInternalUtils;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -15,7 +15,6 @@
 import okhttp3.RequestBody;
 import okhttp3.Response;
 import okhttp3.ResponseBody;
-import okhttp3.internal.http.HttpHeaders;
 import okio.Buffer;
 import okio.BufferedSource;
 
@@ -48,7 +47,7 @@ public static void logResponse(Response response, long tookMs, HttpLoggingInterc
                 logger.logResponse(response, headers.name(i) + ": " + headers.value(i));
             }
 
-            if (!logBody || !HttpHeaders.hasBody(response) || !hasResponseBody || isContentLengthTooLarge(contentLength)) {
+            if (!logBody || !OkhttpInternalUtils.hasBody(response) || !hasResponseBody || isContentLengthTooLarge(contentLength)) {
                 logger.logResponse(response, "<-- END HTTP");
             } else if (bodyEncoded(response.headers())) {
                 logger.logResponse(response, "<-- END HTTP (encoded body omitted)");

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/OkHttpProxy.java

@@ -24,6 +24,7 @@
 
 import com.tencent.qcloud.core.common.QCloudClientException;
 import com.tencent.qcloud.core.common.QCloudServiceException;
+import com.tencent.qcloud.core.util.OkhttpInternalUtils;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
@@ -34,7 +35,6 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
-import okhttp3.internal.Util;
 
 public class OkHttpProxy<T> extends NetworkProxy<T> {
 
@@ -109,7 +109,7 @@ protected HttpResult<T> executeHttpRequest(HttpRequest<T> httpRequest) throws QC
             }
         } finally {
             if(response != null && !selfCloseConverter) {
-                Util.closeQuietly(response);
+                OkhttpInternalUtils.closeQuietly(response);
             }
         }
 

QCloudFoundation/foundation/src/main/java/com/tencent/qcloud/core/http/ResponseBodyConverter.java

@@ -31,7 +31,6 @@
 
 /**
  * 响应体转换器
- * @param <T>
  */
 public abstract class ResponseBodyConverter<T> {