update qcloud sdk to 1.5.69

Author: jordanqin

QCloudFoundation/.idea/gradle.xml

@@ -7,8 +7,8 @@ android {
         minSdkVersion 15
         targetSdkVersion 28
 
-        versionCode 10568
-        versionName "1.5.68"
+        versionCode 10569
+        versionName "1.5.69"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

QCloudFoundation/foundation/build.gradle

@@ -260,6 +260,7 @@ protected HttpResult<T> execute() throws QCloudClientException, QCloudServiceExc
                 metrics.onHttpTaskEnd();
                 return httpResult;
             } else {
+                metrics.onHttpTaskEnd();
                 throw serviceException;
             }
         } catch (QCloudClientException clientException) {
@@ -283,6 +284,7 @@ protected HttpResult<T> execute() throws QCloudClientException, QCloudServiceExc
                 metrics.onHttpTaskEnd();
                 return httpResult;
             } else {
+                metrics.onHttpTaskEnd();
                 throw clientException;
             }
         } finally {

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

@@ -87,7 +87,9 @@ void onHttpTaskStart() {
     }
 
     void onHttpTaskEnd() {
-        httpTaskTookTime = System.nanoTime() - httpTaskStartTime;
+        if(httpTaskStartTime != 0){
+            httpTaskTookTime = System.nanoTime() - httpTaskStartTime;
+        }
     }
 
     void onCalculateMD5Start() {
@@ -265,7 +267,8 @@ public static HttpTaskMetrics createMetricsWithHost(String host) {
 
     public void recordConnectAddress(InetAddress address) {
         if (address != null) {
-            domainName = address.getHostName();
+            // 耗时操作  要去掉
+//            domainName = address.getHostName();
             connectAddress = address;
         }
     }

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

@@ -0,0 +1 @@
+/build

QCloudFoundation/network-sonar/.gitignore

@@ -0,0 +1,44 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 28
+
+        versionCode 10000
+        versionName "1.0.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+
+    androidTestCompileOnly project(path: ':network-sonar')
+
+    implementation "org.minidns:minidns-hla:1.0.5"
+}
+
+project.extensions.add('artifactId', 'qcloud-network-sonar')
+project.extensions.add('artifactDesc', 'the network sonar for tencent cloud sdk')
+project.extensions.add('archiveFilePath', 'outputs/aar/qcloud-network-sonar-release.aar')
+
+
+apply from: '../../publishMavenCentral.gradle'

QCloudFoundation/network-sonar/build.gradle

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

QCloudFoundation/network-sonar/consumer-rules.pro

@@ -0,0 +1,84 @@
+package com.tencent.qcloud.network.sonar;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+import android.util.Log;
+
+import com.tencent.qcloud.network.sonar.dns.DnsResult;
+import com.tencent.qcloud.network.sonar.ping.PingResult;
+import com.tencent.qcloud.network.sonar.traceroute.TracerouteResult;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    private static ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(1, 1, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(Integer.MAX_VALUE));
+    static {
+        threadPoolExecutor.allowCoreThreadTimeOut(true);
+    }
+
+    @Test
+    public void sonar() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        String url = "harmony-cos-1258344699.cos.ap-guangzhou.myqcloud.com";
+//        String url = "taobao.com";
+        List<SonarType> types = new ArrayList<>();
+        types.add(SonarType.DNS);
+        types.add(SonarType.PING);
+        types.add(SonarType.TRACEROUTE);
+        final TestLocker testLocker = new TestLocker();
+        threadPoolExecutor.execute(new Runnable() {
+            @Override
+            public void run() {
+                NetworkSonar.sonar(appContext, new SonarRequest(url), types, new NetworkSonarCallback() {
+                    @Override
+                    public void onSuccess(SonarResult result) {
+                        Log.d("sonar", "onSuccess: " + result.getType().toString());
+                        switch (result.getType()) {
+                            case DNS:
+                                DnsResult dnsResult = (DnsResult) result.getResult();
+                                Log.d("sonar", dnsResult.toString());
+                                break;
+                            case PING:
+                                PingResult pingResult = (PingResult) result.getResult();
+                                Log.d("sonar", pingResult.toString());
+                                break;
+                            case TRACEROUTE:
+                                TracerouteResult tracerouteResult = (TracerouteResult) result.getResult();
+                                Log.d("sonar", tracerouteResult.toString());
+                                break;
+                        }
+                    }
+
+                    @Override
+                    public void onFail(SonarResult result) {
+                        Log.d("sonar", "onFail: " + result.getType().toString());
+                        Log.e("sonar", result.getException().getMessage(), result.getException());
+                    }
+
+                    @Override
+                    public void onFinish(List<SonarResult> results) {
+                        Log.d("sonar", "Finish");
+                        testLocker.release();
+                    }
+                });
+            }
+        });
+        testLocker.lock();
+    }
+}

QCloudFoundation/network-sonar/proguard-rules.pro

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2010-2020 Tencent Cloud. All rights reserved.
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.tencent.qcloud.network.sonar;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class TestLocker {
+
+    private CountDownLatch locker;
+
+    public TestLocker(int count) {
+        locker = new CountDownLatch(count);
+    }
+
+    public TestLocker() {
+        locker = new CountDownLatch(1);
+    }
+
+    public void lock() {
+        try {
+            locker.await(50000, TimeUnit.MILLISECONDS);
+//            locker.await();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public void lock(long timeout) {
+        try {
+            locker.await(timeout, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    synchronized public void release() {
+
+        if (locker != null && locker.getCount() > 0) {
+            locker.countDown();
+        }
+    }
+
+}