Fix start time duration offset

AutoCollection/HttpDependencyParser.ts

@@ -80,6 +80,12 @@ class HttpDependencyParser extends RequestParser {
             target: remoteDependencyTarget
         };
 
+        if (baseTelemetry && baseTelemetry.time) {
+            dependencyTelemetry.time = baseTelemetry.time;
+        } else if (this.startTime) {
+            dependencyTelemetry.time = new Date(this.startTime);
+        }
+
         // We should keep any parameters the user passed in
         // Except the fields defined above in requestTelemetry, which take priority
         // Except the properties field, where they're merged instead, with baseTelemetry taking priority

AutoCollection/HttpRequestParser.ts

@@ -81,6 +81,12 @@ class HttpRequestParser extends RequestParser {
             success: this._isSuccess(),
             properties: this.properties
         };
+
+        if (baseTelemetry && baseTelemetry.time) {
+            requestTelemetry.time = baseTelemetry.time;
+        } else if (this.startTime) {
+            requestTelemetry.time = new Date(this.startTime);
+        }
 
         // We should keep any parameters the user passed in
         // Except the fields defined above in requestTelemetry, which take priority

AutoCollection/diagnostic-channel/mongodb.sub.ts

@@ -23,6 +23,7 @@ export const subscriber = (event: IStandardEvent<mongodb.IMongoData>) => {
                 success: event.data.succeeded,
                 /* TODO: transmit result code from mongo */
                 resultCode: event.data.succeeded ? "0" : "1",
+                time: event.data.startedData.time,
                 dependencyTypeName: 'mongodb'
             });
     });

AutoCollection/diagnostic-channel/mysql.sub.ts

@@ -25,6 +25,7 @@ export const subscriber = (event: IStandardEvent<mysql.IMysqlData>) => {
                 success: success,
                 /* TODO: transmit result code from mysql */
                 resultCode: success? "0": "1",
+                time: event.data.time,
                 dependencyTypeName: "mysql"
             });
     });
@@ -42,4 +43,4 @@ export function enable(enabled: boolean, client: TelemetryClient) {
             channel.unsubscribe("mysql", subscriber);
         }
     }
-}
+}

AutoCollection/diagnostic-channel/postgres.sub.ts

@@ -20,6 +20,7 @@ export const subscriber = (event: IStandardEvent<pg.IPostgresData>) => {
             duration: event.data.duration,
             success: success,
             resultCode: success ? "0" : "1",
+            time: event.data.time,
             dependencyTypeName: "postgres"});
     });
 };

AutoCollection/diagnostic-channel/redis.sub.ts

@@ -22,6 +22,7 @@ export const subscriber = (event: IStandardEvent<redis.IRedisData>) => {
                 success: !event.data.err,
                 /* TODO: transmit result code from redis */
                 resultCode: event.data.err ? "1" : "0",
+                time: event.data.time,
                 dependencyTypeName: "redis"
             });
 
@@ -40,4 +41,4 @@ export function enable(enabled: boolean, client: TelemetryClient) {
             channel.unsubscribe("redis", subscriber);
         }
     }
-}
+}

Tests/AutoCollection/HttpDependencyParser.tests.ts

@@ -29,6 +29,20 @@ describe("AutoCollection/HttpDependencyParser", () => {
             assert.equal(dependencyTelemetry.target, "bing.com");
         });
 
+        it("should propagate a custom timestamp", () => {
+            (<any>request)["method"] = "GET";
+            let parser = new HttpDependencyParser("http://bing.com/search", request);
+
+            response.statusCode = 200;
+            parser.onResponse(response);
+
+            const dependencyTelemetry1 = parser.getDependencyTelemetry({time: new Date(111111)});
+            const dependencyTelemetry2 = parser.getDependencyTelemetry({time: new Date(222222)});
+            assert.deepEqual(dependencyTelemetry1.time, new Date(111111)); 
+            assert.deepEqual(dependencyTelemetry2.time, new Date(222222)); 
+            assert.notDeepEqual(dependencyTelemetry1, dependencyTelemetry2); 
+        });
+
         it("should return correct data for a posted URL with query string", () => {
             (<any>request)["method"] = "POST";
             let parser = new HttpDependencyParser("http://bing.com/search?q=test", request);

Tests/AutoCollection/HttpRequestParser.tests.ts

@@ -111,6 +111,19 @@ describe("AutoCollection/HttpRequestParser", () => {
                 host: "bing.com"
             }
         }
+
+        it("should propagate a custom timestamp", () => {
+            var helper = new HttpRequestParser(<any>request);
+            helper["startTime"] = 321;
+            var requestData1 = helper.getRequestTelemetry({time: new Date(123)});
+            var requestData2 = helper.getRequestTelemetry({time: new Date(456)});
+            var requestData3 = helper.getRequestTelemetry();
+
+            assert.deepEqual(requestData1.time, new Date(123));
+            assert.deepEqual(requestData2.time, new Date(456));
+            assert.deepEqual(requestData3.time, new Date(321));
+            assert.notDeepEqual(requestData1, requestData2);
+        });
 
         it("should return an absolute url", () => {
             var helper = new HttpRequestParser(<any>request);

package.json

@@ -63,6 +63,6 @@
     "cls-hooked": "^4.2.2",
     "continuation-local-storage": "^3.2.1",
     "diagnostic-channel": "0.2.0",
-    "diagnostic-channel-publishers": "^0.3.3"
+    "diagnostic-channel-publishers": "^0.3.4"
   }
 }