Revert "Hoist activity fields to the logging scope (#11211)"

This reverts commit f7a2d3c.

Author: shirhatti

src/Hosting/Hosting/src/Internal/ActivityExtensions.cs

@@ -69,7 +69,7 @@ public void BeginRequest(HttpContext httpContext, HostingApplication.Context con
                 // Scope may be relevant for a different level of logging, so we always create it
                 // see: https://github.com/aspnet/Hosting/pull/944
                 // Scope can be null if logging is not on.
-                context.Scope = _logger.RequestScope(httpContext, context.Activity);
+                context.Scope = _logger.RequestScope(httpContext, context.Activity.Id);
 
                 if (_logger.IsEnabled(LogLevel.Information))
                 {

src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Reflection;
 using Microsoft.AspNetCore.Http;
@@ -14,9 +13,9 @@ namespace Microsoft.AspNetCore.Hosting
 {
     internal static class HostingLoggerExtensions
     {
-        public static IDisposable RequestScope(this ILogger logger, HttpContext httpContext, Activity activity)
+        public static IDisposable RequestScope(this ILogger logger, HttpContext httpContext, string activityId)
         {
-            return logger.BeginScope(new HostingLogScope(httpContext, activity));
+            return logger.BeginScope(new HostingLogScope(httpContext, activityId));
         }
 
         public static void ApplicationError(this ILogger logger, Exception exception)
@@ -97,15 +96,15 @@ private class HostingLogScope : IReadOnlyList<KeyValuePair<string, object>>
         {
             private readonly string _path;
             private readonly string _traceIdentifier;
-            private readonly Activity _activity;
+            private readonly string _activityId;
 
             private string _cachedToString;
 
             public int Count
             {
                 get
                 {
-                    return 5;
+                    return 3;
                 }
             }
 
@@ -123,29 +122,20 @@ public KeyValuePair<string, object> this[int index]
                     }
                     else if (index == 2)
                     {
-                        return new KeyValuePair<string, object>("SpanId", _activity.GetSpanId());
-                    }
-                    else if (index == 3)
-                    {
-                        return new KeyValuePair<string, object>("TraceId", _activity.GetTraceId());
-                    }
-                    else if (index == 4)
-                    {
-                        return new KeyValuePair<string, object>("ParentId", _activity.GetParentId());
+                        return new KeyValuePair<string, object>("ActivityId", _activityId);
                     }
 
                     throw new ArgumentOutOfRangeException(nameof(index));
                 }
             }
 
-            public HostingLogScope(HttpContext httpContext, Activity activity)
+            public HostingLogScope(HttpContext httpContext, string activityId)
             {
                 _traceIdentifier = httpContext.TraceIdentifier;
                 _path = (httpContext.Request.PathBase.HasValue 
                          ? httpContext.Request.PathBase + httpContext.Request.Path 
                          : httpContext.Request.Path).ToString();
-
-                _activity = activity;
+                _activityId = activityId;
             }
 
             public override string ToString()
@@ -154,12 +144,10 @@ public override string ToString()
                 {
                     _cachedToString = string.Format(
                         CultureInfo.InvariantCulture,
-                        "RequestPath:{0} RequestId:{1}, SpanId:{2}, TraceId:{3}, ParentId:{4}",
+                        "RequestPath:{0} RequestId:{1}, ActivityId:{2}",
                         _path,
                         _traceIdentifier,
-                        _activity.GetSpanId(),
-                        _activity.GetTraceId(),
-                        _activity.GetParentId());
+                        _activityId);
                 }
 
                 return _cachedToString;