Merge pull request #412 from adnanyaqoobvirk/master

Fixes custom telemetry timestamp bug

Author: Dmitry-Matveev

core/src/main/java/com/microsoft/applicationinsights/TelemetryClient.java

@@ -394,7 +394,9 @@ public void track(Telemetry telemetry) {
             return;
         }
 
-        telemetry.setTimestamp(new Date());
+        if (telemetry.getTimestamp() == null) {
+            telemetry.setTimestamp(new Date());
+        }
 
         TelemetryContext ctx = this.getContext();
 

core/src/test/java/com/microsoft/applicationinsights/TelemetryClientTests.java

@@ -381,6 +381,15 @@ public void testTrackPageViewWithPageViewTelemetry() {
         verifyAndGetLastEventSent();
     }
 
+    @Test
+    public void testTrackWithCustomTelemetryTimestamp() {
+        Date timestamp = new Date(10000);
+        client.track(new RequestTelemetry("Name", timestamp, 1, "200", true));
+
+        Telemetry telemetry = verifyAndGetLastEventSent();
+        assertEquals(telemetry.getTimestamp(), timestamp);
+    }
+
     @Test
     public void testTrack() {
         TraceTelemetry telemetry = new TraceTelemetry("test");