Temporarily disabling ServicePointManager usage

newrelic · Sep 16, 2024 · c94a0e1 · c94a0e1
1 parent cfa5adb
commit c94a0e1
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 2 deletions.
diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/Program.cs
@@ -49,11 +49,13 @@ public static IWebHost BuildWebHost(string[] args) =>
         /// </summary>
         private static void OverrideSslSettingsForMockNewRelic()
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.ServerCertificateValidationCallback = delegate
             {
                 //force trust on all certificates for simplicity
                 return true;
             };
+#endif
         }
 
 

diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/Program.cs
@@ -46,11 +46,13 @@ public static IWebHost BuildWebHost(string[] args) =>
         /// </summary>
         private static void OverrideSslSettingsForMockNewRelic()
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.ServerCertificateValidationCallback = delegate
             {
                 //force trust on all certificates for simplicity
                 return true;
             };
+#endif
         }
     }
 }
diff --git a/.../Agent/IntegrationTests/Applications/BasicMvcApplication/Controllers/DefaultController.cs b/.../Agent/IntegrationTests/Applications/BasicMvcApplication/Controllers/DefaultController.cs
@@ -59,7 +59,9 @@ public void ThrowException()
         [HttpGet]
         public async Task<ActionResult> SimulateLostTransaction()
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+#endif
 
             using (var client = new HttpClient())
             {
@@ -99,7 +101,9 @@ public async Task<string> HttpClient()
         [HttpGet]
         public async Task<string> HttpClientTaskCancelled()
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
+#endif
 
             try
             {

diff --git a/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/Global.asax.cs b/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/Global.asax.cs
@@ -44,11 +44,13 @@ protected void Application_BeginRequest(object sender, EventArgs e)
         /// </summary>
         private static void OverrideSslSettingsForMockNewRelic()
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.ServerCertificateValidationCallback = delegate
             {
                 //force trust on all certificates for simplicity
                 return true;
             };
+#endif
         }
     }
 }
diff --git a/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/Program.cs b/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/Program.cs
@@ -19,12 +19,13 @@ class Program
 
         static void Main(string[] args)
         {
+#if !NET9_0_OR_GREATER
             ServicePointManager.ServerCertificateValidationCallback = delegate
             {
                 //force trust on all certificates for simplicity
                 return true;
             };
-
+#endif
             _applicationName =
                 Path.GetFileNameWithoutExtension(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath) + ".exe";
 

diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/MockNewRelicFixture.cs
@@ -49,13 +49,14 @@ public MockNewRelicFixture(RemoteApplication remoteApplication) : base(remoteApp
                     MockNewRelicApplication.CopyToRemote();
                     MockNewRelicApplication.Start(string.Empty, environmentVariables, doProfile: false);
 
+#if !NET9_0_OR_GREATER
                     ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
                     ServicePointManager.ServerCertificateValidationCallback = delegate
                     {
                         //force trust on all certificates for simplicity
                         return true;
                     };
-
+#endif
                     //Core apps need the collector warmed up before the core app is started so we cannot
                     //wait until exerciseApplication is called to call these methods
                     WarmUpCollector();