Merge pull request #3474 from mikem8361/release/stable

Merge some main commits into release/stable
dotnet · Oct 19, 2022 · ca25fd4 · ca25fd4
2 parents 668845a + 499e9f3
commit ca25fd4
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 43 deletions.
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -47,7 +47,7 @@
     <MicrosoftBclAsyncInterfacesVersion>1.1.0</MicrosoftBclAsyncInterfacesVersion>
     <MicrosoftDiagnosticsRuntimeVersion>2.2.332302</MicrosoftDiagnosticsRuntimeVersion>
     <MicrosoftDiaSymReaderNativePackageVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativePackageVersion>
-    <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.76</MicrosoftDiagnosticsTracingTraceEventVersion>
+    <MicrosoftDiagnosticsTracingTraceEventVersion>2.0.64</MicrosoftDiagnosticsTracingTraceEventVersion>
     <!-- Use pinned version to avoid picking up latest (which doesn't support netcoreapp3.1) during source-build -->
     <MicrosoftExtensionsLoggingPinnedVersion>2.1.1</MicrosoftExtensionsLoggingPinnedVersion>
     <!-- Need version that understands UseAppFilters sentinel. -->

diff --git a/...rosoft.Diagnostics.Monitoring.EventPipe/Configuration/AspNetTriggerSourceConfiguration.cs b/...rosoft.Diagnostics.Monitoring.EventPipe/Configuration/AspNetTriggerSourceConfiguration.cs
@@ -23,27 +23,6 @@ public AspNetTriggerSourceConfiguration(float? heartbeatIntervalSeconds = null)
             _heartbeatIntervalSeconds = heartbeatIntervalSeconds;
         }
 
-        /// <summary>
-        /// Filter string for trigger data. Note that even though some triggers use start OR stop,
-        /// collecting just one causes unusual behavior in data collection.
-        /// </summary>
-        /// <remarks>
-        /// IMPORTANT! We rely on these transformations to make sure we can access relevant data
-        /// by index. The order must match the data extracted in the triggers.
-        /// </remarks>
-        private const string DiagnosticFilterString =
-                "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.HttpRequestIn.Start@Activity1Start:-" +
-                    "ActivityId=*Activity.Id" +
-                    ";Request.Path" +
-                    ";ActivityStartTime=*Activity.StartTimeUtc.Ticks" +
-                    "\r\n" +
-                "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.HttpRequestIn.Stop@Activity1Stop:-" +
-                    "ActivityId=*Activity.Id" +
-                    ";Request.Path" +
-                    ";Response.StatusCode" +
-                    ";ActivityDuration=*Activity.Duration.Ticks" +
-                    "\r\n";
-
         public override IList<EventPipeProvider> GetProviders()
         {
             if (_heartbeatIntervalSeconds.HasValue)
@@ -62,7 +41,7 @@ public override IList<EventPipeProvider> GetProviders()
                         eventLevel: EventLevel.Verbose,
                         arguments: new Dictionary<string,string>
                         {
-                            { "FilterAndPayloadSpecs", DiagnosticFilterString }
+                            { "FilterAndPayloadSpecs", HttpRequestSourceConfiguration.DiagnosticFilterString }
                         })
                 };
             }

diff --git a/...icrosoft.Diagnostics.Monitoring.EventPipe/Configuration/HttpRequestSourceConfiguration.cs b/...icrosoft.Diagnostics.Monitoring.EventPipe/Configuration/HttpRequestSourceConfiguration.cs
@@ -16,7 +16,10 @@ public HttpRequestSourceConfiguration()
             RequestRundown = true;
         }
 
-        private const string DiagnosticFilterString =
+        // This string is shared between HttpRequestSourceConfiguration and AspNetTriggerSourceConfiguration
+        // due to an issue that causes the FilterAndPayloadSpecs to be overwritten but never reverted.
+        // This caused http traces to interfere with AspNet* triggers due to having different arguments.
+        internal const string DiagnosticFilterString =
                 "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.HttpRequestIn.Start@Activity1Start:-" +
                     "Request.Scheme" +
                     ";Request.Host" +
@@ -33,9 +36,10 @@ public HttpRequestSourceConfiguration()
                     ";ActivityIdFormat=*Activity.IdFormat" +
                 "\r\n" +
                 "Microsoft.AspNetCore/Microsoft.AspNetCore.Hosting.HttpRequestIn.Stop@Activity1Stop:-" +
-                    "Response.StatusCode" +
+                    "ActivityId=*Activity.Id" +
+                    ";Request.Path" +
+                    ";Response.StatusCode" +
                     ";ActivityDuration=*Activity.Duration.Ticks" +
-                    ";ActivityId=*Activity.Id" +
                 "\r\n" +
                 "HttpHandlerDiagnosticListener/System.Net.Http.HttpRequestOut@Event:-" +
                 "\r\n" +

diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Triggers/AspNet/AspNetTrigger.cs b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Triggers/AspNet/AspNetTrigger.cs
@@ -5,7 +5,6 @@
 using Microsoft.Diagnostics.Tracing;
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
@@ -17,6 +16,10 @@ namespace Microsoft.Diagnostics.Monitoring.EventPipe.Triggers.AspNet
     /// </summary>
     internal abstract class AspNetTrigger<TSettings> : ITraceEventTrigger where TSettings : AspNetTriggerSettings
     {
+        private const string ActivityId = "activityid";
+        private const string Path = "path";
+        private const string StatusCode = "statuscode";
+        private const string ActivityDuration = "activityduration";
         private const string Activity1Start = "Activity1/Start";
         private const string Activity1Stop = "Activity1/Stop";
         private static readonly Guid MicrosoftAspNetCoreHostingGuid = new Guid("{adb401e1-5296-51f8-c125-5fda75826144}");
@@ -61,16 +64,41 @@ public bool HasSatisfiedCondition(TraceEvent traceEvent)
             {
                 int? statusCode = null;
                 long? duration = null;
+                string activityId = string.Empty;
+                string path = string.Empty;
+
                 AspnetTriggerEventType eventType = AspnetTriggerEventType.Start;
 
                 System.Collections.IList arguments = (System.Collections.IList)traceEvent.PayloadValue(2);
-                string activityId = ExtractByIndex(arguments, 0);
-                string path = ExtractByIndex(arguments, 1);
+
+                foreach (var argument in arguments)
+                {
+                    if (argument is IEnumerable<KeyValuePair<string, object>> argumentsEnumerable)
+                    {
+                        string key = (string)argumentsEnumerable.First().Value;
+                        string value = (string)argumentsEnumerable.Last().Value;
+
+                        if (key.Equals(ActivityId, StringComparison.OrdinalIgnoreCase))
+                        {
+                            activityId = value;
+                        }
+                        else if (key.Equals(Path, StringComparison.OrdinalIgnoreCase))
+                        {
+                            path = value;
+                        }
+                        else if (key.Equals(StatusCode, StringComparison.OrdinalIgnoreCase))
+                        {
+                            statusCode = int.Parse(value);
+                        }
+                        else if (key.Equals(ActivityDuration, StringComparison.OrdinalIgnoreCase))
+                        {
+                            duration = long.Parse(value);
+                        }
+                    }
+                }
 
                 if (traceEvent.EventName == Activity1Stop)
                 {
-                    statusCode = int.Parse(ExtractByIndex(arguments, 2));
-                    duration = long.Parse(ExtractByIndex(arguments, 3));
                     eventType = AspnetTriggerEventType.Stop;
 
                     Debug.Assert(statusCode != null, "Status code cannot be null.");
@@ -82,7 +110,6 @@ public bool HasSatisfiedCondition(TraceEvent traceEvent)
 
             //Heartbeat only
             return HasSatisfiedCondition(timeStamp, eventType: AspnetTriggerEventType.Heartbeat, activityId: null, path: null, statusCode: null, duration: null);
-
         }
 
         /// <summary>
@@ -111,17 +138,6 @@ internal bool HasSatisfiedCondition(DateTime timestamp, AspnetTriggerEventType e
             }
             return false;
         }
-
-        private static string ExtractByIndex(System.Collections.IList arguments, int index)
-        {
-            IEnumerable<KeyValuePair<string, object>> values = (IEnumerable<KeyValuePair<string, object>>)arguments[index];
-            //The data is internally organized as two KeyValuePair entries,
-            //The first entry is { Key, "KeyValue"}
-            //The second is { Value, "Value"}
-            //e.g.
-            //{{ Key:"StatusCode", Value:"200" }}
-            return (string)values.Last().Value;
-        }
     }
 
     internal enum AspnetTriggerEventType