Merge pull request #124 from Microsoft/abaranch/fixDateTime

DateTime is not set for unconfigured experience.
microsoft · Nov 23, 2015 · 0cae65d · 0cae65d
2 parents 8ba658b + 607cce2
commit 0cae65d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/Test/CoreSDK.Test/Shared/TelemetryClientTest.cs b/Test/CoreSDK.Test/Shared/TelemetryClientTest.cs
@@ -78,6 +78,16 @@ public void TrackEventWillSendPropertiesIfProvidedInline()
             Assert.Equal("yoyo", eventTelemetry.Properties["blah"]);
         }
 
+        [TestMethod]
+        public void InitializeSetsDateTime()
+        {
+            EventTelemetry telemetry = new EventTelemetry("TestEvent");
+
+            new TelemetryClient().Initialize(telemetry);
+
+            Assert.True(telemetry.Timestamp != default(DateTimeOffset));
+        }
+
         #endregion
 
         #region TrackMetric

diff --git a/src/Core/Managed/Shared/TelemetryClient.cs b/src/Core/Managed/Shared/TelemetryClient.cs
@@ -317,11 +317,6 @@ public void Track(ITelemetry telemetry)
                     return;
                 }
 
-                if (telemetry.Timestamp == default(DateTimeOffset))
-                {
-                    telemetry.Timestamp = Clock.Instance.Time;
-                }
-
                 // invokes the Process in the first processor in the chain
                 this.configuration.TelemetryProcessors.Process(telemetry);
 
@@ -376,6 +371,11 @@ public void Initialize(ITelemetry telemetry)
                                                     exception));
                 }
             }
+
+            if (telemetry.Timestamp == default(DateTimeOffset))
+            {
+                telemetry.Timestamp = Clock.Instance.Time;
+            }
         }
 
         /// <summary>