simplify

Author: trask

instrumentation/camel-2.20/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/camel/v2_20/TwoServicesWithDirectClientCamelTest.java

@@ -26,14 +26,14 @@
 import com.google.common.collect.ImmutableMap;
 import io.opentelemetry.api.trace.SpanKind;
 import io.opentelemetry.instrumentation.test.utils.PortUtils;
+import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.instrumentation.testing.junit.http.AbstractHttpServerUsingTest;
 import io.opentelemetry.instrumentation.testing.junit.http.HttpServerInstrumentationExtension;
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -45,6 +45,8 @@ class TwoServicesWithDirectClientCamelTest
   @RegisterExtension
   static final InstrumentationExtension testing = HttpServerInstrumentationExtension.forAgent();
 
+  @RegisterExtension static final AutoCleanupExtension cleanup = AutoCleanupExtension.create();
+
   private static CamelContext clientContext;
 
   private static Integer portOne;
@@ -74,14 +76,7 @@ protected String getContextPath() {
   @BeforeAll
   protected void setUp() {
     startServer();
-  }
-
-  @AfterAll
-  protected void cleanUp() throws Exception {
-    cleanupServer();
-    if (clientContext != null) {
-      clientContext.stop();
-    }
+    cleanup.deferAfterAll(this::cleanupServer);
   }
 
   void createAndStartClient() throws Exception {
@@ -97,6 +92,7 @@ public void configure() {
           }
         });
     clientContext.start();
+    cleanup.deferAfterAll(clientContext::stop);
   }
 
   @Test