File tree Expand file tree Collapse file tree
sdk-platform-java/gax-java/gax/src
main/java/com/google/api/gax/tracing
test/java/com/google/api/gax/tracing Expand file tree Collapse file tree Original file line number Diff line number Diff line change 3030
3131package com .google .api .gax .tracing ;
3232
33+ import com .google .api .client .util .Strings ;
3334import com .google .api .core .BetaApi ;
3435import com .google .api .core .InternalApi ;
3536import io .opentelemetry .api .trace .Span ;
@@ -218,14 +219,10 @@ private void recordErrorAndEndAttempt(Throwable error) {
218219 }
219220
220221 private String extractErrorMessage (Throwable error ) {
221- Throwable cause = error ;
222- while (cause != null ) {
223- if (cause .getMessage () != null && !cause .getMessage ().isEmpty ()) {
224- return cause .getMessage ();
225- }
226- cause = cause .getCause ();
222+ if (Strings .isNullOrEmpty (error .getMessage ())) {
223+ return null ;
227224 }
228- return null ;
225+ return error . getMessage () ;
229226 }
230227
231228 private void endAttempt () {
Original file line number Diff line number Diff line change @@ -456,23 +456,6 @@ void testAttemptFailed_populatesExceptionTypeAndMessage() {
456456 verify (span ).end ();
457457 }
458458
459- @ Test
460- void testAttemptFailed_recursiveMessageSearch () {
461- spanTracer .attemptStarted (new Object (), 1 );
462-
463- Throwable cause = new IllegalArgumentException ("root cause message" );
464- Throwable wrapper = new IllegalStateException ("" , cause );
465-
466- spanTracer .attemptFailedRetriesExhausted (wrapper );
467-
468- verify (span )
469- .setAttribute (
470- ObservabilityAttributes .EXCEPTION_TYPE_ATTRIBUTE , "java.lang.IllegalStateException" );
471- verify (span )
472- .setAttribute (ObservabilityAttributes .STATUS_MESSAGE_ATTRIBUTE , "root cause message" );
473- verify (span ).end ();
474- }
475-
476459 private static class RedirectException extends RuntimeException {
477460 public RedirectException (String message ) {
478461 super (message );
You can’t perform that action at this time.
0 commit comments