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

chore: Add action execution params to analytics (#17562)

Browse Source
This commit is contained in:
Anagh Hegde 2022-10-20 13:37:48 +05:30 committed by GitHub
parent 42b913cef8
commit bd95ae4ef0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/server/appsmith-server/src/main/java/com/appsmith/server/constants/FieldName.java
View File

@ -139,7 +139,7 @@ public class FieldName {
public static final String FORM_LOGIN = "FormLogin"; public static final String FORM_LOGIN = "FormLogin";
public static final String APP_MODE = "appMode"; public static final String APP_MODE = "appMode";
public static final String PAGE_ORDER = "order"; public static final String PAGE_ORDER = "order";
public static final String ACTION_EXECUTION_REQUEST = "actionExecutionRequest"; public static final String ACTION_EXECUTION_REQUEST_PARAMS = "actionExecutionRequestParams";
public static final String ACTION_EXECUTION_RESULT = "actionExecutionResult"; public static final String ACTION_EXECUTION_RESULT = "actionExecutionResult";
public static final String ACTION_EXECUTION_TIME = "actionExecutionTime"; public static final String ACTION_EXECUTION_TIME = "actionExecutionTime";
public static final String WEBSITE = "website"; public static final String WEBSITE = "website";
@ -148,5 +148,6 @@ public class FieldName {
// this key will present in the analytics as a diff b/w server and user invoked flows // this key will present in the analytics as a diff b/w server and user invoked flows
public static final String IS_DATASOURCE_UPDATE_USER_INVOKED_KEY = "isDatasourceUpdateUserInvoked"; public static final String IS_DATASOURCE_UPDATE_USER_INVOKED_KEY = "isDatasourceUpdateUserInvoked";
public static final String UPDATED_INSTANCE_SETTINGS = "updatedInstanceSettings"; public static final String UPDATED_INSTANCE_SETTINGS = "updatedInstanceSettings";
public static final String ACTION_EXECUTION_QUERY = "actionExecutionQuery";
} }

13
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/NewActionServiceCEImpl.java
View File

@ -800,7 +800,7 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
ActionDTO actionDTO = tuple2.getT2(); ActionDTO actionDTO = tuple2.getT2();
Datasource datasourceFromDb = tuple2.getT3(); Datasource datasourceFromDb = tuple2.getT3();
return Mono.when(sendExecuteAnalyticsEvent(actionFromDb, actionDTO, datasourceFromDb, executeActionDTO.getViewMode(), actionExecutionResult, timeElapsed)) return Mono.when(sendExecuteAnalyticsEvent(actionFromDb, actionDTO, datasourceFromDb, executeActionDTO, actionExecutionResult, timeElapsed))
.thenReturn(result); .thenReturn(result);
}); });
} }
@ -1048,7 +1048,7 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
NewAction action, NewAction action,
ActionDTO actionDTO, ActionDTO actionDTO,
Datasource datasource, Datasource datasource,
Boolean viewMode, ExecuteActionDTO executeActionDto,
ActionExecutionResult actionExecutionResult, ActionExecutionResult actionExecutionResult,
Long timeElapsed Long timeElapsed
) { ) {
@ -1116,7 +1116,7 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
.flatMap(application -> Mono.zip( .flatMap(application -> Mono.zip(
Mono.just(application), Mono.just(application),
sessionUserService.getCurrentUser(), sessionUserService.getCurrentUser(),
newPageService.getNameByPageId(actionDTO.getPageId(), viewMode), newPageService.getNameByPageId(actionDTO.getPageId(), executeActionDto.getViewMode()),
pluginService.getById(action.getPluginId()) pluginService.getById(action.getPluginId())
)) ))
.flatMap(tuple -> { .flatMap(tuple -> {
@ -1126,7 +1126,7 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
final Plugin plugin = tuple.getT4(); final Plugin plugin = tuple.getT4();
final PluginType pluginType = action.getPluginType(); final PluginType pluginType = action.getPluginType();
final String appMode = TRUE.equals(viewMode) ? ApplicationMode.PUBLISHED.toString() : ApplicationMode.EDIT.toString(); final String appMode = TRUE.equals(executeActionDto.getViewMode()) ? ApplicationMode.PUBLISHED.toString() : ApplicationMode.EDIT.toString();
final Map<String, Object> data = new HashMap<>(Map.of( final Map<String, Object> data = new HashMap<>(Map.of(
"username", user.getUsername(), "username", user.getUsername(),
@ -1183,13 +1183,16 @@ public class NewActionServiceCEImpl extends BaseService<NewActionRepository, New
"statusCode", actionExecutionResult.getStatusCode() "statusCode", actionExecutionResult.getStatusCode()
)); ));
} }
List<String> executionParams = executeActionDto.getParams().stream().map(param -> param.getValue()).collect(Collectors.toList());
final Map<String, Object> eventData = Map.of( final Map<String, Object> eventData = Map.of(
FieldName.ACTION, action, FieldName.ACTION, action,
FieldName.DATASOURCE, datasource, FieldName.DATASOURCE, datasource,
FieldName.APP_MODE, appMode, FieldName.APP_MODE, appMode,
FieldName.ACTION_EXECUTION_RESULT, actionExecutionResult, FieldName.ACTION_EXECUTION_RESULT, actionExecutionResult,
FieldName.ACTION_EXECUTION_TIME, timeElapsed, FieldName.ACTION_EXECUTION_TIME, timeElapsed,
FieldName.ACTION_EXECUTION_REQUEST, request, FieldName.ACTION_EXECUTION_REQUEST_PARAMS, executionParams,
FieldName.ACTION_EXECUTION_QUERY, actionExecutionResult.getRequest().getQuery(),
FieldName.APPLICATION, application, FieldName.APPLICATION, application,
FieldName.PLUGIN, plugin FieldName.PLUGIN, plugin
); );