Merge pull request #6497 from devtron-labs/chore-nil-implementation

chore: nil implementations fixed for user attribute in telemetry

Author: Shivam-nagar23

client/telemetry/TelemetryEventClient.go

@@ -98,7 +98,8 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
 	helmAppClient gRPC.HelmAppClient,
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
 	installedAppReadService installedAppReader.InstalledAppReadServiceEA,
-	envVariables *util.EnvironmentVariables) (*TelemetryEventClientImpl, error) {
+	envVariables *util.EnvironmentVariables,
+	userAttributesRepository repository.UserAttributesRepository) (*TelemetryEventClientImpl, error) {
 	cron := cron.New(
 		cron.WithChain(cron.Recover(cronLogger)))
 	cron.Start()
@@ -121,6 +122,7 @@ func NewTelemetryEventClientImpl(logger *zap.SugaredLogger, client *http.Client,
 		cloudProviderIdentifierService: cloudProviderIdentifierService,
 		telemetryConfig:                TelemetryConfig{},
 		globalEnvVariables:             envVariables.GlobalEnvVariables,
+		userAttributesRepository:       userAttributesRepository,
 	}
 
 	watcher.HeartbeatEventForTelemetry()

client/telemetry/TelemetryEventClientExtended.go

@@ -84,7 +84,7 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 	ciBuildConfigService pipeline.CiBuildConfigService, moduleRepository moduleRepo.ModuleRepository, serverDataStore *serverDataStore.ServerDataStore,
 	helmAppClient client.HelmAppClient, installedAppReadService installedAppReader.InstalledAppReadService, userAttributesRepository repository.UserAttributesRepository,
 	cloudProviderIdentifierService cloudProviderIdentifier.ProviderIdentifierService, cronLogger *cron3.CronLoggerImpl,
-	gitOpsConfigReadService config.GitOpsConfigReadService) (*TelemetryEventClientImplExtended, error) {
+	gitOpsConfigReadService config.GitOpsConfigReadService, envVariables *util.EnvironmentVariables) (*TelemetryEventClientImplExtended, error) {
 
 	cron := cron.New(
 		cron.WithChain(cron.Recover(cronLogger)))
@@ -123,6 +123,7 @@ func NewTelemetryEventClientImplExtended(logger *zap.SugaredLogger, client *http
 			userAttributesRepository:       userAttributesRepository,
 			cloudProviderIdentifierService: cloudProviderIdentifierService,
 			telemetryConfig:                TelemetryConfig{},
+			globalEnvVariables:             envVariables.GlobalEnvVariables,
 		},
 	}