review

Author: trask

.github/agents/knowledge/general-rules.md

@@ -17,7 +17,7 @@ When a "Knowledge File" is listed, load it from `knowledge/` before reviewing th
 | Style | Style guide | Always | — |
 | Style | Uppercase field names should reflect semantic constants, not simply `static final` | Always | — |
 | Naming | Getter naming (`get` / `is`) | Always | — |
-| Style | Prefer `e` for used exceptions, prefer `f` for used exceptions in nested catch clauses when an outer catch already uses `e`, allow `error` for specific `*Error` catch types, prefer `t` for used `Throwable` values, and `ignored` for intentionally unused catch parameters | Catch clauses, `Throwable` params | — |
+| Style | Prefer `e` for used exceptions, prefer `f` for used exceptions in nested catch clauses when an outer catch already uses `e`, allow `error` for specific `*Error` catch types, prefer `t` for used `Throwable` values, prefer `ignored` for intentionally unused catch parameters, and use `ignore` for nested intentionally unused catch parameters when `ignored` would shadow an outer catch variable | Catch clauses, `Throwable` params | — |
 | Naming | Module/package naming | New or renamed modules/packages | `module-naming.md` |
 | Javaagent | Advice patterns | `@Advice` classes | `javaagent-advice-patterns.md` |
 | Javaagent | Module structure patterns | `InstrumentationModule`, `TypeInstrumentation`, `Singletons` | `javaagent-module-patterns.md` |
@@ -107,6 +107,13 @@ Prefer `t` for used `Throwable` values, including `catch (Throwable t)` and
 
 If a catch parameter is intentionally unused, prefer `ignored` over `ignore`.
 
+For nested catch clauses, if `ignored` would shadow an outer catch variable,
+prefer `ignore` for the inner intentionally unused catch parameter.
+
+Both `ignored` and `ignore` are recognized by IntelliJ's `CatchMayIgnoreException`
+inspection as intentional unused-catch names. In test sources, IntelliJ also
+recognizes `expected` and `ok`.
+
 ## [Style] Prefer Instance Creation Over Singletons
 
 Stateless implementations of telemetry interfaces — `TextMapGetter`, `TextMapSetter`,

instrumentation/opentelemetry-instrumentation-annotations-1.16/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/instrumentationannotations/AnnotationSingletons.java

@@ -48,7 +48,7 @@ private static MethodHandle findInheritContextMethodHandle() {
               application.io.opentelemetry.instrumentation.annotations.WithSpan.class,
               "inheritContext",
               MethodType.methodType(boolean.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       return null;
     }
   }
@@ -146,7 +146,7 @@ private static boolean inheritContextFromMethod(Method method) {
             application.io.opentelemetry.instrumentation.annotations.WithSpan.class);
     try {
       return (boolean) INHERIT_CONTEXT_METHOD_HANDLE.invoke(annotation);
-    } catch (Throwable e) {
+    } catch (Throwable ignored) {
       return true;
     }
   }

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/MessageAttributesAccessor.java

@@ -32,11 +32,11 @@ private static MethodHandle findGetAttributes() {
     MethodHandles.Lookup lookup = MethodHandles.lookup();
     try {
       return lookup.findVirtual(Message.class, "getAttributes", methodType(Map.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // changed the return type to ConcurrentMap in version 2.1
       try {
         return lookup.findVirtual(Message.class, "getAttributes", methodType(ConcurrentMap.class));
-      } catch (NoSuchMethodException | IllegalAccessException f) {
+      } catch (NoSuchMethodException | IllegalAccessException ignore) {
         return null;
       }
     }
@@ -48,10 +48,10 @@ private static MethodHandle findSetValue() {
     try {
       // changed the generic bound to NamedValue in version 2.1; earlier than that it's Parameter
       setValueReturnType = Class.forName("org.restlet.util.NamedValue");
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException ignored) {
       try {
         setValueReturnType = Class.forName("org.restlet.data.Parameter");
-      } catch (ClassNotFoundException f) {
+      } catch (ClassNotFoundException ignore) {
         return null;
       }
     }
@@ -60,7 +60,7 @@ private static MethodHandle findSetValue() {
       return MethodHandles.lookup()
           .findVirtual(
               Series.class, "set", methodType(setValueReturnType, String.class, String.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       return null;
     }
   }
@@ -70,11 +70,11 @@ private static Class<?> findHeaderClass() {
     try {
       // restlet 2.3+
       return Class.forName("org.restlet.data.Header");
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException ignored) {
       try {
         // restlet 2.1-2.2
         return Class.forName("org.restlet.engine.header.Header");
-      } catch (ClassNotFoundException f) {
+      } catch (ClassNotFoundException ignore) {
         // restlet 2.0 does not have Header
         return null;
       }
@@ -90,7 +90,7 @@ private static MethodHandle findNewSeries() {
       // restlet 2.1+ Series has different constructor
       return MethodHandles.lookup()
           .findConstructor(Series.class, methodType(void.class, Class.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       return null;
     }
   }

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/RestletHeadersGetter.java

@@ -30,12 +30,12 @@ private static MethodHandle findGetAttributes() {
     MethodHandles.Lookup lookup = MethodHandles.lookup();
     try {
       return lookup.findVirtual(Message.class, "getAttributes", MethodType.methodType(Map.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       // changed the return type to ConcurrentMap in version 2.1
       try {
         return lookup.findVirtual(
             Message.class, "getAttributes", MethodType.methodType(ConcurrentMap.class));
-      } catch (NoSuchMethodException | IllegalAccessException f) {
+      } catch (NoSuchMethodException | IllegalAccessException ignore) {
         return null;
       }
     }

instrumentation/restlet/restlet-2.0/library/src/main/java/io/opentelemetry/instrumentation/restlet/v2_0/internal/ServerCallAccess.java

@@ -23,11 +23,11 @@ final class ServerCallAccess {
   private static Class<?> findHttpRequestClass() {
     try {
       return Class.forName("org.restlet.engine.http.HttpRequest");
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException ignored) {
       // moved to another package in version 2.4
       try {
         return Class.forName("org.restlet.engine.adapter.HttpRequest");
-      } catch (ClassNotFoundException f) {
+      } catch (ClassNotFoundException ignore) {
         return null;
       }
     }
@@ -37,11 +37,11 @@ private static Class<?> findHttpRequestClass() {
   private static Class<?> findServerCallClass() {
     try {
       return Class.forName("org.restlet.engine.http.ServerCall");
-    } catch (ClassNotFoundException e) {
+    } catch (ClassNotFoundException ignored) {
       // moved to another package in version 2.4
       try {
         return Class.forName("org.restlet.engine.adapter.ServerCall");
-      } catch (ClassNotFoundException f) {
+      } catch (ClassNotFoundException ignore) {
         return null;
       }
     }
@@ -55,7 +55,7 @@ private static MethodHandle findGetHttpCall() {
     try {
       return MethodHandles.publicLookup()
           .findVirtual(HTTP_REQUEST_CLASS, "getHttpCall", methodType(SERVER_CALL_CLASS));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       return null;
     }
   }
@@ -68,7 +68,7 @@ private static MethodHandle findGetServerAddress() {
     try {
       return MethodHandles.publicLookup()
           .findVirtual(SERVER_CALL_CLASS, "getServerAddress", methodType(String.class));
-    } catch (NoSuchMethodException | IllegalAccessException e) {
+    } catch (NoSuchMethodException | IllegalAccessException ignored) {
       return null;
     }
   }
@@ -84,7 +84,7 @@ static String getServerAddress(Request request) {
     }
     try {
       return (String) GET_SERVER_ADDRESS.invoke(call);
-    } catch (Throwable e) {
+    } catch (Throwable ignored) {
       return null;
     }
   }
@@ -97,7 +97,7 @@ private static Object serverCall(Request request) {
     if (HTTP_REQUEST_CLASS.isInstance(request)) {
       try {
         return GET_HTTP_CALL.invoke(request);
-      } catch (Throwable e) {
+      } catch (Throwable ignored) {
         return null;
       }
     }