Fix SendAsync_ExpectedDiagnosticSourceActivityLogging test (#19796)

* Fix SendAsync_ExpectedDiagnosticSourceActivityLogging failed after #19689

* Address PR feedback

* Dispose response in all tests

Author: Liudmila Molkova

src/System.Net.Http/tests/FunctionalTests/DiagnosticsTests.cs

@@ -91,7 +91,7 @@ public void SendAsync_ExpectedDiagnosticSourceLogging()
                     diagnosticListenerObserver.Enable( s => !s.Contains("HttpRequestOut"));
                     using (var client = new HttpClient())
                     {
-                        var response = client.GetAsync(Configuration.Http.RemoteEchoServer).Result;
+                        client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose();
                     }
 
                     Assert.True(requestLogged, "Request was not logged.");
@@ -150,10 +150,11 @@ public void SendAsync_ExpectedDiagnosticSourceNoLogging()
                         {
                             Task<List<string>> requestLines = LoopbackServer.AcceptSocketAsync(server,
                                     (s, stream, reader, writer) => LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer));
-                            Task response = client.GetAsync(url);
+                            Task<HttpResponseMessage> response = client.GetAsync(url);
                             await Task.WhenAll(response, requestLines);
 
                             AssertNoHeadersAreInjected(requestLines.Result);
+                            response.Result.Dispose();
                         }).Wait();
                     }
 
@@ -303,7 +304,6 @@ public void SendAsync_ExpectedDiagnosticCancelledLogging()
 
         [OuterLoop] // TODO: Issue #11345
         [Fact]
-        [ActiveIssue(19689)]
         public void SendAsync_ExpectedDiagnosticSourceActivityLogging()
         {
             RemoteInvoke(() =>
@@ -351,17 +351,18 @@ public void SendAsync_ExpectedDiagnosticSourceActivityLogging()
 
                 using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver))
                 {
-                    diagnosticListenerObserver.Enable();
+                    diagnosticListenerObserver.Enable(s => s.Contains("HttpRequestOut"));
                     using (var client = new HttpClient())
                     {
                         LoopbackServer.CreateServerAsync(async (server, url) =>
                         {
                             Task<List<string>> requestLines = LoopbackServer.AcceptSocketAsync(server,
                                 (s, stream, reader, writer) => LoopbackServer.ReadWriteAcceptedAsync(s, reader, writer));
-                            Task response = client.GetAsync(url);
+                            Task<HttpResponseMessage> response = client.GetAsync(url);
                             await Task.WhenAll(response, requestLines);
 
                             AssertHeadersAreInjected(requestLines.Result, parentActivity);
+                            response.Result.Dispose();
                         }).Wait();
                     }
 
@@ -407,7 +408,7 @@ public void SendAsync_ExpectedDiagnosticSourceUrlFilteredActivityLogging()
                     });
                     using (var client = new HttpClient())
                     {
-                        var response = client.GetAsync(Configuration.Http.RemoteEchoServer).Result;
+                        client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose();
                     }
                     Assert.False(activityStartLogged, "HttpRequestOut.Start was logged while URL disabled.");
                     // Poll with a timeout since logging response is not synchronized with returning a response.
@@ -465,6 +466,45 @@ public void SendAsync_ExpectedDiagnosticExceptionActivityLogging()
             }).Dispose();
         }
 
+        [OuterLoop] // TODO: Issue #11345
+        [Fact]
+        public void SendAsync_ExpectedDiagnosticSourceNewAndDeprecatedEventsLogging()
+        {
+            RemoteInvoke(() =>
+            {
+                bool requestLogged = false;
+                bool responseLogged = false;
+                bool activityStartLogged = false;
+                bool activityStopLogged = false;
+
+                var diagnosticListenerObserver = new FakeDiagnosticListenerObserver(kvp =>
+                {
+                    if (kvp.Key.Equals("System.Net.Http.Request")) { requestLogged = true; }
+                    else if (kvp.Key.Equals("System.Net.Http.Response")) { responseLogged = true; }
+                    else if (kvp.Key.Equals("System.Net.Http.HttpRequestOut.Start")) { activityStartLogged = true;}
+                    else if (kvp.Key.Equals("System.Net.Http.HttpRequestOut.Stop")) { activityStopLogged = true; }
+                });
+
+                using (DiagnosticListener.AllListeners.Subscribe(diagnosticListenerObserver))
+                {
+                    diagnosticListenerObserver.Enable();
+                    using (var client = new HttpClient())
+                    {
+                        client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose();
+                    }
+
+                    Assert.True(activityStartLogged, "HttpRequestOut.Start was not logged.");
+                    Assert.True(requestLogged, "Request was not logged.");
+                    // Poll with a timeout since logging response is not synchronized with returning a response.
+                    WaitForTrue(() => activityStopLogged, TimeSpan.FromSeconds(1), "HttpRequestOut.Stop was not logged within 1 second timeout.");
+                    Assert.True(responseLogged, "Response was not logged.");
+                    diagnosticListenerObserver.Disable();
+                }
+
+                return SuccessExitCode;
+            }).Dispose();
+        }
+
         [OuterLoop] // TODO: Issue #11345
         [Fact]
         public void SendAsync_ExpectedDiagnosticExceptionOnlyActivityLogging()
@@ -527,7 +567,7 @@ public void SendAsync_ExpectedDiagnosticStopOnlyActivityLogging()
                     diagnosticListenerObserver.Enable(s => s.Equals("System.Net.Http.HttpRequestOut"));
                     using (var client = new HttpClient())
                     {
-                        var response = client.GetAsync(Configuration.Http.RemoteEchoServer).Result;
+                        client.GetAsync(Configuration.Http.RemoteEchoServer).Result.Dispose();
                     }
                     // Poll with a timeout since logging response is not synchronized with returning a response.
                     WaitForTrue(() => activityStopLogged, TimeSpan.FromSeconds(1),