diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java index 4e266b4d0f..204c93c8bb 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/featureflags/FeatureFlagIdentityTraits.java @@ -21,4 +21,5 @@ public class FeatureFlagIdentityTraits { String tenantId; Set userIdentifiers; Map traits; + String appsmithVersion; } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java index cc612e32dc..0f148be635 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/CacheableFeatureFlagHelperCEImpl.java @@ -116,8 +116,10 @@ public class CacheableFeatureFlagHelperCEImpl implements CacheableFeatureFlagHel return Mono.zip(instanceIdMono, defaultTenantMono, getUserDefaultTraits(user)) .flatMap(objects -> { String tenantId = objects.getT2().getId(); - return this.getRemoteFeatureFlagsByIdentity(new FeatureFlagIdentityTraits( - objects.getT1(), tenantId, Set.of(userIdentifier), objects.getT3())); + String appsmithVersion = releaseNotesService.getRunningVersion(); + FeatureFlagIdentityTraits featureFlagIdentityTraits = new FeatureFlagIdentityTraits( + objects.getT1(), tenantId, Set.of(userIdentifier), objects.getT3(), appsmithVersion); + return this.getRemoteFeatureFlagsByIdentity(featureFlagIdentityTraits); }) .map(newValue -> ObjectUtils.defaultIfNull(newValue.get(userIdentifier), Map.of())); }