[aspnet] Fix AspNet rules in CI and issues introduced on latest PR (open-telemetry#1829)

Author: CodeBlanch

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
           code: ['**.cs', '**.csproj', '.editorconfig']
           aot: ['src/OpenTelemetry.Extensions.Enrichment/**']
           aottestapp: ['test/OpenTelemetry.AotCompatibility.TestApp/**']
-          aspnet: ['*/OpenTelemetry.Instrumentation.AspNet.*/**', 'examples/AspNet/**', '!**/*.md']
+          aspnet: ['*/OpenTelemetry.Instrumentation.AspNet/**', '*/OpenTelemetry.Instrumentation.OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/**', 'examples/AspNet/**', '!**/*.md']
           aspnetcore: ['*/OpenTelemetry.Instrumentation.AspNetCore*/**', '!**/*.md']
           aws: ['*/OpenTelemetry.*.AWS*/**', '!**/*.md']
           azure: ['*/OpenTelemetry.ResourceDetectors.Azure*/**', '!**/*.md']

test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInListenerTests.cs

@@ -89,7 +89,34 @@ public void AspNetRequestsAreCollectedSuccessfully(
                                return httpContext.Request.Path != filter;
                            };
 
-                           options.Enrich = GetEnrichmentAction(setStatusToErrorInEnrich ? ActivityStatusCode.Error : default);
+                           options.EnrichWithHttpRequest = (activity, request) =>
+                           {
+                               Assert.NotNull(activity);
+                               Assert.NotNull(request);
+
+                               Assert.True(activity.IsAllDataRequested);
+                           };
+
+                           options.EnrichWithHttpResponse = (activity, response) =>
+                           {
+                               Assert.NotNull(activity);
+                               Assert.NotNull(response);
+
+                               Assert.True(activity.IsAllDataRequested);
+
+                               if (setStatusToErrorInEnrich)
+                               {
+                                   activity.SetStatus(ActivityStatusCode.Error);
+                               }
+                           };
+
+                           options.EnrichWithException = (activity, exception) =>
+                           {
+                               Assert.NotNull(activity);
+                               Assert.NotNull(exception);
+
+                               Assert.True(activity.IsAllDataRequested);
+                           };
 
                            options.RecordException = recordException;
                        })
@@ -255,35 +282,6 @@ public void ExtractContextIrrespectiveOfTheFilterApplied()
         Assert.True(isPropagatorCalled);
     }
 
-    private static Action<Activity, string, object> GetEnrichmentAction(ActivityStatusCode statusToBeSet)
-    {
-        void EnrichAction(Activity activity, string method, object obj)
-        {
-            Assert.True(activity.IsAllDataRequested);
-            switch (method)
-            {
-                case "OnStartActivity":
-                    Assert.True(obj is HttpRequest);
-                    break;
-
-                case "OnStopActivity":
-                    Assert.True(obj is HttpResponse);
-                    if (statusToBeSet != default)
-                    {
-                        activity.SetStatus(statusToBeSet);
-                    }
-
-                    break;
-
-                case "OnException":
-                    Assert.True(obj is Exception);
-                    break;
-            }
-        }
-
-        return EnrichAction;
-    }
-
     private class TestSampler(SamplingDecision samplingDecision) : Sampler
     {
         private readonly SamplingDecision samplingDecision = samplingDecision;

test/OpenTelemetry.Instrumentation.AspNet.Tests/HttpInMetricsListenerTests.cs

@@ -51,13 +51,10 @@ public void AspNetMetricTagsAreCollectedSuccessfully(
         // as it is created using ActivitySource inside TelemetryHttpModule
         // TODO: This should not be needed once the dependency on activity is removed from metrics
         using var tracerProvider = Sdk.CreateTracerProviderBuilder()
-            .AddAspNetInstrumentation(opts => opts.Enrich
-                = (activity, eventName, rawObject) =>
+            .AddAspNetInstrumentation(opts => opts.EnrichWithHttpResponse
+                = (activity, response) =>
                 {
-                    if (eventName.Equals("OnStopActivity"))
-                    {
-                        duration = activity.Duration.TotalSeconds;
-                    }
+                    duration = activity.Duration.TotalSeconds;
                 })
             .Build();