Skip to content

update: implement retry in app upload and improve logging #83

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

Merged
merged 2 commits into from
Oct 21, 2024
Merged

update: implement retry in app upload and improve logging #83

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae94ca1
add retries in app uploading
abhinvv1 Oct 14, 2024
0fe90a8
prevent retries except for 5XX
abhinvv1 Oct 16, 2024
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
47 changes: 31 additions & 16 deletions src/main/java/com/browserstack/automate/ci/common/uploader/AppUploaderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import hudson.util.FormValidation;

public class AppUploaderHelper {
private static final int MAX_RETRY_ATTEMPTS = 2;
private static final long RETRY_DELAY_MS = 1000;

public static FormValidation validateAppPath(String appPath) {
if (appPath == null || appPath.isEmpty()) {
Expand Down Expand Up @@ -47,23 +49,36 @@ public static String uploadApp(Actionable build, PrintStream logger, String appP

AppUploader appUploader = new AppUploader(appPath, credentials, customProxy, logger);
String appId = "";
try {
PluginLogger.log(logger, "Uploading app " + appPath + " to Browserstack.");
appId = appUploader.uploadFile();
PluginLogger.log(logger,
appPath + " uploaded successfully to Browserstack with app_url : " + appId);
} catch (AppAutomateException e) {
PluginLogger.logError(logger, "App upload failed.");
PluginLogger.logError(logger, e.getMessage());
return null;
} catch (InvalidFileExtensionException e) {
PluginLogger.logError(logger, e.getMessage());
return null;
} catch (FileNotFoundException e) {
PluginLogger.logError(logger, e.getMessage());
return null;
for (int attempt = 1; attempt <= MAX_RETRY_ATTEMPTS; attempt++) {
try {
PluginLogger.log(logger, String.format("Uploading app %s to Browserstack. Attempt %d of %d", appPath, attempt, MAX_RETRY_ATTEMPTS));
appId = appUploader.uploadFile();
PluginLogger.log(logger,
String.format("%s uploaded successfully to Browserstack with app_url : %s", appPath, appId));
return appId;
} catch (AppAutomateException e) {
PluginLogger.logError(logger, String.format("App upload failed with status code: %d. Attempt %d of %d", e.getStatusCode(), attempt, MAX_RETRY_ATTEMPTS));
PluginLogger.logError(logger, e.getMessage());
if (attempt < MAX_RETRY_ATTEMPTS) {
PluginLogger.log(logger, String.format("Retrying in %d seconds...", RETRY_DELAY_MS / 1000));
try {
Thread.sleep(RETRY_DELAY_MS);
} catch (InterruptedException ie) {
Thread.currentThread().interrupt();
PluginLogger.log(logger, "Upload retry interrupted. Error: " + ie.getMessage());
return null;
}
}
} catch (InvalidFileExtensionException e) {
PluginLogger.logError(logger, e.getMessage());
return null;
} catch (FileNotFoundException e) {
PluginLogger.logError(logger, e.getMessage());
return null;
}
}
return appId;
PluginLogger.logError(logger, String.format("App upload failed after %d attempts", MAX_RETRY_ATTEMPTS));
return null;
}

}
Loading