Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Updating analytics events to use workspaceId instead of orgId #38931

Merged
merged 2 commits into from
Jan 31, 2025
Merged

chore: Updating analytics events to use workspaceId instead of orgId #38931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bbf7ed
chore: Updating analytics events to use workspaceId instead of orgId
trishaanand Jan 30, 2025
8428afa
Empty line changes to trigger server build again
trishaanand Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/client/src/actions/pageActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,12 @@ export const createPageAction = (
applicationId: string,
pageName: string,
layouts: Partial<PageLayout>[],
orgId: string,
workspaceId: string,
instanceId?: string,
) => {
AnalyticsUtil.logEvent("CREATE_PAGE", {
pageName,
orgId,
workspaceId,
instanceId,
});

Expand All @@ -229,12 +229,12 @@ export const createPageAction = (
export const createNewPageFromEntities = (
applicationId: string,
pageName: string,
orgId: string,
workspaceId: string,
instanceId?: string,
) => {
AnalyticsUtil.logEvent("CREATE_PAGE", {
pageName,
orgId,
workspaceId,
instanceId,
});

Expand Down
2 changes: 1 addition & 1 deletion app/client/src/ce/pages/workspace/InviteUsersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ function InviteUsersForm(props: any) {
...(!isFeatureEnabled ? { users: usersAsStringsArray } : {}),
role: roles,
numberOfUsersInvited: usersAsStringsArray.length,
orgId: props.workspaceId,
workspaceId: props.workspaceId,
});

return inviteUsersToWorkspace(
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/pages/common/datasourceAuth/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ function DatasourceAuth({

AnalyticsUtil.logEvent("DATASOURCE_AUTHORIZE_CLICK", {
dsName: datasource?.name,
orgId: datasource?.workspaceId,
workspaceId: datasource?.workspaceId,
pluginName: pluginName,
scopeValue: scopeValue,
});
Expand Down
2 changes: 1 addition & 1 deletion app/client/src/sagas/PostEvaluationSagas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export function* logSuccessfulBindings(
entityType,
propertyPath,
isUndefined,
orgId: workspaceId,
workspaceId: workspaceId,
instanceId,
});
}
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/appsmith/server/actioncollections/base/ActionCollectionServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ public Map<String, Object> getAnalyticsProperties(ActionCollection savedActionCo
analyticsProperties.put(
"applicationId", ObjectUtils.defaultIfNull(savedActionCollection.getApplicationId(), ""));
analyticsProperties.put("pageId", ObjectUtils.defaultIfNull(unpublishedCollection.getPageId(), ""));
analyticsProperties.put("orgId", ObjectUtils.defaultIfNull(savedActionCollection.getWorkspaceId(), ""));
analyticsProperties.put("workspaceId", ObjectUtils.defaultIfNull(savedActionCollection.getWorkspaceId(), ""));
return analyticsProperties;
}

Expand Down
2 changes: 1 addition & 1 deletion ...-server/src/main/java/com/appsmith/server/applications/base/ApplicationServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ public Map<String, Object> getAnalyticsProperties(Application savedApplication)
Map<String, Object> analyticsProperties = new HashMap<>();
analyticsProperties.put("appName", ObjectUtils.defaultIfNull(savedApplication.getName(), ""));
analyticsProperties.put("applicationId", ObjectUtils.defaultIfNull(savedApplication.getId(), ""));
analyticsProperties.put("orgId", ObjectUtils.defaultIfNull(savedApplication.getWorkspaceId(), ""));
analyticsProperties.put("workspaceId", ObjectUtils.defaultIfNull(savedApplication.getWorkspaceId(), ""));
return analyticsProperties;
}

Expand Down
2 changes: 1 addition & 1 deletion ...psmith-server/src/main/java/com/appsmith/server/artifacts/base/ArtifactServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ public Mono<GitAuth> createOrUpdateSshKeyPair(
final Map<String, Object> data = Map.of(
FieldName.APPLICATION_ID,
artifact.getId(),
"organizationId",
"workspaceId",
artifact.getWorkspaceId(),
"isRegeneratedKey",
gitAuth.isRegeneratedKey(),
Expand Down
2 changes: 1 addition & 1 deletion ...server/src/main/java/com/appsmith/server/git/autocommit/AutoCommitEventHandlerCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private Mono<Boolean> triggerAnalyticsEvent(
Map<String, Object> analyticsProps = new HashMap<>();
analyticsProps.put("appId", autoCommitEvent.getApplicationId());
analyticsProps.put(FieldName.BRANCH_NAME, autoCommitEvent.getBranchName());
analyticsProps.put("orgId", autoCommitEvent.getWorkspaceId());
analyticsProps.put("workspaceId", autoCommitEvent.getWorkspaceId());
analyticsProps.put("isSystemGenerated", true);
analyticsProps.put("repoUrl", autoCommitEvent.getRepoUrl());

Expand Down
6 changes: 2 additions & 4 deletions .../appsmith-server/src/main/java/com/appsmith/server/git/common/CommonGitServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ private Mono<Void> sendUnitExecutionTimeAnalyticsEvent(
gitArtifactMetadata.getDefaultArtifactId(),
FieldName.BRANCH_NAME,
gitArtifactMetadata.getRefName(),
"organizationId",
"workspaceId",
artifact.getWorkspaceId(),
"repoUrl",
gitArtifactMetadata.getRemoteUrl(),
Expand Down Expand Up @@ -2096,9 +2096,7 @@ private Mono<? extends Artifact> addAnalyticsForGitOperation(
analyticsProps.put(FieldName.IS_MERGEABLE, isMergeable);
}
analyticsProps.putAll(Map.of(
"organizationId",
defaultIfNull(artifact.getWorkspaceId(), ""),
"orgId",
"workspaceId",
defaultIfNull(artifact.getWorkspaceId(), ""),
"branchApplicationId",
defaultIfNull(artifact.getId(), ""),
Expand Down
10 changes: 4 additions & 6 deletions ...server/appsmith-server/src/main/java/com/appsmith/server/git/utils/GitAnalyticsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@ public Mono<? extends Artifact> addAnalyticsForGitOperation(
analyticsProps.put(FieldName.IS_MERGEABLE, isMergeable);
}
analyticsProps.putAll(Map.of(
"organizationId",
defaultIfNull(artifact.getWorkspaceId(), ""),
"orgId",
"workspaceId",
defaultIfNull(artifact.getWorkspaceId(), ""),
"branchApplicationId",
defaultIfNull(artifact.getId(), ""),
Expand Down Expand Up @@ -142,7 +140,7 @@ public Mono<Void> sendUnitExecutionTimeAnalyticsEvent(
gitArtifactMetadata.getDefaultArtifactId(),
FieldName.BRANCH_NAME,
gitArtifactMetadata.getRefName(),
"organizationId",
"workspaceId",
artifact.getWorkspaceId(),
"repoUrl",
gitArtifactMetadata.getRemoteUrl(),
Expand Down Expand Up @@ -201,9 +199,9 @@ public Mono<Void> sendGitAnalyticsEvent(
GitArtifactMetadata gitData = artifact.getGitArtifactMetadata();
Map<String, Object> analyticsProps = new HashMap<>();

// TODO: analytics generalisation
// TODO: analytics generalization
analyticsProps.put("appId", gitData.getDefaultArtifactId());
analyticsProps.put("orgId", artifact.getWorkspaceId());
analyticsProps.put("workspaceId", artifact.getWorkspaceId());
analyticsProps.put(FieldName.GIT_HOSTING_PROVIDER, GitUtils.getGitProviderName(gitData.getRemoteUrl()));
analyticsProps.put(FieldName.REPO_URL, gitData.getRemoteUrl());

Expand Down
2 changes: 0 additions & 2 deletions ...r/appsmith-server/src/main/java/com/appsmith/server/helpers/DatasourceAnalyticsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ public class DatasourceAnalyticsUtils {

public static Map<String, Object> getAnalyticsProperties(Datasource datasource) {
Map<String, Object> analyticsProperties = new HashMap<>();
analyticsProperties.put("orgId", datasource.getWorkspaceId());
analyticsProperties.put("pluginName", datasource.getPluginName());
analyticsProperties.put("pluginId", datasource.getPluginId());
analyticsProperties.put("dsName", datasource.getName());
Expand All @@ -37,7 +36,6 @@ public static Map<String, Object> getAnalyticsProperties(Datasource datasource)

public static Map<String, Object> getAnalyticsProperties(DatasourceStorage datasourceStroge) {
Map<String, Object> analyticsProperties = new HashMap<>();
analyticsProperties.put("orgId", datasourceStroge.getWorkspaceId());
analyticsProperties.put("pluginName", datasourceStroge.getPluginName());
analyticsProperties.put("pluginId", datasourceStroge.getPluginId());
analyticsProperties.put("dsName", datasourceStroge.getName());
Expand Down
4 changes: 2 additions & 2 deletions ...er/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/CommonGitFileUtilsCE.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public Mono<Path> saveArtifactToLocalRepoWithAnalytics(
final Map<String, Object> data = Map.of(
artifactConstant,
repoPath.getParent().getFileName().toString(),
"organizationId",
"workspaceId",
repoPath.getParent().getParent().getFileName().toString(),
FieldName.FLOW_NAME,
stopwatch.getFlow(),
Expand Down Expand Up @@ -676,7 +676,7 @@ public Mono<ArtifactExchangeJson> reconstructArtifactExchangeJsonFromGitRepoWith
final Map<String, Object> data = Map.of(
constantsMap.get(FieldName.ID),
baseArtifactId,
"organizationId",
"workspaceId",
workspaceId,
FieldName.FLOW_NAME,
stopwatch.getFlow(),
Expand Down
2 changes: 1 addition & 1 deletion ...mith-server/src/main/java/com/appsmith/server/newactions/base/NewActionServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ public Map<String, Object> getAnalyticsProperties(NewAction savedAction) {
analyticsProperties.put("actionName", ObjectUtils.defaultIfNull(unpublishedAction.getValidName(), ""));
analyticsProperties.put("applicationId", ObjectUtils.defaultIfNull(savedAction.getApplicationId(), ""));
analyticsProperties.put("pageId", ObjectUtils.defaultIfNull(unpublishedAction.getPageId(), ""));
analyticsProperties.put("orgId", ObjectUtils.defaultIfNull(savedAction.getWorkspaceId(), ""));
analyticsProperties.put("workspaceId", ObjectUtils.defaultIfNull(savedAction.getWorkspaceId(), ""));
analyticsProperties.put("pluginId", ObjectUtils.defaultIfNull(savedAction.getPluginId(), ""));
analyticsProperties.put("pluginType", ObjectUtils.defaultIfNull(savedAction.getPluginType(), ""));
analyticsProperties.put("pluginName", ObjectUtils.defaultIfNull(unpublishedAction.getPluginName(), ""));
Expand Down
2 changes: 1 addition & 1 deletion ...th-server/src/main/java/com/appsmith/server/services/ce/ApplicationPageServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,7 +1218,7 @@ private Mono<Application> sendApplicationPublishedEvent(ApplicationPublishingMet
extraProperties.put("jsLibsCount", objects.getT5().size());
extraProperties.put("appId", defaultIfNull(application.getId(), ""));
extraProperties.put("appName", defaultIfNull(application.getName(), ""));
extraProperties.put("orgId", defaultIfNull(application.getWorkspaceId(), ""));
extraProperties.put("workspaceId", defaultIfNull(application.getWorkspaceId(), ""));
extraProperties.put("isManual", defaultIfNull(isPublishedManually, ""));
extraProperties.put("publishedAt", defaultIfNull(application.getLastDeployedAt(), ""));
extraProperties.put("isPublic", isApplicationPublic);
Expand Down
6 changes: 4 additions & 2 deletions .../appsmith-server/src/main/java/com/appsmith/server/services/ce/MockDataServiceCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ private Mono<User> addAnalyticsForMockDataCreation(String name, String workspace
AnalyticsEvents.CREATE.getEventName(),
user.getUsername(),
Map.of(
"MockDataSource", defaultIfNull(name, ""),
"orgId", defaultIfNull(workspaceId, "")))
"MockDataSource",
defaultIfNull(name, ""),
"workspaceId",
defaultIfNull(workspaceId, "")))
.thenReturn(user));
}
}
2 changes: 1 addition & 1 deletion ...-server/src/main/java/com/appsmith/server/solutions/ce/ActionExecutionSolutionCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ private Mono<ActionExecutionRequest> sendExecuteAnalyticsEvent(
actionDTO.getName(),
"datasource",
Map.of("name", datasourceStorage.getName()),
"orgId",
"workspaceId",
application.getWorkspaceId(),
"appId",
actionDTO.getApplicationId(),
Expand Down
3 changes: 1 addition & 2 deletions ...erver/src/main/java/com/appsmith/server/solutions/ce/CreateDBTablePageSolutionCEImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,8 +1152,7 @@ private Mono<CRUDPageResponseDTO> sendGenerateCRUDPageAnalyticsEvent(
"pageName", page.getName(),
"pluginName", pluginName,
"datasourceId", datasourceStorage.getDatasourceId(),
"organizationId", datasourceStorage.getWorkspaceId(),
"orgId", datasourceStorage.getWorkspaceId());
"workspaceId", datasourceStorage.getWorkspaceId());
return analyticsService
.sendEvent(AnalyticsEvents.GENERATE_CRUD_PAGE.getEventName(), currentUser.getUsername(), data)
.thenReturn(crudPage);
Expand Down
Loading