Fix SDK Version sent from QuickPulse channel (#881)

* Fix SDK Version sent from qp

* update readme

Author: dhaval24

CHANGELOG.md

@@ -10,6 +10,7 @@
   and `HttpExtractor`.
 - Deprecated `ApplicationInsightsHttpResponseWrapper`
 - Fixed [#826](https://github.com/Microsoft/ApplicationInsights-Java/issues/826) Remove duplicate provider.
+- Fix incorrect sdk version being sent in Quick Pulse payload.
 
 # Version 2.3.1
 - Fixed [#799](https://github.com/Microsoft/ApplicationInsights-Java/issues/799) Removed dependency on Guava vulnerable to [CVE-2018-10237](https://nvd.nist.gov/vuln/detail/CVE-2018-10237).

core/src/main/java/com/microsoft/applicationinsights/internal/quickpulse/DefaultQuickPulseDataFetcher.java

@@ -22,8 +22,10 @@
 package com.microsoft.applicationinsights.internal.quickpulse;
 
 import java.util.Date;
+import java.util.Properties;
 import java.util.concurrent.ArrayBlockingQueue;
 
+import com.microsoft.applicationinsights.internal.util.PropertyHelper;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.ByteArrayEntity;
@@ -39,10 +41,12 @@ final class DefaultQuickPulseDataFetcher implements QuickPulseDataFetcher {
     private final ArrayBlockingQueue<HttpPost> sendQueue;
     private final QuickPulseNetworkHelper networkHelper = new QuickPulseNetworkHelper();
     private String postPrefix;
+    private final String sdkVersion;
 
     public DefaultQuickPulseDataFetcher(final ArrayBlockingQueue<HttpPost> sendQueue, final String ikey, final String instanceName, final String quickPulseId) {
         quickPulsePostUri = QP_BASE_URI + "post?ikey=" + ikey;
         this.sendQueue = sendQueue;
+        sdkVersion = getCurrentSdkVersion();
         final StringBuilder sb = new StringBuilder();
         sb.append("[{");
         formatDocuments(sb);
@@ -55,6 +59,21 @@ public DefaultQuickPulseDataFetcher(final ArrayBlockingQueue<HttpPost> sendQueue
         postPrefix = sb.toString();
     }
 
+    /**
+     * Get SDK Version from properties
+     * @return current SDK version
+     */
+     /* Visible for testing */ String getCurrentSdkVersion() {
+        String prefix = "java";
+        Properties sdkVersionProps = PropertyHelper.getSdkVersionProperties();
+        if (sdkVersionProps != null) {
+            String version = sdkVersionProps.getProperty("version");
+            return prefix + ":" + version;
+        }
+        // return unknown version if no version number found.
+        return prefix + ":" + "unknown";
+    }
+
     @Override
     public void prepareQuickPulseDataForSend() {
         try {
@@ -90,7 +109,7 @@ private ByteArrayEntity buildPostEntity(QuickPulseDataCollector.FinalCounters co
         long ms = System.currentTimeMillis();
         sb.append(ms);
         sb.append(")\\/\",");
-        sb.append("\"Version\": \"2.2.0-738\"");
+        sb.append("\"Version\": \"" + sdkVersion + "\"");
         sb.append("}]");
         ByteArrayEntity bae = new ByteArrayEntity(sb.toString().getBytes());
         return bae;

core/src/test/java/com/microsoft/applicationinsights/internal/quickpulse/DefaultQuickPulseDataFetcherTests.java

@@ -0,0 +1,19 @@
+package com.microsoft.applicationinsights.internal.quickpulse;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class DefaultQuickPulseDataFetcherTests {
+
+    @Test
+    public void testGetCurrentSdkVersion() {
+        DefaultQuickPulseDataFetcher dataFetcher = new DefaultQuickPulseDataFetcher(null, null,
+                null, null);
+        String sdkVersion = dataFetcher.getCurrentSdkVersion();
+        Assert.assertNotNull(sdkVersion);
+        Assert.assertNotEquals("java:unknown", sdkVersion);
+    }
+}