Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Add execution time for git status API (#25041)

Browse Source 
Add execution time for the performance improvement for the git status
API
This commit is contained in:
Anagh Hegde 2023-07-04 23:54:37 +05:30 committed by GitHub
parent c079b3704e
commit 48bf4a26a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
View File

@ -1555,19 +1555,19 @@ public class GitServiceCEImpl implements GitServiceCE {
2. Fetch the current status from local repo
*/
Mono<GitStatusDTO> statusMono = getGitApplicationMetadata(defaultApplicationId)
Mono<GitStatusDTO> statusMono = executionTimeLogging.measureTask("getGitApplicationMetadata", getGitApplicationMetadata(defaultApplicationId))
.flatMap(gitApplicationMetadata -> {
Mono<Tuple2<Application, ApplicationJson>> applicationJsonTuple = applicationService.findByBranchNameAndDefaultApplicationId(finalBranchName, defaultApplicationId, applicationPermission.getEditPermission())
Mono<Tuple2<Application, ApplicationJson>> applicationJsonTuple = executionTimeLogging.measureTask("findByBranchNameAndDefaultApplicationId", applicationService.findByBranchNameAndDefaultApplicationId(finalBranchName, defaultApplicationId, applicationPermission.getEditPermission()))
.onErrorResume(error -> {
//if the branch does not exist in local, checkout remote branch
return checkoutBranch(defaultApplicationId, finalBranchName);
return executionTimeLogging.measureTask("checkoutBranch", checkoutBranch(defaultApplicationId, finalBranchName));
})
.zipWhen(application -> importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL));
.zipWhen(application -> executionTimeLogging.measureTask( "getStatus->exportApplicationById", importExportApplicationService.exportApplicationById(application.getId(), SerialiseApplicationObjective.VERSION_CONTROL)));
if (Boolean.TRUE.equals(isFileLock)) {
// Add file lock for the status API call to avoid sending wrong info on the status
return redisUtils.addFileLock(gitApplicationMetadata.getDefaultApplicationId())
return executionTimeLogging.measureTask("addFileLock", redisUtils.addFileLock(gitApplicationMetadata.getDefaultApplicationId()))
.retryWhen(Retry.fixedDelay(MAX_RETRIES, RETRY_DELAY).jitter(0.75)
.onRetryExhaustedThrow((retryBackoffSpec, retrySignal) -> {
throw new AppsmithException(AppsmithError.GIT_FILE_IN_USE);
@ -1588,7 +1588,7 @@ public class GitServiceCEImpl implements GitServiceCE {
try {
return Mono.zip(
fileUtils.saveApplicationToLocalRepo(repoSuffix, applicationJson, finalBranchName),
executionTimeLogging.measureTask("getStatus->saveApplicationToLocalRepo", fileUtils.saveApplicationToLocalRepo(repoSuffix, applicationJson, finalBranchName)),
Mono.just(gitData.getGitAuth()),
Mono.just(repoSuffix)
);
@ -1597,15 +1597,15 @@ public class GitServiceCEImpl implements GitServiceCE {
}
})
.flatMap(tuple -> {
Mono<GitStatusDTO> branchedStatusMono = gitExecutor.getStatus(tuple.getT1(), finalBranchName).cache();
Mono<GitStatusDTO> branchedStatusMono = executionTimeLogging.measureTask("getStatus->gitExecutor.getStatus", gitExecutor.getStatus(tuple.getT1(), finalBranchName).cache());
try {
return gitExecutor.fetchRemote(tuple.getT1(), tuple.getT2().getPublicKey(), tuple.getT2().getPrivateKey(), true, branchName, false)
return executionTimeLogging.measureTask("getStatus->gitExecutor.fetchRemote", gitExecutor.fetchRemote(tuple.getT1(), tuple.getT2().getPublicKey(), tuple.getT2().getPrivateKey(), true, branchName, false))
.then(branchedStatusMono)
// Remove any files which are copied by hard resetting the repo
.then(gitExecutor.resetToLastCommit(tuple.getT3(), branchName))
.then(executionTimeLogging.measureTask("getStatus->gitExecutor.resetToLastCommit", gitExecutor.resetToLastCommit(tuple.getT3(), branchName)))
.flatMap(gitStatusDTO -> {
if (Boolean.TRUE.equals(isFileLock)) {
return releaseFileLock(defaultApplicationId)
return executionTimeLogging.measureTask("getStatus->releaseFileLock", releaseFileLock(defaultApplicationId))
.then(branchedStatusMono);
}
return branchedStatusMono;
@ -1617,7 +1617,10 @@ public class GitServiceCEImpl implements GitServiceCE {
});
return Mono.create(sink -> {
statusMono.subscribe(sink::success, sink::error, null, sink.currentContext());
statusMono.map(t -> {
log.debug("Time take, {}\n", executionTimeLogging.print());
return t;
}).subscribe(sink::success, sink::error, null, sink.currentContext());
});
}