fix: use recursive exception logic

Author: diegomarquezp

gax-java/gax/src/main/java/com/google/api/gax/tracing/ErrorTypeUtil.java

@@ -30,14 +30,10 @@
 package com.google.api.gax.tracing;
 
 import com.google.api.gax.rpc.ApiException;
-import com.google.api.gax.rpc.WatchdogTimeoutException;
 import com.google.common.base.Strings;
-import java.net.ConnectException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.nio.channels.UnresolvedAddressException;
+import com.google.common.collect.ImmutableSet;
+import java.util.Set;
 import javax.annotation.Nullable;
-import javax.net.ssl.SSLHandshakeException;
 
 public class ErrorTypeUtil {
 
@@ -58,6 +54,26 @@ public String toString() {
     }
   }
 
+  private static final Set<String> JSON_DECODING_EXCEPTION_CLASS_NAMES =
+      ImmutableSet.of(
+          "com.google.gson.JsonSyntaxException",
+          "com.google.gson.JsonParseException",
+          "com.fasterxml.jackson.databind.JsonMappingException",
+          "com.fasterxml.jackson.core.JsonParseException");
+
+  private static final Set<String> AUTHENTICATION_EXCEPTION_CLASS_NAMES =
+      ImmutableSet.of("com.google.auth.oauth2.GoogleAuthException");
+
+  private static final Set<String> CLIENT_TIMEOUT_EXCEPTION_CLASS_NAMES =
+      ImmutableSet.of(
+          "java.net.SocketTimeoutException", "com.google.api.gax.rpc.WatchdogTimeoutException");
+  private static final Set<String> CLIENT_CONNECTION_EXCEPTIONS =
+      ImmutableSet.of(
+          "java.net.ConnectException",
+          "java.net.UnknownHostException",
+          "javax.net.ssl.SSLHandshakeException",
+          "java.nio.channels.UnresolvedAddressException");
+
   /**
    * Extracts a low-cardinality string representing the specific classification of the error to be
    * used in the {@link ObservabilityAttributes#ERROR_TYPE_ATTRIBUTE} attribute.
@@ -206,7 +222,7 @@ private static String getClientSideError(Throwable error) {
    * @return true if the error is a client timeout, false otherwise.
    */
   private static boolean isClientTimeout(Throwable e) {
-    return e instanceof SocketTimeoutException || e instanceof WatchdogTimeoutException;
+    return hasErrorNameInCauseChain(e, CLIENT_TIMEOUT_EXCEPTION_CLASS_NAMES);
   }
 
   /**
@@ -217,10 +233,7 @@ private static boolean isClientTimeout(Throwable e) {
    * @return true if the error is a client connection error, false otherwise.
    */
   private static boolean isClientConnectionError(Throwable e) {
-    return e instanceof ConnectException
-        || e instanceof UnknownHostException
-        || e instanceof SSLHandshakeException
-        || e instanceof UnresolvedAddressException;
+    return hasErrorNameInCauseChain(e, CLIENT_CONNECTION_EXCEPTIONS);
   }
 
   /**
@@ -231,9 +244,7 @@ private static boolean isClientConnectionError(Throwable e) {
    * @return true if the error is a client response decode error, false otherwise.
    */
   private static boolean isClientResponseDecodeError(Throwable e) {
-    return e.getClass().getName().contains("Json")
-        || e.getClass().getName().contains("Gson")
-        || (e.getCause() != null && e.getCause().getClass().getName().contains("Gson"));
+    return hasErrorNameInCauseChain(e, JSON_DECODING_EXCEPTION_CLASS_NAMES);
   }
 
   /**
@@ -255,7 +266,7 @@ private static boolean isClientRedirectError(Throwable e) {
    * @return true if the error is a client authentication error, false otherwise.
    */
   private static boolean isClientAuthenticationError(Throwable e) {
-    return e.getClass().getName().contains("GoogleAuthException");
+    return hasErrorNameInCauseChain(e, AUTHENTICATION_EXCEPTION_CLASS_NAMES);
   }
 
   /**
@@ -267,7 +278,7 @@ private static boolean isClientAuthenticationError(Throwable e) {
    * @return true if the error is a client request body error, false otherwise.
    */
   private static boolean isRequestBodyError(Throwable e) {
-    return e.getClass().getName().contains("RestSerializationException");
+    return hasErrorNameInCauseChain(e, ImmutableSet.of("RestSerializationException"));
   }
 
   /**
@@ -281,4 +292,22 @@ private static boolean isRequestBodyError(Throwable e) {
   private static boolean isClientUnknownError(Throwable e) {
     return e.getClass().getName().toLowerCase().contains("unknown");
   }
+
+  /**
+   * Recursively checks the throwable and its cause chain for any of the specified error name.
+   *
+   * @param t The Throwable to check.
+   * @param errorClassNames A set of fully qualified class names to check against.
+   * @return true if an error from the set is found in the cause chain, false otherwise.
+   */
+  private static boolean hasErrorNameInCauseChain(Throwable t, Set<String> errorClassNames) {
+    Throwable current = t;
+    while (current != null) {
+      if (errorClassNames.contains(current.getClass().getName())) {
+        return true;
+      }
+      current = current.getCause();
+    }
+    return false;
+  }
 }

gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerTest.java

@@ -210,21 +210,6 @@ void testAttemptFailed_clientConnectionError() {
     verify(attemptHandle).end();
   }
 
-  @Test
-  void testAttemptFailed_clientAuthenticationError() {
-    when(recorder.createSpan(eq(ATTEMPT_SPAN_NAME), anyMap())).thenReturn(attemptHandle);
-
-    tracer.attemptStarted(new Object(), 1);
-
-    tracer.attemptFailedRetriesExhausted(new TestGoogleAuthException());
-
-    verify(attemptHandle)
-        .addAttribute(
-            ObservabilityAttributes.ERROR_TYPE_ATTRIBUTE,
-            ErrorTypeUtil.ErrorType.CLIENT_AUTHENTICATION_ERROR.toString());
-    verify(attemptHandle).end();
-  }
-
   @Test
   void testAttemptFailed_clientResponseDecodeError() {
     when(recorder.createSpan(eq(ATTEMPT_SPAN_NAME), anyMap())).thenReturn(attemptHandle);
@@ -255,21 +240,6 @@ void testAttemptFailed_clientRedirectError() {
     verify(attemptHandle).end();
   }
 
-  @Test
-  void testAttemptFailed_clientRequestBodyError() {
-    when(recorder.createSpan(eq(ATTEMPT_SPAN_NAME), anyMap())).thenReturn(attemptHandle);
-
-    tracer.attemptStarted(new Object(), 1);
-
-    tracer.attemptFailedRetriesExhausted(new TestRestSerializationException());
-
-    verify(attemptHandle)
-        .addAttribute(
-            ObservabilityAttributes.ERROR_TYPE_ATTRIBUTE,
-            ErrorTypeUtil.ErrorType.CLIENT_REQUEST_BODY_ERROR.toString());
-    verify(attemptHandle).end();
-  }
-
   @Test
   void testAttemptFailed_clientRequestError() {
     when(recorder.createSpan(eq(ATTEMPT_SPAN_NAME), anyMap())).thenReturn(attemptHandle);
@@ -347,15 +317,11 @@ void testAttemptFailed_internalFallback_nullError() {
     verify(attemptHandle).end();
   }
 
-  private static class TestGoogleAuthException extends RuntimeException {}
-
   private static class RedirectException extends RuntimeException {
     public RedirectException(String message) {
       super(message);
     }
   }
 
-  private static class TestRestSerializationException extends RuntimeException {}
-
   private static class UnknownClientException extends RuntimeException {}
 }