Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Error Details Improvement #1929

Merged
merged 6 commits into from Jul 5, 2022
Merged

feat: Error Details Improvement #1929

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6275b2f
1) While wrapping API exception under SpannerException, using actual …
gauravpurohit06 Jun 28, 2022
0fad97f
docs: Adding JavaDoc for newly added public methods.
gauravpurohit06 Jun 30, 2022
33bf30b
reactor: To add apiException as a prtavie field under SpannerException.
gauravpurohit06 Jun 30, 2022
5fe21d0
reactor: Modify SpannerException and derived classes constructor to a…
gauravpurohit06 Jul 1, 2022
36014be
refactor: Passing exception cause directly to method.
gauravpurohit06 Jul 4, 2022
e860a27
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 31 additions & 0 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerException.java
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@

package com.google.cloud.spanner;

import com.google.api.gax.rpc.ApiException;
import com.google.api.gax.rpc.ErrorDetails;
import com.google.cloud.grpc.BaseGrpcServiceException;
import com.google.common.base.Preconditions;
import com.google.protobuf.util.Durations;
Expand All @@ -24,6 +26,7 @@
import io.grpc.Metadata;
import io.grpc.Status;
import io.grpc.protobuf.ProtoUtils;
import java.util.Map;
import javax.annotation.Nullable;

/** Base exception type for all exceptions produced by the Cloud Spanner service. */
Expand Down Expand Up @@ -95,4 +98,32 @@ static long extractRetryDelay(Throwable cause) {
}
return -1L;
}

public String getReason() {
gauravpurohit06 marked this conversation as resolved.
Show resolved Hide resolved
if (this.getCause() instanceof ApiException) {
return ((ApiException) this.getCause()).getReason();
}
return null;
}

public String getDomain() {
if (this.getCause() instanceof ApiException) {
return ((ApiException) this.getCause()).getDomain();
}
return null;
}

public Map<String, String> getMetadata() {
if (this.getCause() instanceof ApiException) {
return ((ApiException) this.getCause()).getMetadata();
}
return null;
}

public ErrorDetails getErrorDetails() {
if (this.getCause() instanceof ApiException) {
return ((ApiException) this.getCause()).getErrorDetails();
}
return null;
}
}
8 changes: 2 additions & 6 deletions google-cloud-spanner/src/main/java/com/google/cloud/spanner/SpannerExceptionFactory.java
View file
Open in desktop
Expand Up @@ -295,12 +295,8 @@ private static SpannerException fromApiException(ApiException exception) {
code = Status.Code.UNKNOWN;
}
ErrorCode errorCode = ErrorCode.fromGrpcStatus(Status.fromCode(code));
if (exception.getCause() != null) {
return SpannerExceptionFactory.newSpannerException(
errorCode, exception.getMessage(), exception.getCause());
} else {
return SpannerExceptionFactory.newSpannerException(errorCode, exception.getMessage());
}
return SpannerExceptionFactory.newSpannerException(
gauravpurohit06 marked this conversation as resolved.
Show resolved Hide resolved
errorCode, exception.getMessage(), exception);
}

private static boolean isRetryable(ErrorCode code, @Nullable Throwable cause) {
Expand Down