remove application changes

appsmithorg · Apr 9, 2024 · 5384103 · 5384103
1 parent 54080a4
commit 5384103
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 25 deletions.
diff --git a/...-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java b/...-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
@@ -4,7 +4,6 @@
 import com.appsmith.external.models.ActionDTO;
 import com.appsmith.external.models.Policy;
 import com.appsmith.server.acl.AclPermission;
-import com.appsmith.server.applications.spans.ApplicationSpans;
 import com.appsmith.server.constants.ApplicationConstants;
 import com.appsmith.server.constants.Assets;
 import com.appsmith.server.constants.FieldName;
@@ -45,7 +44,6 @@
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PolicySolution;
 import com.appsmith.server.solutions.WorkspacePermission;
-import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
@@ -55,7 +53,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
-import reactor.core.observability.micrometer.Micrometer;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -93,7 +90,6 @@ public class ApplicationServiceCEImpl extends BaseService<ApplicationRepository,
     private final UserDataService userDataService;
     private final WorkspaceService workspaceService;
     private final WorkspacePermission workspacePermission;
-    private final ObservationRegistry observationRegistry;
 
     private static final Integer MAX_RETRIES = 5;
 
@@ -113,8 +109,7 @@ public ApplicationServiceCEImpl(
             SessionUserService sessionUserService,
             UserDataService userDataService,
             WorkspaceService workspaceService,
-            WorkspacePermission workspacePermission,
-            ObservationRegistry observationRegistry) {
+            WorkspacePermission workspacePermission) {
 
         super(validator, repository, analyticsService);
         this.policySolution = policySolution;
@@ -129,7 +124,6 @@ public ApplicationServiceCEImpl(
         this.userDataService = userDataService;
         this.workspaceService = workspaceService;
         this.workspacePermission = workspacePermission;
-        this.observationRegistry = observationRegistry;
     }
 
     @Override
@@ -177,11 +171,7 @@ public Mono<Application> findById(String id) {
     @Override
     @Deprecated
     public Mono<Application> findById(String id, AclPermission aclPermission) {
-        return repository
-                .findById(id, aclPermission)
-                .flatMap(this::setTransientFields)
-                .name(ApplicationSpans.FETCH_BY_ID)
-                .tap(Micrometer.observation(observationRegistry));
+        return repository.findById(id, aclPermission).flatMap(this::setTransientFields);
     }
 
     @Override
@@ -861,9 +851,7 @@ public Mono<GitAuthDTO> getSshKey(String applicationId) {
 
     public Mono<Application> findByBranchNameAndDefaultApplicationId(
             String branchName, String defaultApplicationId, AclPermission aclPermission) {
-        return findByBranchNameAndDefaultApplicationId(branchName, defaultApplicationId, null, aclPermission)
-                .name(ApplicationSpans.FETCH_BY_DEFAULT_ID_AND_BRANCH)
-                .tap(Micrometer.observation(observationRegistry));
+        return findByBranchNameAndDefaultApplicationId(branchName, defaultApplicationId, null, aclPermission);
     }
 
     @Override

diff --git a/...th-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceImpl.java b/...th-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceImpl.java
@@ -15,7 +15,6 @@
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PolicySolution;
 import com.appsmith.server.solutions.WorkspacePermission;
-import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -39,8 +38,7 @@ public ApplicationServiceImpl(
             SessionUserService sessionUserService,
             UserDataService userDataService,
             WorkspaceService workspaceService,
-            WorkspacePermission workspacePermission,
-            ObservationRegistry observationRegistry) {
+            WorkspacePermission workspacePermission) {
 
         super(
                 validator,
@@ -57,7 +55,6 @@ public ApplicationServiceImpl(
                 sessionUserService,
                 userDataService,
                 workspaceService,
-                workspacePermission,
-                observationRegistry);
+                workspacePermission);
     }
 }
diff --git a/...n/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java b/...n/java/com/appsmith/server/services/ce_compatible/ApplicationServiceCECompatibleImpl.java
@@ -15,7 +15,6 @@
 import com.appsmith.server.solutions.DatasourcePermission;
 import com.appsmith.server.solutions.PolicySolution;
 import com.appsmith.server.solutions.WorkspacePermission;
-import io.micrometer.observation.ObservationRegistry;
 import jakarta.validation.Validator;
 import org.springframework.stereotype.Service;
 
@@ -37,8 +36,7 @@ public ApplicationServiceCECompatibleImpl(
             SessionUserService sessionUserService,
             UserDataService userDataService,
             WorkspaceService workspaceService,
-            WorkspacePermission workspacePermission,
-            ObservationRegistry observationRegistry) {
+            WorkspacePermission workspacePermission) {
         super(
                 validator,
                 repository,
@@ -54,7 +52,6 @@ public ApplicationServiceCECompatibleImpl(
                 sessionUserService,
                 userDataService,
                 workspaceService,
-                workspacePermission,
-                observationRegistry);
+                workspacePermission);
     }
 }