diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java index a77916be68..92c80b7914 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/ConsolidatedAPIServiceCEImpl.java @@ -154,6 +154,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .getCurrentUser() .flatMap(userService::buildUserProfileDTO) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching user profile", e)) .doOnSuccess(consolidatedAPIResponseDTO::setUserProfile) .name(getQualifiedSpanName(USER_PROFILE_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -162,6 +163,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { Mono>> featureFlagsForCurrentUserResponseDTOMonoCache = userDataService .getFeatureFlagsForCurrentUser() .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching feature flags", e)) .doOnSuccess(consolidatedAPIResponseDTO::setFeatureFlags) .name(getQualifiedSpanName(FEATURE_FLAG_SPAN, mode)) .tap(Micrometer.observation(observationRegistry)) @@ -172,6 +174,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { fetches.add(tenantService .getTenantConfiguration() .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching tenant config", e)) .doOnSuccess(consolidatedAPIResponseDTO::setTenantConfig) .name(getQualifiedSpanName(TENANT_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -230,6 +233,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { }) .as(this::toResponseDTO) .doOnSuccess(consolidatedAPIResponseDTO::setPages) + .doOnError(e -> log.error("Error fetching application pages", e)) .name(getQualifiedSpanName(PAGES_SPAN, mode)) .tap(Micrometer.observation(observationRegistry)) .cache(); @@ -240,6 +244,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { fetches.add(branchedApplicationMonoCached .flatMap(branchedApplication -> themeService.getApplicationTheme(branchedApplication.getId(), mode)) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching current theme", e)) .doOnSuccess(consolidatedAPIResponseDTO::setCurrentTheme) .name(getQualifiedSpanName(CURRENT_THEME_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -250,6 +255,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .getApplicationThemes(branchedApplication.getId()) .collectList()) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching themes", e)) .doOnSuccess(consolidatedAPIResponseDTO::setThemes) .name(getQualifiedSpanName(THEMES_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -259,6 +265,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .flatMap(branchedApplication -> customJSLibService.getAllJSLibsInContext( branchedApplication.getId(), CreatorContextType.APPLICATION, isViewMode)) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching custom JS libraries", e)) .doOnSuccess(consolidatedAPIResponseDTO::setCustomJSLibraries) .name(getQualifiedSpanName(CUSTOM_JS_LIB_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -268,6 +275,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { fetches.add(applicationPageService .getPageAndMigrateDslByBranchAndBasePageId(basePageId, branchName, isViewMode, true) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching current page", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPageWithMigratedDsl) .name(getQualifiedSpanName(CURRENT_PAGE_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -283,6 +291,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .getActionsForViewMode(branchedApplication.getId()) .collectList()) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching actions for view mode", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPublishedActions) .name(getQualifiedSpanName(ACTIONS_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -293,6 +302,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .getActionCollectionsForViewMode(branchedApplication.getId()) .collectList()) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching action collections for view mode", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPublishedActionCollections) .name(getQualifiedSpanName(ACTION_COLLECTIONS_SPAN, mode))); @@ -307,6 +317,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .collectList(); }) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching unpublished actions", e)) .doOnSuccess(consolidatedAPIResponseDTO::setUnpublishedActions) .name(getQualifiedSpanName(ACTIONS_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -320,6 +331,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { }) .collectList() .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching unpublished action collections", e)) .doOnSuccess(consolidatedAPIResponseDTO::setUnpublishedActionCollections) .name(getQualifiedSpanName(ACTION_COLLECTIONS_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -330,6 +342,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .flatMap(page -> applicationPageService.getPageDTOAfterMigratingDSL(page, false, true)) .collect(Collectors.toList()) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching pages with migrated DSL", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPagesWithMigratedDsl) .name(getQualifiedSpanName(PAGES_DSL_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -355,6 +368,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { ? Mono.empty() : pluginService.getInWorkspace(workspaceId).collectList()) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching plugins", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPlugins) .name(getQualifiedSpanName(PLUGINS_SPAN, mode)) .tap(Micrometer.observation(observationRegistry)) @@ -371,6 +385,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { return datasourceService.getAllWithStorages(params).collectList(); }) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching datasources", e)) .doOnSuccess(consolidatedAPIResponseDTO::setDatasources) .name(getQualifiedSpanName(DATASOURCES_SPAN, mode)) .tap(Micrometer.observation(observationRegistry)) @@ -415,6 +430,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { return pluginIdToFormConfigMap; }) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching plugin form configs", e)) .doOnSuccess(consolidatedAPIResponseDTO::setPluginFormConfigs) .name(getQualifiedSpanName(FORM_CONFIG_SPAN, mode)) .tap(Micrometer.observation(observationRegistry))); @@ -424,6 +440,7 @@ public class ConsolidatedAPIServiceCEImpl implements ConsolidatedAPIServiceCE { .getMockDataSet() .map(MockDataDTO::getMockdbs) .as(this::toResponseDTO) + .doOnError(e -> log.error("Error fetching mock datasources", e)) .doOnSuccess(consolidatedAPIResponseDTO::setMockDatasources) .name(getQualifiedSpanName(MOCK_DATASOURCES_SPAN, mode)) .tap(Micrometer.observation(observationRegistry)));