Re-add BouncyCastleThreadFilter

Signed-off-by: Craig Perkins <[email protected]>

Author: cwperks

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemKeyConfigTests.java

@@ -34,6 +34,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 import org.hamcrest.Matchers;
 

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemTrustConfigTests.java

@@ -34,6 +34,7 @@
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 import org.hamcrest.Matchers;
 

libs/ssl-config/src/test/java/org/opensearch/common/ssl/PemUtilsTests.java

@@ -36,6 +36,7 @@
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 
 import java.io.IOException;

libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslConfigurationLoaderTests.java

@@ -37,6 +37,7 @@
 import org.opensearch.common.settings.MockSecureSettings;
 import org.opensearch.common.settings.Settings;
 import org.opensearch.core.common.settings.SecureString;
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 
 import javax.net.ssl.KeyManagerFactory;

libs/ssl-config/src/test/java/org/opensearch/common/ssl/SslDiagnosticsTests.java

@@ -35,6 +35,7 @@
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
 
 import org.opensearch.common.Nullable;
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 import org.hamcrest.Matchers;
 

modules/reindex/src/test/java/org/opensearch/index/reindex/BouncyCastleThreadFilter.java

@@ -50,6 +50,7 @@
 import org.opensearch.core.common.bytes.BytesArray;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.watcher.ResourceWatcherService;
 import org.hamcrest.Matchers;

modules/reindex/src/test/java/org/opensearch/index/reindex/ReindexRestClientSslTests.java

@@ -8,6 +8,8 @@
 
 package org.opensearch.http.reactor.netty4.ssl;
 
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
+
 import org.apache.logging.log4j.message.ParameterizedMessage;
 import org.opensearch.common.network.NetworkAddress;
 import org.opensearch.common.network.NetworkService;
@@ -35,6 +37,7 @@
 import org.opensearch.rest.RestChannel;
 import org.opensearch.rest.RestRequest;
 import org.opensearch.telemetry.tracing.noop.NoopTracer;
+import org.opensearch.test.BouncyCastleThreadFilter;
 import org.opensearch.test.KeyStoreUtils;
 import org.opensearch.test.OpenSearchTestCase;
 import org.opensearch.test.rest.FakeRestRequest;
@@ -97,6 +100,7 @@
 /**
  * Tests for the secure {@link ReactorNetty4HttpServerTransport} class.
  */
+@ThreadLeakFilters(filters = BouncyCastleThreadFilter.class)
 public class SecureReactorNetty4HttpServerTransportTests extends OpenSearchTestCase {
 
     private NetworkService networkService;

plugins/transport-reactor-netty4/src/test/java/org/opensearch/http/reactor/netty4/ssl/SecureReactorNetty4HttpServerTransportTests.java

@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.common.ssl;
+package org.opensearch.test;
 
 import com.carrotsearch.randomizedtesting.ThreadFilter;
 

libs/ssl-config/src/test/java/org/opensearch/common/ssl/BouncyCastleThreadFilter.java renamed to test/framework/src/main/java/org/opensearch/test/BouncyCastleThreadFilter.java

@@ -354,7 +354,6 @@ private static void setTestSysProps() {
 
         // Enable Netty leak detection and monitor logger for logged leak errors
         System.setProperty("io.netty.leakDetection.level", "paranoid");
-        System.setProperty("org.bouncycastle.native.cleanup_delay", "0");
     }
 
     protected final Logger logger = LogManager.getLogger(getClass());