switch back to ctx.items

src/OpenTelemetry.Instrumentation.AspNetCore/Implementation/HttpInMetricsListener.cs

@@ -39,6 +39,8 @@ internal sealed class HttpInMetricsListener : ListenerHandler
     private const string EventName = "OnStopActivity";
     private const string NetworkProtocolName = "http";
     private static readonly PropertyFetcher<Exception> ExceptionPropertyFetcher = new("Exception");
+    private static readonly PropertyFetcher<HttpContext> HttpContextPropertyFetcher = new("HttpContext");
+    private static readonly object ErrorTypeHttpContextItemsKey = new();
 
     private readonly Meter meter;
     private readonly AspNetCoreMetricsInstrumentationOptions options;
@@ -102,13 +104,13 @@ public override void OnEventWritten(string name, object payload)
     public void OnExceptionEventWritten(string name, object payload)
     {
         // We need to use reflection here as the payload type is not a defined public type.
-        if (!TryFetchException(payload, out Exception exc))
+        if (!TryFetchException(payload, out Exception exc) || !TryFetchHttpContext(payload, out HttpContext ctx))
         {
             AspNetCoreInstrumentationEventSource.Log.NullPayload(nameof(HttpInMetricsListener), nameof(this.OnExceptionEventWritten), HttpServerDurationMetricName);
             return;
         }
 
-        Activity.Current.SetCustomProperty(SemanticConventions.AttributeErrorType, exc.GetType().FullName);
+        ctx.Items.Add(ErrorTypeHttpContextItemsKey, exc.GetType().FullName);
 
         // See https://github.com/dotnet/aspnetcore/blob/690d78279e940d267669f825aa6627b0d731f64c/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs#L252
         // and https://github.com/dotnet/aspnetcore/blob/690d78279e940d267669f825aa6627b0d731f64c/src/Middleware/Diagnostics/src/DeveloperExceptionPage/DeveloperExceptionPageMiddlewareImpl.cs#L174
@@ -118,6 +120,11 @@ public void OnExceptionEventWritten(string name, object payload)
 #endif
         static bool TryFetchException(object payload, out Exception exc)
             => ExceptionPropertyFetcher.TryFetch(payload, out exc) && exc != null;
+#if NET6_0_OR_GREATER
+        [UnconditionalSuppressMessage("Trimming", "IL2026", Justification = "The ASP.NET Core framework guarantees that top level properties are preserved")]
+#endif
+        static bool TryFetchHttpContext(object payload, out HttpContext ctx)
+            => HttpContextPropertyFetcher.TryFetch(payload, out ctx) && ctx != null;
     }
 
     public void OnEventWritten_Old(string name, object payload)
@@ -171,7 +178,6 @@ public void OnEventWritten_Old(string name, object payload)
 
     public void OnEventWritten_New(string name, object payload)
     {
-        var activity = Activity.Current;
         var context = payload as HttpContext;
         if (context == null)
         {
@@ -212,15 +218,14 @@ public void OnEventWritten_New(string name, object payload)
             tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeHttpRoute, route));
         }
 #endif
-        var errorType = activity.GetCustomProperty(SemanticConventions.AttributeErrorType);
-        if (errorType != null)
+        if (context.Items.TryGetValue(ErrorTypeHttpContextItemsKey, out var errorType))
         {
             tags.Add(new KeyValuePair<string, object>(SemanticConventions.AttributeErrorType, errorType));
         }
 
         // We are relying here on ASP.NET Core to set duration before writing the stop event.
         // https://github.com/dotnet/aspnetcore/blob/d6fa351048617ae1c8b47493ba1abbe94c3a24cf/src/Hosting/Hosting/src/Internal/HostingApplicationDiagnostics.cs#L449
         // TODO: Follow up with .NET team if we can continue to rely on this behavior.
-        this.httpServerRequestDuration.Record(activity.Duration.TotalSeconds, tags);
+        this.httpServerRequestDuration.Record(Activity.Current.Duration.TotalSeconds, tags);
     }
 }