Adding InvocationId to FunctionStartedEvent to allow for start/end correlation

Author: mathewc

src/WebJobs.Script/Description/CSharp/CSharpFunctionInvoker.cs

@@ -192,7 +192,7 @@ public override async Task Invoke(object[] parameters)
                 ExecutionContext functionExecutionContext = (ExecutionContext)systemParameters[0];
                 invocationId = functionExecutionContext.InvocationId.ToString();
 
-                startedEvent = new FunctionStartedEvent(Metadata);
+                startedEvent = new FunctionStartedEvent(functionExecutionContext.InvocationId, Metadata);
                 _metrics.BeginEvent(startedEvent);
 
                 TraceWriter.Verbose(string.Format("Function started (Id={0})", invocationId));

src/WebJobs.Script/Description/Node/NodeFunctionInvoker.cs

@@ -114,7 +114,7 @@ public override async Task Invoke(object[] parameters)
             ExecutionContext functionExecutionContext = (ExecutionContext)parameters[3];
             string invocationId = functionExecutionContext.InvocationId.ToString();
 
-            FunctionStartedEvent startedEvent = new FunctionStartedEvent(Metadata);
+            FunctionStartedEvent startedEvent = new FunctionStartedEvent(functionExecutionContext.InvocationId, Metadata);
             _metrics.BeginEvent(startedEvent);
 
             try

src/WebJobs.Script/Description/Script/ScriptFunctionInvoker.cs

@@ -86,7 +86,7 @@ internal async Task ExecuteScriptAsync(string path, string arguments, object[] i
             ExecutionContext functionExecutionContext = (ExecutionContext)invocationParameters[3];
             string invocationId = functionExecutionContext.InvocationId.ToString();
 
-            FunctionStartedEvent startedEvent = new FunctionStartedEvent(Metadata);
+            FunctionStartedEvent startedEvent = new FunctionStartedEvent(functionExecutionContext.InvocationId, Metadata);
             _metrics.BeginEvent(startedEvent);
 
             // perform any required input conversions

src/WebJobs.Script/Diagnostics/FunctionStartedEvent.cs

@@ -1,20 +1,24 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
+using System;
 using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Diagnostics
 {
     public class FunctionStartedEvent : MetricEvent
     {
-        public FunctionStartedEvent(FunctionMetadata functionMetadata)
+        public FunctionStartedEvent(Guid invocationId, FunctionMetadata functionMetadata)
         {
+            InvocationId = invocationId;
             FunctionMetadata = functionMetadata;
             Success = true;
         }
 
         public FunctionMetadata FunctionMetadata { get; private set; }
 
+        public Guid InvocationId { get; private set; }
+
         public bool Success { get; set; }
     }
 }