Code style: no multi catch in tests

Author: trask

.github/agents/knowledge/testing-general-patterns.md

@@ -10,6 +10,13 @@
 - JUnit 5, AssertJ assertions (not JUnit `assertEquals`/`assertTrue`).
 - Test classes and methods should be package-private (no `public`).
 
+## Catch Style
+
+- When multiple caught exceptions in a test have identical handling, prefer a single
+  catch of their nearest common parent type instead of a multi-catch.
+- This preference applies even when the nearest common parent is `Exception` or
+  `Throwable`.
+
 ## Span Attribute Assertions
 
 - Use `span.hasAttributesSatisfyingExactly(...)` with `equalTo(...)`/`satisfies(...)` for

examples/distro/smoke-tests/src/test/java/com/example/javaagent/smoketest/SmokeTest.java

@@ -9,9 +9,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toList;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.trace.v1.Span;
@@ -163,7 +161,7 @@ protected Collection<ExportTraceServiceRequest> waitForTraces()
               // TODO: Register parser into object mapper to avoid de -> re -> deserialize.
               try {
                 JsonFormat.parser().merge(OBJECT_MAPPER.writeValueAsString(it), builder);
-              } catch (InvalidProtocolBufferException | JsonProcessingException e) {
+              } catch (IOException e) {
                 e.printStackTrace();
               }
               return builder.build();

examples/extension/src/test/java/com/example/javaagent/smoketest/IntegrationTest.java

@@ -9,9 +9,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.stream.Collectors.toList;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.util.JsonFormat;
 import io.opentelemetry.proto.collector.trace.v1.ExportTraceServiceRequest;
 import io.opentelemetry.proto.trace.v1.Span;
@@ -189,7 +187,7 @@ protected Collection<ExportTraceServiceRequest> waitForTraces()
               ExportTraceServiceRequest.Builder builder = ExportTraceServiceRequest.newBuilder();
               try {
                 JsonFormat.parser().merge(OBJECT_MAPPER.writeValueAsString(it), builder);
-              } catch (InvalidProtocolBufferException | JsonProcessingException e) {
+              } catch (IOException e) {
                 e.printStackTrace();
               }
               return builder.build();

instrumentation/hystrix-1.4/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/hystrix/HystrixTest.java

@@ -21,7 +21,6 @@
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
 import io.opentelemetry.sdk.trace.data.StatusData;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.function.Function;
 import java.util.stream.Stream;
@@ -133,7 +132,7 @@ private static Stream<Arguments> provideCommandActionArguments() {
                     cmd -> {
                       try {
                         return cmd.queue().get();
-                      } catch (InterruptedException | ExecutionException e) {
+                      } catch (Exception e) {
                         throw new RuntimeException(e);
                       }
                     })),

instrumentation/jaxrs-client/jaxrs-client-2.0-testing/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxrsclient/ResteasySingleConnection.java

@@ -9,9 +9,7 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import io.opentelemetry.instrumentation.testing.junit.http.SingleConnection;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Map;
 import java.util.Objects;
@@ -44,7 +42,7 @@ public int doRequest(String path, Map<String, String> headers) throws ExecutionE
     URI uri;
     try {
       uri = new URL("http", host, port, path).toURI();
-    } catch (MalformedURLException | URISyntaxException e) {
+    } catch (Exception e) {
       throw new ExecutionException(e);
     }
 

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/internal/engine/MetricAggregationTest.java

@@ -22,8 +22,7 @@
 import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanRegistrationException;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.MBeanServerFactory;
 import javax.management.MalformedObjectNameException;
@@ -85,7 +84,7 @@ void after() throws Exception {
             instance -> {
               try {
                 theServer.unregisterMBean(instance.getObjectName());
-              } catch (InstanceNotFoundException | MBeanRegistrationException e) {
+              } catch (JMException e) {
                 throw new RuntimeException(e);
               }
             });

instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TargetSystemTest.java

@@ -35,7 +35,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.LinkedBlockingDeque;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -115,7 +114,7 @@ private static void stop(GenericContainer<?> container) {
   static void afterAll() {
     try {
       otlpServer.stop().get();
-    } catch (InterruptedException | ExecutionException e) {
+    } catch (Exception e) {
       throw new RuntimeException(e);
     }
   }

instrumentation/log4j/log4j-appender-1.2/javaagent/src/test/java/io/opentelemetry/instrumentation/log4j/appender/v1_2/Log4j1Test.java

@@ -49,7 +49,7 @@ class Log4j1Test {
       Field java1 = Loader.class.getDeclaredField("java1");
       java1.setAccessible(true);
       java1.set(null, false);
-    } catch (NoSuchFieldException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException e) {
       throw new RuntimeException(e);
     }
   }

instrumentation/reactor/reactor-3.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/reactor/v3_1/ContextPropagationOperatorInstrumentationTest.java

@@ -40,12 +40,12 @@ private static MethodHandle getContextWriteMethod(Class<?> type) {
     MethodHandles.Lookup lookup = MethodHandles.publicLookup();
     try {
       return lookup.findVirtual(type, "contextWrite", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException e) {
       // ignore
     }
     try {
       return lookup.findVirtual(type, "subscriberContext", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException e) {
       // ignore
     }
     return null;

instrumentation/reactor/reactor-3.1/library/src/test/java/io/opentelemetry/instrumentation/reactor/v3_1/ReactorCoreTest.java

@@ -53,12 +53,12 @@ private static MethodHandle getContextWriteMethod(Class<?> type) {
     MethodHandles.Lookup lookup = MethodHandles.publicLookup();
     try {
       return lookup.findVirtual(type, "contextWrite", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException e) {
       // ignore
     }
     try {
       return lookup.findVirtual(type, "subscriberContext", methodType(type, Function.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (ReflectiveOperationException e) {
       throw new RuntimeException(e);
     }
   }
@@ -540,10 +540,10 @@ private static <T> Flux<T> retryWhen(Flux<T> flux) {
       Method retryWhenMethod = Flux.class.getMethod("retryWhen", retryClass);
       Method retrySpecMethod = retryClass.getMethod("indefinitely");
       return (Flux<T>) retryWhenMethod.invoke(flux, retrySpecMethod.invoke(retryClass));
-    } catch (ClassNotFoundException | NoSuchMethodException exception) {
+    } catch (ReflectiveOperationException e) {
       // ignore
-    } catch (Exception exception) {
-      throw new IllegalStateException(exception);
+    } catch (Exception e) {
+      throw new IllegalStateException(e);
     }
     throw new IllegalStateException("Could not find retryWhen method");
   }