Remove old metric ETW event from MetricsEventManager

Author: akurmi

src/WebJobs.Script.WebHost/Diagnostics/IMetricsEventGenerator.cs

@@ -5,8 +5,6 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics
 {
     public interface IMetricsEventGenerator
     {
-        void RaiseFunctionsMetricEvent(string executionId, long executionTimeSpan, long executionCount, string executionStage);
-
         void RaiseMetricsPerFunctionEvent(string siteName, string functionName, long executionTimeInMs, long functionStartedCount, long functionCompletedCount, long functionFailedCount);
 
         void RaiseFunctionsInfoEvent(string siteName, string functionName, string inputBindings, string outputBindings, string scriptType, bool isDisabled);

src/WebJobs.Script.WebHost/Diagnostics/MetricsEventGenerator.cs

@@ -7,11 +7,6 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost.Diagnostics
 {
     internal class MetricsEventGenerator : IMetricsEventGenerator
     {
-        public void RaiseFunctionsMetricEvent(string executionId, long executionTimeSpan, long executionCount, string executionStage)
-        {
-            MetricEventSource.Log.RaiseFunctionsMetricEvent(executionId, (ulong)executionTimeSpan, (ulong)executionCount, executionStage);
-        }
-
         public void RaiseMetricsPerFunctionEvent(string siteName, string functionName, long executionTimeInMs, long functionStartedCount, long functionCompletedCount, long functionFailedCount)
         {
             MetricEventSource.Log.RaiseMetricsPerFunctionEvent(siteName, functionName, (ulong)executionTimeInMs, (ulong)functionStartedCount, (ulong)functionCompletedCount, (ulong)functionFailedCount);
@@ -32,15 +27,6 @@ private sealed class MetricEventSource : EventSource
         {
             internal static readonly MetricEventSource Log = new MetricEventSource();
 
-            [Event(57906, Level = EventLevel.Informational, Channel = EventChannel.Operational)]
-            public void RaiseFunctionsMetricEvent(string executionId, ulong executionTimeSpan, ulong executionCount, string executionStage)
-            {
-                if (IsEnabled())
-                {
-                    WriteEvent(57906, executionId, executionTimeSpan, executionCount, executionStage);
-                }
-            }
-
             [Event(57907, Level = EventLevel.Informational, Channel = EventChannel.Operational)]
             public void RaiseMetricsPerFunctionEvent(string siteName, string functionName, ulong executionTimeInMs, ulong functionStartedCount, ulong functionCompletedCount, ulong functionFailedCount)
             {

src/WebJobs.Script.WebHost/Diagnostics/MetricsEventManager.cs

@@ -109,7 +109,6 @@ private class FunctionActivityTracker : IDisposable
         {
             private readonly string _executionId = Guid.NewGuid().ToString();
             private readonly object _functionMetricEventLockObject = new object();
-            private DateTime _startTime = DateTime.UtcNow;
             private ulong _totalExecutionCount = 0;
             private int _metricEventIntervalInSeconds;
             private CancellationTokenSource _etwTaskCancellationSource = new CancellationTokenSource();
@@ -132,7 +131,6 @@ internal FunctionActivityTracker(IMetricsEventGenerator generator, int metricEve
 
                                 if (currentSecond >= _metricEventIntervalInSeconds)
                                 {
-                                    RaiseMetricEtwEvent(ExecutionStage.InProgress);
                                     RaiseFunctionMetricEvents();
                                     currentSecond = 0;
                                 }
@@ -225,7 +223,6 @@ internal void StopEtwTaskAndRaiseFinishedEvent()
             {
                 _etwTaskCancellationSource.Cancel();
                 RaiseMetricsPerFunctionEvent();
-                RaiseMetricEtwEvent(ExecutionStage.Finished);
             }
 
             private void RaiseFunctionMetricEvents()
@@ -264,18 +261,6 @@ private void RaiseFunctionMetricEvent(RunningFunctionInfo runningFunctionInfo, i
                     runningFunctionInfo.Success);
             }
 
-            private void RaiseMetricEtwEvent(ExecutionStage executionStage)
-            {
-                var timeSpan = (ulong)(DateTime.UtcNow - _startTime).TotalMilliseconds;
-                var executionCount = _totalExecutionCount;
-                WriteFunctionsMetricEvent(_executionId, timeSpan, executionCount, executionStage.ToString());
-            }
-
-            private void WriteFunctionsMetricEvent(string funcExecutionId, ulong executionTimeSpan, ulong executionCount, string executionStage)
-            {
-                MetricsEventGenerator.RaiseFunctionsMetricEvent(funcExecutionId, (long)executionTimeSpan, (long)executionCount, executionStage);
-            }
-
             private static string GetDictionaryKey(string name, Guid invocationId)
             {
                 return string.Format("{0}_{1}", name.ToString(), invocationId.ToString());