From 252e7f3025a0a491c5929fec023214aa60ec254f Mon Sep 17 00:00:00 2001
From: Nirmal Sarswat <25587962+vivonk@users.noreply.github.com>
Date: Fri, 20 Oct 2023 18:14:28 +0530
Subject: [PATCH] fix: instance id identifier without hash in server setup
 complete event (#28264)

## Description
Fixing analytics changes related to hashing of instance id, and removing
unwanted events

#### PR fixes following issue(s)
Fixes https://github.com/appsmithorg/cloud-services/issues/1439

#### Type of change
- Bug fix (non-breaking change which fixes an issue)
- Chore (housekeeping or task changes that don't impact user perception)

## Testing
#### How Has This Been Tested?
- [x] Manual
- [ ] JUnit
- [ ] Jest
- [ ] Cypress

## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 .../com/appsmith/external/constants/AnalyticsEvents.java     | 2 --
 .../server/helpers/ce/InstanceConfigHelperCEImpl.java        | 5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/AnalyticsEvents.java b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/AnalyticsEvents.java
index 68a308a813..07e64f3a67 100644
--- a/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/AnalyticsEvents.java
+++ b/app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/AnalyticsEvents.java
@@ -76,8 +76,6 @@ public enum AnalyticsEvents {
     UNASSIGNED_USERS_FROM_PERMISSION_GROUP,
     ASSIGNED_USER_GROUPS_TO_PERMISSION_GROUP,
     UNASSIGNED_USER_GROUPS_FROM_PERMISSION_GROUP,
-    ACTIVATE_NEW_INSTANCE("Activate_New_Instance"),
-    UPDATE_EXISTING_LICENSE("Update_Existing_License"),
 
     DS_SCHEMA_FETCH_EVENT("Datasource_Schema_Fetch"),
 
diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
index f6458a164c..42db8d6907 100644
--- a/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
+++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/helpers/ce/InstanceConfigHelperCEImpl.java
@@ -117,7 +117,10 @@ public class InstanceConfigHelperCEImpl implements InstanceConfigHelperCE {
                     analyticsProperties.put(FieldNameCE.IP_ADDRESS, ipAddress);
                     analyticsProperties.put(FieldNameCE.VERSION, releaseNotesService.getRunningVersion());
                     return analyticsService.sendEvent(
-                            AnalyticsEvents.SERVER_SETUP_COMPLETE.getEventName(), instanceId, analyticsProperties);
+                            AnalyticsEvents.SERVER_SETUP_COMPLETE.getEventName(),
+                            instanceId,
+                            analyticsProperties,
+                            false);
                 })
                 .subscribeOn(commonConfig.scheduler())
                 .subscribe();