Skip to content

Commit

Permalink
made required changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sondermanish
sondermanish committed Apr 9, 2024
1 parent 60d265a commit bd52deb
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 59 deletions.
30 changes: 15 additions & 15 deletions app/server/appsmith-git/src/main/java/com/appsmith/git/service/ce/GitExecutorCEImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public Mono<String> commitArtifact(
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_COMMIT)
.name(GitSpan.FS_COMMIT)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -243,7 +243,7 @@ public Mono<String> pushApplication(
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_PUSH)
.name(GitSpan.FS_PUSH)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -285,7 +285,7 @@ public Mono<String> cloneRemoteIntoArtifactRepo(
return branchName;
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_CLONE_REPO)
.name(GitSpan.FS_CLONE_REPO)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -315,7 +315,7 @@ public Mono<String> createAndCheckoutToBranch(Path repoSuffix, String branchName
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_CREATE_BRANCH)
.name(GitSpan.FS_CREATE_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -345,7 +345,7 @@ public Mono<Boolean> deleteBranch(Path repoSuffix, String branchName) {
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_DELETE_BRANCH)
.name(GitSpan.FS_DELETE_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -381,7 +381,7 @@ public Mono<Boolean> checkoutToBranch(Path repoSuffix, String branchName) {
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.tag(CHECKOUT_REMOTE, FALSE.toString())
.name(GitSpan.FILE_SYSTEM_CHECKOUT_BRANCH)
.name(GitSpan.FS_CHECKOUT_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -443,7 +443,7 @@ public Mono<MergeStatusDTO> pullApplication(
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_PULL)
.name(GitSpan.FS_PULL)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -560,7 +560,7 @@ public Mono<GitStatusDTO> getStatus(Path repoPath, String branchName) {
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.flatMap(response -> response)
.name(GitSpan.FILE_SYSTEM_STATUS)
.name(GitSpan.FS_STATUS)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -682,7 +682,7 @@ public Mono<String> mergeBranch(Path repoSuffix, String sourceBranch, String des
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_MERGE)
.name(GitSpan.FS_MERGE)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -727,7 +727,7 @@ public Mono<String> fetchRemote(
return Mono.error(error);
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_FETCH_REMOTE)
.name(GitSpan.FS_FETCH_REMOTE)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -838,7 +838,7 @@ public Mono<String> checkoutRemoteBranch(Path repoSuffix, String branchName) {
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.tag(CHECKOUT_REMOTE, TRUE.toString())
.name(GitSpan.FILE_SYSTEM_CHECKOUT_BRANCH)
.name(GitSpan.FS_CHECKOUT_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -873,7 +873,7 @@ private Mono<Ref> resetToLastCommit(Git git) throws GitAPIException {
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.tag(HARD_RESET, Boolean.FALSE.toString())
.name(GitSpan.FILE_SYSTEM_RESET)
.name(GitSpan.FS_RESET)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -909,7 +909,7 @@ public Mono<Boolean> resetHard(Path repoSuffix, String branchName) {
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.tag(HARD_RESET, TRUE.toString())
.name(GitSpan.FILE_SYSTEM_RESET)
.name(GitSpan.FS_RESET)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down Expand Up @@ -940,7 +940,7 @@ public Mono<Boolean> rebaseBranch(Path repoSuffix, String branchName) {
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_REBASE)
.name(GitSpan.FS_REBASE)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand All @@ -953,7 +953,7 @@ public Mono<BranchTrackingStatus> getBranchTrackingStatus(Path repoPath, String
}
})
.timeout(Duration.ofMillis(Constraint.TIMEOUT_MILLIS))
.name(GitSpan.FILE_SYSTEM_BRANCH_TRACK)
.name(GitSpan.FS_BRANCH_TRACK)
.tap(Micrometer.observation(observationRegistry))
.subscribeOn(scheduler);
}
Expand Down
55 changes: 24 additions & 31 deletions ...r/appsmith-interfaces/src/main/java/com/appsmith/external/git/constants/ce/GitSpanCE.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,37 +5,30 @@

public class GitSpanCE {

public static final String FILE_SYSTEM_CLONE_REPO =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_clone_repo";
public static final String FILE_SYSTEM_STATUS = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_status";
public static final String FILE_SYSTEM_PULL = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_pull";
public static final String FILE_SYSTEM_BRANCH_TRACK =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_branch_track";
public static final String FS_CLONE_REPO = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_clone_repo";
public static final String FS_STATUS = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_status";
public static final String FS_PULL = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_pull";
public static final String FS_BRANCH_TRACK = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_branch_track";
public static final String ADD_FILE_LOCK = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "add_file_lock";
public static final String RELEASE_FILE_LOCK = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "release_file_lock";
public static final String FILE_SYSTEM_COMMIT = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_commit";
public static final String FILE_SYSTEM_CHECKOUT_BRANCH =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_checkout_branch";
public static final String FILE_SYSTEM_CREATE_BRANCH =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_create_branch";
public static final String FILE_SYSTEM_DELETE_BRANCH =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_delete_branch";
public static final String FILE_SYSTEM_CREATE_REPO =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_create_repo";
public static final String FILE_SYSTEM_RESET = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_reset";
public static final String FILE_SYSTEM_MERGE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_merge";
public static final String FILE_SYSTEM_REBASE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_rebase";
public static final String FILE_SYSTEM_PUSH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_push";
public static final String FILE_SYSTEM_FETCH_REMOTE =
APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "file_system_fetch_remote";
public static final String STATUS = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "status";
public static final String COMMIT = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "commit";
public static final String PUSH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "push";
public static final String PULL = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "pull";
public static final String CREATE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "create_branch";
public static final String CHECKOUT_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "checkout_branch";
public static final String DELETE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "delete_branch";
public static final String FETCH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fetch_remote";
public static final String DETACH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "detach_remote";
public static final String DISCARD_CHANGES = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "discard_changes";
public static final String FS_COMMIT = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_commit";
public static final String FS_CHECKOUT_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_checkout_branch";
public static final String FS_CREATE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_create_branch";
public static final String FS_DELETE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_delete_branch";
public static final String FS_CREATE_REPO = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_create_repo";
public static final String FS_RESET = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_reset";
public static final String FS_MERGE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_merge";
public static final String FS_REBASE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_rebase";
public static final String FS_PUSH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_push";
public static final String FS_FETCH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "fs_fetch_remote";
public static final String OPS_STATUS = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_status";
public static final String OPS_COMMIT = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_commit";
public static final String OPS_PUSH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_push";
public static final String OPS_PULL = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_pull";
public static final String OPS_CREATE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_create_branch";
public static final String OPS_CHECKOUT_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_checkout_branch";
public static final String OPS_DELETE_BRANCH = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_delete_branch";
public static final String OPS_FETCH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_fetch_remote";
public static final String OPS_DETACH_REMOTE = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_detach_remote";
public static final String OPS_DISCARD_CHANGES = APPSMITH_SPAN_PREFIX + GIT_SPAN_PREFIX + "ops_discard_changes";
}
26 changes: 13 additions & 13 deletions ...erver/appsmith-server/src/main/java/com/appsmith/server/services/ce/GitServiceCEImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
import static com.appsmith.external.git.constants.GitConstants.GIT_CONFIG_ERROR;
import static com.appsmith.external.git.constants.GitConstants.GIT_PROFILE_ERROR;
import static com.appsmith.external.git.constants.GitConstants.MERGE_CONFLICT_BRANCH_NAME;
import static com.appsmith.external.git.constants.GitSpan.COMMIT;
import static com.appsmith.external.git.constants.GitSpan.STATUS;
import static com.appsmith.external.git.constants.GitSpan.OPS_COMMIT;
import static com.appsmith.external.git.constants.GitSpan.OPS_STATUS;
import static com.appsmith.git.constants.AppsmithBotAsset.APPSMITH_BOT_USERNAME;
import static com.appsmith.server.constants.ArtifactType.APPLICATION;
import static com.appsmith.server.constants.FieldName.DEFAULT;
Expand Down Expand Up @@ -627,7 +627,7 @@ private Mono<String> commitApplication(
childApplication.getGitApplicationMetadata().getIsRepoPrivate(),
isSystemGenerated))
.thenReturn(status)
.name(COMMIT)
.name(OPS_COMMIT)
.tap(Micrometer.observation(observationRegistry));
});

Expand Down Expand Up @@ -1095,7 +1095,7 @@ private Mono<String> pushApplication(String applicationId, boolean doPublish, bo
application.getGitApplicationMetadata().getIsRepoPrivate())
.thenReturn(pushStatus);
})
.name(GitSpan.PUSH)
.name(GitSpan.OPS_PUSH)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> pushStatusMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
Expand Down Expand Up @@ -1241,7 +1241,7 @@ public Mono<Application> detachRemote(String defaultApplicationId) {
.flatMapMany(actionCollectionService::saveAll))
.then(addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCONNECT, application, false))
.map(responseUtils::updateApplicationWithDefaultResources))
.name(GitSpan.DETACH_REMOTE)
.name(GitSpan.OPS_DETACH_REMOTE)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> disconnectMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
Expand Down Expand Up @@ -1384,7 +1384,7 @@ public Mono<Application> createBranch(String defaultApplicationId, GitBranchDTO
application,
application.getGitApplicationMetadata().getIsRepoPrivate())))
.map(responseUtils::updateApplicationWithDefaultResources)
.name(GitSpan.CREATE_BRANCH)
.name(GitSpan.OPS_CREATE_BRANCH)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> createBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
Expand Down Expand Up @@ -1456,7 +1456,7 @@ public Mono<Application> checkoutBranch(String defaultApplicationId, String bran
return Mono.just(result);
})
.tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, FALSE.toString())
.name(GitSpan.CHECKOUT_BRANCH)
.name(GitSpan.OPS_CHECKOUT_BRANCH)
.tap(Micrometer.observation(observationRegistry))
.onErrorResume(throwable -> {
return Mono.error(throwable);
Expand Down Expand Up @@ -1572,7 +1572,7 @@ private Mono<Application> checkoutRemoteBranch(String defaultApplicationId, Stri
releaseFileLock(defaultApplicationId).then(Mono.just(application1)));
})
.tag(GitConstants.GitMetricConstants.CHECKOUT_REMOTE, TRUE.toString())
.name(GitSpan.CHECKOUT_BRANCH)
.name(GitSpan.OPS_CHECKOUT_BRANCH)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(
Expand Down Expand Up @@ -1663,7 +1663,7 @@ public Mono<GitPullDTO> pullApplication(String defaultApplicationId, String bran
.flatMap(gitPullDTO ->
releaseFileLock(defaultApplicationId).then(Mono.just(gitPullDTO)));
})
.name(GitSpan.PULL)
.name(GitSpan.OPS_PULL)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> pullMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
Expand Down Expand Up @@ -2016,7 +2016,7 @@ private Mono<GitStatusDTO> getStatus(
throwable);
return Mono.error(new AppsmithException(AppsmithError.GIT_GENERIC_ERROR, throwable.getMessage()));
})
.name(STATUS)
.name(OPS_STATUS)
.tap(Micrometer.observation(observationRegistry));

return Mono.zip(statusMono, sessionUserService.getCurrentUser(), branchedAppMono)
Expand Down Expand Up @@ -2151,7 +2151,7 @@ public Mono<BranchTrackingStatus> fetchRemoteChanges(
AnalyticsEvents.GIT_FETCH.getEventName(), elapsedTime, currentUser, app)
.thenReturn(branchTrackingStatus);
})
.name(GitSpan.FETCH_REMOTE)
.name(GitSpan.OPS_FETCH_REMOTE)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> {
Expand Down Expand Up @@ -2908,7 +2908,7 @@ public Mono<Application> deleteBranch(String defaultApplicationId, String branch
application,
application.getGitApplicationMetadata().getIsRepoPrivate()))
.map(responseUtils::updateApplicationWithDefaultResources)
.name(GitSpan.DELETE_BRANCH)
.name(GitSpan.OPS_DELETE_BRANCH)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(sink -> deleteBranchMono.subscribe(sink::success, sink::error, null, sink.currentContext()));
Expand Down Expand Up @@ -2973,7 +2973,7 @@ public Mono<Application> discardChanges(String defaultApplicationId, String bran
.flatMap(application -> releaseFileLock(defaultApplicationId)
.then(this.addAnalyticsForGitOperation(AnalyticsEvents.GIT_DISCARD_CHANGES, application, null)))
.map(responseUtils::updateApplicationWithDefaultResources)
.name(GitSpan.DISCARD_CHANGES)
.name(GitSpan.OPS_DISCARD_CHANGES)
.tap(Micrometer.observation(observationRegistry));

return Mono.create(
Expand Down

0 comments on commit bd52deb

Please sign in to comment.