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

Bugfix rntbd diagnostics to include rntbd timeline on the failure #15574

Merged
merged 2 commits into from
Sep 24, 2020
Merged

Bugfix rntbd diagnostics to include rntbd timeline on the failure #15574

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf42e5a
fixes diagnostics to include rntbd timeline on the failure
moderakh Sep 23, 2020
f1b47a5
added a test
moderakh Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/BridgeInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,17 @@ public static void setQueryPlanDiagnosticsContext(CosmosDiagnostics cosmosDiagno
cosmosDiagnostics.getFeedResponseDiagnostics().setDiagnosticsContext(diagnosticsContext);
}

@Warning(value = INTERNAL_USE_ONLY_WARNING)
public static <E extends CosmosException> E setRequestTimeline(E e, RequestTimeline requestTimeline) {
e.setRequestTimeline(requestTimeline);
return e;
}

@Warning(value = INTERNAL_USE_ONLY_WARNING)
public static <E extends CosmosException> RequestTimeline getRequestTimeline(E e) {
return e.getRequestTimeline();
}

@Warning(value = INTERNAL_USE_ONLY_WARNING)
public static <E extends CosmosException> E setResourceAddress(E e, String resourceAddress) {
e.setResourceAddress(resourceAddress);
Expand Down
11 changes: 9 additions & 2 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/CosmosException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class CosmosException extends AzureException {
private final Map<String, String> responseHeaders;

private CosmosDiagnostics cosmosDiagnostics;
private final RequestTimeline requestTimeline;
private RequestTimeline requestTimeline;
private CosmosError cosmosError;

long lsn;
Expand All @@ -56,7 +56,6 @@ public class CosmosException extends AzureException {
protected CosmosException(int statusCode, String message, Map<String, String> responseHeaders, Throwable cause) {
super(message, cause);
this.statusCode = statusCode;
this.requestTimeline = RequestTimeline.empty();
this.responseHeaders = responseHeaders == null ? new HashMap<>() : new HashMap<>(responseHeaders);
}

Expand Down Expand Up @@ -302,4 +301,12 @@ private List<Map.Entry<String, String>> filterSensitiveData(Map<String, String>
void setResourceAddress(String resourceAddress) {
this.resourceAddress = resourceAddress;
}

RequestTimeline getRequestTimeline() {
return this.requestTimeline;
}

void setRequestTimeline(RequestTimeline requestTimeline) {
this.requestTimeline = requestTimeline;
}
}
6 changes: 5 additions & 1 deletion ...rc/main/java/com/azure/cosmos/implementation/directconnectivity/RntbdTransportClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,11 @@ public Mono<StoreResponse> invokeStoreAsync(final Uri addressUri, final RxDocume
address.toString());
}

return error;
assert error instanceof CosmosException;
CosmosException cosmosException = (CosmosException) error;
BridgeInternal.setRequestTimeline(cosmosException, record.takeTimelineSnapshot());

return cosmosException;

});

Expand Down
4 changes: 3 additions & 1 deletion ...-cosmos/src/main/java/com/azure/cosmos/implementation/directconnectivity/StoreResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ public void serialize(StoreResult storeResult,
jsonGenerator.writeNumberField("itemLSN", storeResult.itemLSN);
jsonGenerator.writeStringField("sessionToken", (storeResult.sessionToken != null ? storeResult.sessionToken.convertToString() : null));
jsonGenerator.writeStringField("exception", BridgeInternal.getInnerErrorMessage(storeResult.exception));
jsonGenerator.writeObjectField("transportRequestTimeline", storeResult.storeResponse != null ? storeResult.storeResponse.getRequestTimeline() : null);
jsonGenerator.writeObjectField("transportRequestTimeline", storeResult.storeResponse != null ?
storeResult.storeResponse.getRequestTimeline() :
storeResult.exception != null ? BridgeInternal.getRequestTimeline(storeResult.exception) : null);
jsonGenerator.writeEndObject();
}
}
Expand Down