Skip to content

Commit 32b1bbc

Browse files
Expose github error message in RequestNotOkException. (#84)
1 parent e021763 commit 32b1bbc

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/main/java/com/spotify/github/opencensus/OpenCensusSpan.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public Span failure(final Throwable t) {
4646
if (t instanceof RequestNotOkException) {
4747
RequestNotOkException ex = (RequestNotOkException) t;
4848
span.putAttribute("http.status_code", AttributeValue.longAttributeValue(ex.statusCode()));
49-
span.putAttribute("message", AttributeValue.stringAttributeValue(ex.getMessage()));
49+
span.putAttribute("message", AttributeValue.stringAttributeValue(ex.getRawMessage()));
5050
if (ex.statusCode() - INTERNAL_SERVER_ERROR >= 0) {
5151
span.putAttribute("error", AttributeValue.booleanAttributeValue(true));
5252
}

src/main/java/com/spotify/github/v3/exceptions/RequestNotOkException.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ public class RequestNotOkException extends GithubException {
3939

4040
private final int statusCode;
4141
private final String path;
42+
private final String msg;
4243

4344
private static String decoratedMessage(final String path, final int statusCode, final String msg) {
4445
return String.format("%s %d: %s", path, statusCode, msg);
@@ -55,6 +56,7 @@ public RequestNotOkException(final String path, final int statusCode, final Stri
5556
super(decoratedMessage(path, statusCode, msg));
5657
this.statusCode = statusCode;
5758
this.path = path;
59+
this.msg = msg;
5860
}
5961

6062
/**
@@ -70,6 +72,16 @@ public RequestNotOkException(
7072
super(decoratedMessage(path, statusCode, msg), cause);
7173
this.statusCode = statusCode;
7274
this.path = path;
75+
this.msg = msg;
76+
}
77+
78+
/**
79+
* Get the raw message from github
80+
*
81+
* @return msg
82+
*/
83+
public String getRawMessage() {
84+
return msg;
7385
}
7486

7587
/**

src/test/java/com/spotify/github/v3/clients/GitHubClientTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ public void testRequestNotOkException() throws Throwable {
131131
RequestNotOkException e1 = (RequestNotOkException) e.getCause();
132132
assertThat(e1.statusCode(), is(409));
133133
assertThat(e1.getMessage(), containsString("Merge Conflict"));
134+
assertThat(e1.getRawMessage(), containsString("Merge Conflict"));
134135
}
135136
}
136137
}

0 commit comments

Comments
 (0)