feat(serviceaccount): add analytics support for service account

vikrantgupta25 · vikrantgupta25 · commit bc722c821ba8 · 2026-03-10T13:04:59.000+05:30
diff --git a/ee/modules/dashboard/impldashboard/module.go b/ee/modules/dashboard/impldashboard/module.go
@@ -215,8 +215,8 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.U
 	return module.pkgDashboardModule.Update(ctx, orgID, id, updatedBy, data, diff)
 }
 
-func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedByUserID valuer.UUID, lock bool) error {
-	return module.pkgDashboardModule.LockUnlock(ctx, orgID, id, updatedByUserID, lock)
+func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, lock bool) error {
+	return module.pkgDashboardModule.LockUnlock(ctx, orgID, id, updatedBy, lock)
 }
 
 func (module *module) MustGetTypeables() []authtypes.Typeable {
diff --git a/pkg/modules/dashboard/dashboard.go b/pkg/modules/dashboard/dashboard.go
@@ -43,7 +43,7 @@ type Module interface {
 
 	Update(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, data dashboardtypes.UpdatableDashboard, diff int) (*dashboardtypes.Dashboard, error)
 
-	LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedByUserID valuer.UUID, lock bool) error
+	LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, lock bool) error
 
 	Delete(ctx context.Context, orgID valuer.UUID, id valuer.UUID) error
 
diff --git a/pkg/modules/dashboard/impldashboard/handler.go b/pkg/modules/dashboard/impldashboard/handler.go
@@ -58,7 +58,6 @@ func (handler *handler) Create(rw http.ResponseWriter, r *http.Request) {
 		dashboardMigrator.Migrate(ctx, req)
 	}
 
-	// TODO[@vikrantgupta25]: figure out what to do with this author thing
 	dashboard, err := handler.module.Create(ctx, orgID, claims.Email, valuer.MustNewUUID(claims.GetIdentityID()), req)
 	if err != nil {
 		render.Error(rw, err)
@@ -157,7 +156,7 @@ func (handler *handler) LockUnlock(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = handler.module.LockUnlock(ctx, orgID, dashboardID, valuer.MustNewUUID(claims.UserID), *req.Locked)
+	err = handler.module.LockUnlock(ctx, orgID, dashboardID, valuer.MustNewEmail(claims.Email).String(), *req.Locked)
 	if err != nil {
 		render.Error(rw, err)
 		return
diff --git a/pkg/modules/dashboard/impldashboard/module.go b/pkg/modules/dashboard/impldashboard/module.go
@@ -102,18 +102,13 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.U
 	return dashboard, nil
 }
 
-func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedByUserID valuer.UUID, lock bool) error {
+func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, lock bool) error {
 	dashboard, err := module.Get(ctx, orgID, id)
 	if err != nil {
 		return err
 	}
 
-	user, err := module.userGetter.GetByOrgIDAndID(ctx, orgID, updatedByUserID)
-	if err != nil {
-		return err
-	}
-
-	err = dashboard.LockUnlock(lock, user.Role, user.Email.String())
+	err = dashboard.LockUnlock(lock, updatedBy)
 	if err != nil {
 		return err
 	}
diff --git a/pkg/modules/serviceaccount/implserviceaccount/handler.go b/pkg/modules/serviceaccount/implserviceaccount/handler.go
@@ -300,7 +300,7 @@ func (handler *handler) UpdateFactorAPIKey(rw http.ResponseWriter, r *http.Reque
 	}
 
 	factorAPIKey.Update(req.Name, req.ExpiresAt)
-	err = handler.module.UpdateFactorAPIKey(ctx, serviceAccount.ID, factorAPIKey)
+	err = handler.module.UpdateFactorAPIKey(ctx, valuer.MustNewUUID(claims.OrgID), serviceAccount.ID, factorAPIKey)
 	if err != nil {
 		render.Error(rw, err)
 		return
diff --git a/pkg/modules/serviceaccount/implserviceaccount/module.go b/pkg/modules/serviceaccount/implserviceaccount/module.go
@@ -3,6 +3,7 @@ package implserviceaccount
 import (
 	"context"
 
+	"github.com/SigNoz/signoz/pkg/analytics"
 	"github.com/SigNoz/signoz/pkg/authz"
 	"github.com/SigNoz/signoz/pkg/emailing"
 	"github.com/SigNoz/signoz/pkg/errors"
@@ -15,15 +16,16 @@ import (
 )
 
 type module struct {
-	store    serviceaccounttypes.Store
-	authz    authz.AuthZ
-	emailing emailing.Emailing
-	settings factory.ScopedProviderSettings
+	store     serviceaccounttypes.Store
+	authz     authz.AuthZ
+	emailing  emailing.Emailing
+	analytics analytics.Analytics
+	settings  factory.ScopedProviderSettings
 }
 
-func NewModule(store serviceaccounttypes.Store, authz authz.AuthZ, emailing emailing.Emailing, providerSettings factory.ProviderSettings) serviceaccount.Module {
+func NewModule(store serviceaccounttypes.Store, authz authz.AuthZ, emailing emailing.Emailing, analytics analytics.Analytics, providerSettings factory.ProviderSettings) serviceaccount.Module {
 	settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/modules/serviceaccount/implserviceaccount")
-	return &module{store: store, authz: authz, emailing: emailing, settings: settings}
+	return &module{store: store, authz: authz, emailing: emailing, analytics: analytics, settings: settings}
 }
 
 func (module *module) Create(ctx context.Context, orgID valuer.UUID, serviceAccount *serviceaccounttypes.ServiceAccount) error {
@@ -58,6 +60,8 @@ func (module *module) Create(ctx context.Context, orgID valuer.UUID, serviceAcco
 		return err
 	}
 
+	module.analytics.IdentifyUser(ctx, orgID.String(), serviceAccount.ID.String(), serviceAccount.Traits())
+	module.analytics.TrackUser(ctx, orgID.String(), serviceAccount.ID.String(), "Service Account Created", serviceAccount.Traits())
 	return nil
 }
 
@@ -76,6 +80,8 @@ func (module *module) GetOrCreate(ctx context.Context, serviceAccount *serviceac
 		return nil, err
 	}
 
+	module.analytics.IdentifyUser(ctx, serviceAccount.OrgID.String(), serviceAccount.ID.String(), serviceAccount.Traits())
+	module.analytics.TrackUser(ctx, serviceAccount.OrgID.String(), serviceAccount.ID.String(), "Service Account Created", serviceAccount.Traits())
 	return serviceAccount, nil
 }
 
@@ -186,6 +192,8 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, input *serv
 		return err
 	}
 
+	module.analytics.IdentifyUser(ctx, orgID.String(), input.ID.String(), input.Traits())
+	module.analytics.TrackUser(ctx, orgID.String(), input.ID.String(), "Service Account Updated", input.Traits())
 	return nil
 }
 
@@ -212,6 +220,7 @@ func (module *module) UpdateStatus(ctx context.Context, orgID valuer.UUID, input
 		}
 	}
 
+	module.analytics.TrackUser(ctx, orgID.String(), input.ID.String(), "Service Account Deleted", map[string]any{})
 	return nil
 }
 
@@ -274,6 +283,7 @@ func (module *module) CreateFactorAPIKey(ctx context.Context, factorAPIKey *serv
 		module.settings.Logger().ErrorContext(ctx, "failed to send email", "error", err)
 	}
 
+	module.analytics.TrackUser(ctx, serviceAccount.OrgID, serviceAccount.ID.String(), "API Key created", factorAPIKey.Traits())
 	return nil
 }
 
@@ -295,8 +305,14 @@ func (module *module) ListFactorAPIKey(ctx context.Context, serviceAccountID val
 	return serviceaccounttypes.NewFactorAPIKeyFromStorables(storables), nil
 }
 
-func (module *module) UpdateFactorAPIKey(ctx context.Context, serviceAccountID valuer.UUID, factorAPIKey *serviceaccounttypes.FactorAPIKey) error {
-	return module.store.UpdateFactorAPIKey(ctx, serviceAccountID, serviceaccounttypes.NewStorableFactorAPIKey(factorAPIKey))
+func (module *module) UpdateFactorAPIKey(ctx context.Context, orgID valuer.UUID, serviceAccountID valuer.UUID, factorAPIKey *serviceaccounttypes.FactorAPIKey) error {
+	err := module.store.UpdateFactorAPIKey(ctx, serviceAccountID, serviceaccounttypes.NewStorableFactorAPIKey(factorAPIKey))
+	if err != nil {
+		return err
+	}
+
+	module.analytics.TrackUser(ctx, orgID.String(), serviceAccountID.String(), "API Key updated", factorAPIKey.Traits())
+	return nil
 }
 
 func (module *module) RevokeFactorAPIKey(ctx context.Context, serviceAccountID valuer.UUID, id valuer.UUID) error {
@@ -324,9 +340,26 @@ func (module *module) RevokeFactorAPIKey(ctx context.Context, serviceAccountID v
 		module.settings.Logger().ErrorContext(ctx, "failed to send email", "error", err)
 	}
 
+	module.analytics.TrackUser(ctx, serviceAccount.OrgID, serviceAccountID.String(), "API Key revoked", factorAPIKey.Traits())
 	return nil
 }
 
+func (module *module) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {
+	stats := make(map[string]any)
+
+	count, err := module.store.CountByOrgID(ctx, orgID)
+	if err == nil {
+		stats["serviceaccount.count"] = count
+	}
+
+	count, err = module.store.CountFactorAPIKeysByOrgID(ctx, orgID)
+	if err == nil {
+		stats["serviceaccount.keys.count"] = count
+	}
+
+	return stats, nil
+}
+
 func (module *module) disableServiceAccount(ctx context.Context, orgID valuer.UUID, input *serviceaccounttypes.ServiceAccount) error {
 	err := module.authz.Revoke(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, input.ID.String(), orgID, nil))
 	if err != nil {
diff --git a/pkg/modules/serviceaccount/implserviceaccount/store.go b/pkg/modules/serviceaccount/implserviceaccount/store.go
@@ -164,6 +164,23 @@ func (store *store) GetServiceAccountRoles(ctx context.Context, id valuer.UUID)
 	return storables, nil
 }
 
+func (store *store) CountByOrgID(ctx context.Context, orgID valuer.UUID) (int64, error) {
+	storable := new(serviceaccounttypes.StorableServiceAccount)
+
+	count, err := store.
+		sqlstore.
+		BunDB().
+		NewSelect().
+		Model(storable).
+		Where("org_id = ?", orgID).
+		Count(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	return int64(count), nil
+}
+
 func (store *store) ListServiceAccountRolesByOrgID(ctx context.Context, orgID valuer.UUID) ([]*serviceaccounttypes.StorableServiceAccountRole, error) {
 	storables := make([]*serviceaccounttypes.StorableServiceAccountRole, 0)
 
@@ -283,6 +300,25 @@ func (store *store) ListFactorAPIKeyByOrgID(ctx context.Context, orgID valuer.UU
 	return storables, nil
 }
 
+func (store *store) CountFactorAPIKeysByOrgID(ctx context.Context, orgID valuer.UUID) (int64, error) {
+	storable := new(serviceaccounttypes.StorableFactorAPIKey)
+
+	count, err := store.
+		sqlstore.
+		BunDBCtx(ctx).
+		NewSelect().
+		Model(storable).
+		Join("JOIN service_account").
+		JoinOn("service_account.id = factor_api_key.service_account_id").
+		Where("service_account.org_id = ?", orgID).
+		Count(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	return int64(count), nil
+}
+
 func (store *store) UpdateFactorAPIKey(ctx context.Context, serviceAccountID valuer.UUID, storable *serviceaccounttypes.StorableFactorAPIKey) error {
 	_, err := store.
 		sqlstore.
diff --git a/pkg/modules/serviceaccount/serviceaccount.go b/pkg/modules/serviceaccount/serviceaccount.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"net/http"
 
+	"github.com/SigNoz/signoz/pkg/statsreporter"
 	"github.com/SigNoz/signoz/pkg/types/serviceaccounttypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
@@ -41,10 +42,12 @@ type Module interface {
 	ListFactorAPIKey(context.Context, valuer.UUID) ([]*serviceaccounttypes.FactorAPIKey, error)
 
 	// Updates an existing API key for a service account
-	UpdateFactorAPIKey(context.Context, valuer.UUID, *serviceaccounttypes.FactorAPIKey) error
+	UpdateFactorAPIKey(context.Context, valuer.UUID, valuer.UUID, *serviceaccounttypes.FactorAPIKey) error
 
 	// Revokes an existing API key for a service account
 	RevokeFactorAPIKey(context.Context, valuer.UUID, valuer.UUID) error
+
+	statsreporter.StatsCollector
 }
 
 type Handler interface {
diff --git a/pkg/modules/spanpercentile/implspanpercentile/handler.go b/pkg/modules/spanpercentile/implspanpercentile/handler.go
@@ -35,7 +35,7 @@ func (h *handler) GetSpanPercentileDetails(w http.ResponseWriter, r *http.Reques
 		return
 	}
 
-	result, err := h.module.GetSpanPercentile(r.Context(), valuer.MustNewUUID(claims.OrgID), valuer.MustNewUUID(claims.UserID), spanPercentileRequest)
+	result, err := h.module.GetSpanPercentile(r.Context(), valuer.MustNewUUID(claims.OrgID), spanPercentileRequest)
 	if err != nil {
 		render.Error(w, err)
 		return
diff --git a/pkg/modules/spanpercentile/implspanpercentile/module.go b/pkg/modules/spanpercentile/implspanpercentile/module.go
@@ -28,7 +28,7 @@ func NewModule(
 	}
 }
 
-func (m *module) GetSpanPercentile(ctx context.Context, orgID valuer.UUID, userID valuer.UUID, req *spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error) {
+func (m *module) GetSpanPercentile(ctx context.Context, orgID valuer.UUID, req *spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error) {
 	ctx = ctxtypes.NewContextWithCommentVals(ctx, map[string]string{
 		instrumentationtypes.CodeNamespace:    "spanpercentile",
 		instrumentationtypes.CodeFunctionName: "GetSpanPercentile",
diff --git a/pkg/modules/spanpercentile/spanpercentile.go b/pkg/modules/spanpercentile/spanpercentile.go
@@ -9,7 +9,7 @@ import (
 )
 
 type Module interface {
-	GetSpanPercentile(ctx context.Context, orgID valuer.UUID, userID valuer.UUID, req *spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error)
+	GetSpanPercentile(ctx context.Context, orgID valuer.UUID, req *spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error)
 }
 
 type Handler interface {
diff --git a/pkg/query-service/app/http_handler.go b/pkg/query-service/app/http_handler.go
@@ -512,7 +512,7 @@ func (aH *APIHandler) RegisterRoutes(router *mux.Router, am *middleware.AuthZ) {
 	router.HandleFunc("/api/v1/dashboards/{id}", am.ViewAccess(aH.Get)).Methods(http.MethodGet)
 	router.HandleFunc("/api/v1/dashboards/{id}", am.EditAccess(aH.Signoz.Handlers.Dashboard.Update)).Methods(http.MethodPut)
 	router.HandleFunc("/api/v1/dashboards/{id}", am.EditAccess(aH.Signoz.Handlers.Dashboard.Delete)).Methods(http.MethodDelete)
-	router.HandleFunc("/api/v1/dashboards/{id}/lock", am.EditAccess(aH.Signoz.Handlers.Dashboard.LockUnlock)).Methods(http.MethodPut)
+	router.HandleFunc("/api/v1/dashboards/{id}/lock", am.AdminAccess(aH.Signoz.Handlers.Dashboard.LockUnlock)).Methods(http.MethodPut)
 	router.HandleFunc("/api/v2/variables/query", am.ViewAccess(aH.queryDashboardVarsV2)).Methods(http.MethodPost)
 
 	router.HandleFunc("/api/v1/explorer/views", am.ViewAccess(aH.Signoz.Handlers.SavedView.List)).Methods(http.MethodGet)
diff --git a/pkg/signoz/module.go b/pkg/signoz/module.go
@@ -113,6 +113,6 @@ func NewModules(
 		Services:        implservices.NewModule(querier, telemetryStore),
 		MetricsExplorer: implmetricsexplorer.NewModule(telemetryStore, telemetryMetadataStore, cache, ruleStore, dashboard, providerSettings, config.MetricsExplorer),
 		Promote:         implpromote.NewModule(telemetryMetadataStore, telemetryStore),
-		ServiceAccount:  implserviceaccount.NewModule(implserviceaccount.NewStore(sqlstore), authz, emailing, providerSettings),
+		ServiceAccount:  implserviceaccount.NewModule(implserviceaccount.NewStore(sqlstore), authz, emailing, analytics, providerSettings),
 	}
 }
diff --git a/pkg/signoz/signoz.go b/pkg/signoz/signoz.go
@@ -431,6 +431,7 @@ func New(
 		tokenizer,
 		config,
 		modules.AuthDomain,
+		modules.ServiceAccount,
 	}
 
 	// Initialize stats reporter from the available stats reporter provider factories
diff --git a/pkg/types/dashboardtypes/dashboard.go b/pkg/types/dashboardtypes/dashboard.go
@@ -284,18 +284,7 @@ func (dashboard *Dashboard) Update(ctx context.Context, updatableDashboard Updat
 	return nil
 }
 
-func (dashboard *Dashboard) CanLockUnlock(role types.Role, updatedBy string) error {
-	if dashboard.CreatedBy != updatedBy && role != types.RoleAdmin {
-		return errors.Newf(errors.TypeForbidden, errors.CodeForbidden, "you are not authorized to lock/unlock this dashboard")
-	}
-	return nil
-}
-
-func (dashboard *Dashboard) LockUnlock(lock bool, role types.Role, updatedBy string) error {
-	err := dashboard.CanLockUnlock(role, updatedBy)
-	if err != nil {
-		return err
-	}
+func (dashboard *Dashboard) LockUnlock(lock bool, updatedBy string) error {
 	dashboard.Locked = lock
 	dashboard.UpdatedBy = updatedBy
 	dashboard.UpdatedAt = time.Now()
diff --git a/pkg/types/serviceaccounttypes/factor_api_key.go b/pkg/types/serviceaccounttypes/factor_api_key.go
@@ -192,3 +192,10 @@ func (key FactorAPIKey) MarshalBinary() ([]byte, error) {
 func (key *FactorAPIKey) UnmarshalBinary(data []byte) error {
 	return json.Unmarshal(data, key)
 }
+
+func (key *FactorAPIKey) Traits() map[string]any {
+	return map[string]any{
+		"name":       key.Name,
+		"expires_at": key.ExpiresAt,
+	}
+}
diff --git a/pkg/types/serviceaccounttypes/service_acccount.go b/pkg/types/serviceaccounttypes/service_acccount.go
@@ -285,3 +285,12 @@ func (sa *StorableServiceAccount) ToIdentity() *authtypes.Identity {
 		Email:            valuer.MustNewEmail(sa.Email),
 	}
 }
+
+func (sa *ServiceAccount) Traits() map[string]any {
+	return map[string]any{
+		"name":       sa.Name,
+		"roles":      sa.Roles,
+		"email":      sa.Email.String(),
+		"created_at": sa.CreatedAt,
+	}
+}
diff --git a/pkg/types/serviceaccounttypes/store.go b/pkg/types/serviceaccounttypes/store.go
@@ -12,6 +12,7 @@ type Store interface {
 	Get(context.Context, valuer.UUID, valuer.UUID) (*StorableServiceAccount, error)
 	GetByID(context.Context, valuer.UUID) (*StorableServiceAccount, error)
 	GetByOrgIDAndName(context.Context, valuer.UUID, string) (*StorableServiceAccount, error)
+	CountByOrgID(context.Context, valuer.UUID) (int64, error)
 	List(context.Context, valuer.UUID) ([]*StorableServiceAccount, error)
 	Update(context.Context, valuer.UUID, *StorableServiceAccount) error
 	Delete(context.Context, valuer.UUID, valuer.UUID) error
@@ -26,6 +27,7 @@ type Store interface {
 	CreateFactorAPIKey(context.Context, *StorableFactorAPIKey) error
 	GetFactorAPIKey(context.Context, valuer.UUID, valuer.UUID) (*StorableFactorAPIKey, error)
 	GetFactorAPIKeyByKey(context.Context, string) (*StorableFactorAPIKey, error)
+	CountFactorAPIKeysByOrgID(context.Context, valuer.UUID) (int64, error)
 	ListFactorAPIKey(context.Context, valuer.UUID) ([]*StorableFactorAPIKey, error)
 	ListFactorAPIKeyByOrgID(context.Context, valuer.UUID) ([]*StorableFactorAPIKey, error)
 	UpdateFactorAPIKey(context.Context, valuer.UUID, *StorableFactorAPIKey) error

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,8 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.U`
`215`	`215`	`return module.pkgDashboardModule.Update(ctx, orgID, id, updatedBy, data, diff)`
`216`	`216`	`}`
`217`	`217`
`218`		`-func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedByUserID valuer.UUID, lock bool) error {`
`219`		`- return module.pkgDashboardModule.LockUnlock(ctx, orgID, id, updatedByUserID, lock)`
	`218`	`+func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, lock bool) error {`
	`219`	`+ return module.pkgDashboardModule.LockUnlock(ctx, orgID, id, updatedBy, lock)`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`func (module *module) MustGetTypeables() []authtypes.Typeable {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@ func (handler handler) Create(rw http.ResponseWriter, r http.Request) {`
`58`	`58`	`dashboardMigrator.Migrate(ctx, req)`
`59`	`59`	`}`
`60`	`60`
`61`		`- // TODO[@vikrantgupta25]: figure out what to do with this author thing`
`62`	`61`	`dashboard, err := handler.module.Create(ctx, orgID, claims.Email, valuer.MustNewUUID(claims.GetIdentityID()), req)`
`63`	`62`	`if err != nil {`
`64`	`63`	`render.Error(rw, err)`
`@@ -157,7 +156,7 @@ func (handler handler) LockUnlock(rw http.ResponseWriter, r http.Request) {`
`157`	`156`	`return`
`158`	`157`	`}`
`159`	`158`
`160`		`- err = handler.module.LockUnlock(ctx, orgID, dashboardID, valuer.MustNewUUID(claims.UserID), *req.Locked)`
	`159`	`+ err = handler.module.LockUnlock(ctx, orgID, dashboardID, valuer.MustNewEmail(claims.Email).String(), *req.Locked)`
`161`	`160`	`if err != nil {`
`162`	`161`	`render.Error(rw, err)`
`163`	`162`	`return`
Original file line number	Diff line number	Diff line change
`@@ -102,18 +102,13 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, id valuer.U`
`102`	`102`	`return dashboard, nil`
`103`	`103`	`}`
`104`	`104`
`105`		`-func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedByUserID valuer.UUID, lock bool) error {`
	`105`	`+func (module *module) LockUnlock(ctx context.Context, orgID valuer.UUID, id valuer.UUID, updatedBy string, lock bool) error {`
`106`	`106`	`dashboard, err := module.Get(ctx, orgID, id)`
`107`	`107`	`if err != nil {`
`108`	`108`	`return err`
`109`	`109`	`}`
`110`	`110`
`111`		`- user, err := module.userGetter.GetByOrgIDAndID(ctx, orgID, updatedByUserID)`
`112`		`- if err != nil {`
`113`		`- return err`
`114`		`- }`
`115`		`-`
`116`		`- err = dashboard.LockUnlock(lock, user.Role, user.Email.String())`
	`111`	`+ err = dashboard.LockUnlock(lock, updatedBy)`
`117`	`112`	`if err != nil {`
`118`	`113`	`return err`
`119`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@ func (handler handler) UpdateFactorAPIKey(rw http.ResponseWriter, r http.Reque`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`factorAPIKey.Update(req.Name, req.ExpiresAt)`
`303`		`- err = handler.module.UpdateFactorAPIKey(ctx, serviceAccount.ID, factorAPIKey)`
	`303`	`+ err = handler.module.UpdateFactorAPIKey(ctx, valuer.MustNewUUID(claims.OrgID), serviceAccount.ID, factorAPIKey)`
`304`	`304`	`if err != nil {`
`305`	`305`	`render.Error(rw, err)`
`306`	`306`	`return`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package implserviceaccount`
`3`	`3`	`import (`
`4`	`4`	`"context"`
`5`	`5`
	`6`	`+ "github.com/SigNoz/signoz/pkg/analytics"`
`6`	`7`	`"github.com/SigNoz/signoz/pkg/authz"`
`7`	`8`	`"github.com/SigNoz/signoz/pkg/emailing"`
`8`	`9`	`"github.com/SigNoz/signoz/pkg/errors"`
`@@ -15,15 +16,16 @@ import (`
`15`	`16`	`)`
`16`	`17`
`17`	`18`	`type module struct {`
`18`		`- store serviceaccounttypes.Store`
`19`		`- authz authz.AuthZ`
`20`		`- emailing emailing.Emailing`
`21`		`- settings factory.ScopedProviderSettings`
	`19`	`+ store serviceaccounttypes.Store`
	`20`	`+ authz authz.AuthZ`
	`21`	`+ emailing emailing.Emailing`
	`22`	`+ analytics analytics.Analytics`
	`23`	`+ settings factory.ScopedProviderSettings`
`22`	`24`	`}`
`23`	`25`
`24`		`-func NewModule(store serviceaccounttypes.Store, authz authz.AuthZ, emailing emailing.Emailing, providerSettings factory.ProviderSettings) serviceaccount.Module {`
	`26`	`+func NewModule(store serviceaccounttypes.Store, authz authz.AuthZ, emailing emailing.Emailing, analytics analytics.Analytics, providerSettings factory.ProviderSettings) serviceaccount.Module {`
`25`	`27`	`settings := factory.NewScopedProviderSettings(providerSettings, "github.com/SigNoz/signoz/pkg/modules/serviceaccount/implserviceaccount")`
`26`		`- return &module{store: store, authz: authz, emailing: emailing, settings: settings}`
	`28`	`+ return &module{store: store, authz: authz, emailing: emailing, analytics: analytics, settings: settings}`
`27`	`29`	`}`
`28`	`30`
`29`	`31`	`func (module module) Create(ctx context.Context, orgID valuer.UUID, serviceAccount serviceaccounttypes.ServiceAccount) error {`
`@@ -58,6 +60,8 @@ func (module *module) Create(ctx context.Context, orgID valuer.UUID, serviceAcco`
`58`	`60`	`return err`
`59`	`61`	`}`
`60`	`62`
	`63`	`+ module.analytics.IdentifyUser(ctx, orgID.String(), serviceAccount.ID.String(), serviceAccount.Traits())`
	`64`	`+ module.analytics.TrackUser(ctx, orgID.String(), serviceAccount.ID.String(), "Service Account Created", serviceAccount.Traits())`
`61`	`65`	`return nil`
`62`	`66`	`}`
`63`	`67`
`@@ -76,6 +80,8 @@ func (module module) GetOrCreate(ctx context.Context, serviceAccount serviceac`
`76`	`80`	`return nil, err`
`77`	`81`	`}`
`78`	`82`
	`83`	`+ module.analytics.IdentifyUser(ctx, serviceAccount.OrgID.String(), serviceAccount.ID.String(), serviceAccount.Traits())`
	`84`	`+ module.analytics.TrackUser(ctx, serviceAccount.OrgID.String(), serviceAccount.ID.String(), "Service Account Created", serviceAccount.Traits())`
`79`	`85`	`return serviceAccount, nil`
`80`	`86`	`}`
`81`	`87`
`@@ -186,6 +192,8 @@ func (module module) Update(ctx context.Context, orgID valuer.UUID, input serv`
`186`	`192`	`return err`
`187`	`193`	`}`
`188`	`194`
	`195`	`+ module.analytics.IdentifyUser(ctx, orgID.String(), input.ID.String(), input.Traits())`
	`196`	`+ module.analytics.TrackUser(ctx, orgID.String(), input.ID.String(), "Service Account Updated", input.Traits())`
`189`	`197`	`return nil`
`190`	`198`	`}`
`191`	`199`
`@@ -212,6 +220,7 @@ func (module *module) UpdateStatus(ctx context.Context, orgID valuer.UUID, input`
`212`	`220`	`}`
`213`	`221`	`}`
`214`	`222`
	`223`	`+ module.analytics.TrackUser(ctx, orgID.String(), input.ID.String(), "Service Account Deleted", map[string]any{})`
`215`	`224`	`return nil`
`216`	`225`	`}`
`217`	`226`
`@@ -274,6 +283,7 @@ func (module module) CreateFactorAPIKey(ctx context.Context, factorAPIKey serv`
`274`	`283`	`module.settings.Logger().ErrorContext(ctx, "failed to send email", "error", err)`
`275`	`284`	`}`
`276`	`285`
	`286`	`+ module.analytics.TrackUser(ctx, serviceAccount.OrgID, serviceAccount.ID.String(), "API Key created", factorAPIKey.Traits())`
`277`	`287`	`return nil`
`278`	`288`	`}`
`279`	`289`
`@@ -295,8 +305,14 @@ func (module *module) ListFactorAPIKey(ctx context.Context, serviceAccountID val`
`295`	`305`	`return serviceaccounttypes.NewFactorAPIKeyFromStorables(storables), nil`
`296`	`306`	`}`
`297`	`307`
`298`		`-func (module module) UpdateFactorAPIKey(ctx context.Context, serviceAccountID valuer.UUID, factorAPIKey serviceaccounttypes.FactorAPIKey) error {`
`299`		`- return module.store.UpdateFactorAPIKey(ctx, serviceAccountID, serviceaccounttypes.NewStorableFactorAPIKey(factorAPIKey))`
	`308`	`+func (module module) UpdateFactorAPIKey(ctx context.Context, orgID valuer.UUID, serviceAccountID valuer.UUID, factorAPIKey serviceaccounttypes.FactorAPIKey) error {`
	`309`	`+ err := module.store.UpdateFactorAPIKey(ctx, serviceAccountID, serviceaccounttypes.NewStorableFactorAPIKey(factorAPIKey))`
	`310`	`+ if err != nil {`
	`311`	`+ return err`
	`312`	`+ }`
	`313`	`+`
	`314`	`+ module.analytics.TrackUser(ctx, orgID.String(), serviceAccountID.String(), "API Key updated", factorAPIKey.Traits())`
	`315`	`+ return nil`
`300`	`316`	`}`
`301`	`317`
`302`	`318`	`func (module *module) RevokeFactorAPIKey(ctx context.Context, serviceAccountID valuer.UUID, id valuer.UUID) error {`
`@@ -324,9 +340,26 @@ func (module *module) RevokeFactorAPIKey(ctx context.Context, serviceAccountID v`
`324`	`340`	`module.settings.Logger().ErrorContext(ctx, "failed to send email", "error", err)`
`325`	`341`	`}`
`326`	`342`
	`343`	`+ module.analytics.TrackUser(ctx, serviceAccount.OrgID, serviceAccountID.String(), "API Key revoked", factorAPIKey.Traits())`
`327`	`344`	`return nil`
`328`	`345`	`}`
`329`	`346`
	`347`	`+func (module *module) Collect(ctx context.Context, orgID valuer.UUID) (map[string]any, error) {`
	`348`	`+ stats := make(map[string]any)`
	`349`	`+`
	`350`	`+ count, err := module.store.CountByOrgID(ctx, orgID)`
	`351`	`+ if err == nil {`
	`352`	`+ stats["serviceaccount.count"] = count`
	`353`	`+ }`
	`354`	`+`
	`355`	`+ count, err = module.store.CountFactorAPIKeysByOrgID(ctx, orgID)`
	`356`	`+ if err == nil {`
	`357`	`+ stats["serviceaccount.keys.count"] = count`
	`358`	`+ }`
	`359`	`+`
	`360`	`+ return stats, nil`
	`361`	`+}`
	`362`	`+`
`330`	`363`	`func (module module) disableServiceAccount(ctx context.Context, orgID valuer.UUID, input serviceaccounttypes.ServiceAccount) error {`
`331`	`364`	`err := module.authz.Revoke(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, input.ID.String(), orgID, nil))`
`332`	`365`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ func (h handler) GetSpanPercentileDetails(w http.ResponseWriter, r http.Reques`
`35`	`35`	`return`
`36`	`36`	`}`
`37`	`37`
`38`		`- result, err := h.module.GetSpanPercentile(r.Context(), valuer.MustNewUUID(claims.OrgID), valuer.MustNewUUID(claims.UserID), spanPercentileRequest)`
	`38`	`+ result, err := h.module.GetSpanPercentile(r.Context(), valuer.MustNewUUID(claims.OrgID), spanPercentileRequest)`
`39`	`39`	`if err != nil {`
`40`	`40`	`render.Error(w, err)`
`41`	`41`	`return`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func NewModule(`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`-func (m module) GetSpanPercentile(ctx context.Context, orgID valuer.UUID, userID valuer.UUID, req spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error) {`
	`31`	`+func (m module) GetSpanPercentile(ctx context.Context, orgID valuer.UUID, req spanpercentiletypes.SpanPercentileRequest) (*spanpercentiletypes.SpanPercentileResponse, error) {`
`32`	`32`	`ctx = ctxtypes.NewContextWithCommentVals(ctx, map[string]string{`
`33`	`33`	`instrumentationtypes.CodeNamespace: "spanpercentile",`
`34`	`34`	`instrumentationtypes.CodeFunctionName: "GetSpanPercentile",`