Merge branch 'main' into fix-prerelease-reference

open-telemetry · Nov 17, 2022 · 1a0377f · 1a0377f
2 parents 6f50de9 + 23dbc39
commit 1a0377f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Unreleased
 
+* Restore Activity.Current before all IIS Lifecycle events
+  ([#761](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/761))
+
 ## 1.0.0-rc9.6
 
 Released 2022-Sep-28

diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/TelemetryHttpModule.cs b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/TelemetryHttpModule.cs
@@ -84,12 +84,7 @@ private void Application_BeginRequest(object sender, EventArgs e)
     private void OnExecuteRequestStep(HttpContextBase context, Action step)
     {
         // Called only on 4.7.1+ runtimes
-
-        if (context.CurrentNotification == RequestNotification.ExecuteRequestHandler && !context.IsPostNotification)
-        {
-            ActivityHelper.RestoreContextIfNeeded(context.ApplicationInstance.Context);
-        }
-
+        ActivityHelper.RestoreContextIfNeeded(context.ApplicationInstance.Context);
         step();
     }