Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dependencyResolutionManagement {
versionCatalogs {
libs {
// main sdk version
version('sdk', '1.8.1');
version('sdk', '1.8.2');

// sdk deps
version('okhttp3', '4.12.0')
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/io/harness/cf/client/api/InnerClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ public void onConnected() {
@Override
public void onDisconnected(String reason) {

SdkCodes.warnStreamDisconnected(reason);
if (!reason.contains("SDK_SHUTDOWN")) {
SdkCodes.warnStreamDisconnected(reason);
}

if (!closing && !pollProcessor.isRunning()) {
log.debug("onDisconnected triggered, starting poller to get latest flags");
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/harness/cf/client/api/PollingProcessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public CompletableFuture<List<Segment>> retrieveSegments() {
completableFuture.complete(segments);
} catch (Throwable e) {
log.error(
"Exception was raised when fetching flags data with the message {}", e.getMessage(), e);
"Exception was raised when fetching segments data with the message {}", e.getMessage(), e);
completableFuture.completeExceptionally(e);
}
return completableFuture;
Expand All @@ -81,8 +81,7 @@ public void retrieveAll() {
try {
CompletableFuture.allOf(retrieveFlags(), retrieveSegments()).join();
} catch (CompletionException | CancellationException ex) {
log.warn("retrieveAll failed: {} - {}", ex.getClass().getSimpleName(), ex.getMessage());
log.trace("retrieveAll failed", ex);
log.warn("retrieveAll failed: {} - {}", ex.getClass().getSimpleName(), ex.getMessage(), ex);
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/java/io/harness/cf/client/connector/EventSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -198,13 +198,14 @@ public void onResponse(@NotNull Call call, @NotNull Response response) throws IO
} catch (Throwable ex) {
log.warn("SSE Stream aborted: " + getExceptionMsg(ex));
log.trace("SSE Stream aborted trace", ex);
updater.onDisconnected(getExceptionMsg(ex));

updater.onDisconnected((isShuttingDown.get() ? "SDK_SHUTDOWN: " : "") + getExceptionMsg(ex));
}
}

private String getExceptionMsg(Throwable ex) {
return (ex.getMessage() == null || "null".equals(ex.getMessage()))
? ex.getClass().getSimpleName()
? ex.getClass().getCanonicalName()
: ex.getMessage();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public Response intercept(@NotNull Chain chain) throws IOException {
limitReached = !retryForever && tryCount >= maxTryCount;

if (isShuttingDown.get()) {
log.warn(
log.trace(
"Request attempt {} to {} was not successful, [{}], SDK is shutting down, no retries will be attempted",
tryCount,
chain.request().url(),
Expand Down Expand Up @@ -147,6 +147,7 @@ int getRetryAfterHeaderInSeconds(Response response) {
try {
seconds = Integer.parseInt(retryAfterValue);
} catch (NumberFormatException ignored) {
log.trace("Unable to parse Retry-After header as integer: {}", retryAfterValue);
}

if (seconds <= 0) {
Expand All @@ -156,6 +157,7 @@ int getRetryAfterHeaderInSeconds(Response response) {
seconds = (int) Duration.between(Instant.now(), then.toInstant()).getSeconds();
}
} catch (ParseException ignored) {
log.warn("Unable to parse Retry-After header value: `{}` as integer or date", retryAfterValue);
}
}

Expand Down
Loading