GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-08 17:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore identity for default user (#7257)

Browse Source
This commit is contained in:
Vishal Sharma 2025-03-11 08:23:10 +05:30 committed by GitHub
parent e92e0b6e29
commit 8fbf8155de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/query-service/app/http_handler.go
View File

@ -1545,9 +1545,9 @@ func (aH *APIHandler) registerEvent(w http.ResponseWriter, r *http.Request) {
case model.TrackEvent: case model.TrackEvent:
telemetry.GetInstance().SendEvent(request.EventName, request.Attributes, claims.Email, request.RateLimited, true) telemetry.GetInstance().SendEvent(request.EventName, request.Attributes, claims.Email, request.RateLimited, true)
case model.GroupEvent: case model.GroupEvent:
telemetry.GetInstance().SendGroupEvent(request.Attributes) telemetry.GetInstance().SendGroupEvent(request.Attributes, claims.Email)
case model.IdentifyEvent: case model.IdentifyEvent:
telemetry.GetInstance().SendIdentifyEvent(request.Attributes) telemetry.GetInstance().SendIdentifyEvent(request.Attributes, claims.Email)
} }
aH.WriteJSON(w, r, map[string]string{"data": "Event Processed Successfully"}) aH.WriteJSON(w, r, map[string]string{"data": "Event Processed Successfully"})
} else { } else {

38
pkg/query-service/telemetry/telemetry.go
View File

@ -425,7 +425,7 @@ func createTelemetry() {
"total_metrics_based_panels": dashboardsInfo.MetricBasedPanels, "total_metrics_based_panels": dashboardsInfo.MetricBasedPanels,
"total_logs_based_panels": dashboardsInfo.LogsBasedPanels, "total_logs_based_panels": dashboardsInfo.LogsBasedPanels,
"total_traces_based_panels": dashboardsInfo.TracesBasedPanels, "total_traces_based_panels": dashboardsInfo.TracesBasedPanels,
}) }, "")
telemetry.SendGroupEvent(map[string]interface{}{ telemetry.SendGroupEvent(map[string]interface{}{
"total_logs": totalLogs, "total_logs": totalLogs,
"total_traces": totalSpans, "total_traces": totalSpans,
@ -442,7 +442,7 @@ func createTelemetry() {
"total_metrics_based_panels": dashboardsInfo.MetricBasedPanels, "total_metrics_based_panels": dashboardsInfo.MetricBasedPanels,
"total_logs_based_panels": dashboardsInfo.LogsBasedPanels, "total_logs_based_panels": dashboardsInfo.LogsBasedPanels,
"total_traces_based_panels": dashboardsInfo.TracesBasedPanels, "total_traces_based_panels": dashboardsInfo.TracesBasedPanels,
}) }, "")
} }
} }
} }
@ -451,16 +451,16 @@ func createTelemetry() {
} }
if totalLogs > 0 { if totalLogs > 0 {
telemetry.SendIdentifyEvent(map[string]interface{}{"sent_logs": true}) telemetry.SendIdentifyEvent(map[string]interface{}{"sent_logs": true}, "")
telemetry.SendGroupEvent(map[string]interface{}{"sent_logs": true}) telemetry.SendGroupEvent(map[string]interface{}{"sent_logs": true}, "")
} }
if totalSpans > 0 { if totalSpans > 0 {
telemetry.SendIdentifyEvent(map[string]interface{}{"sent_traces": true}) telemetry.SendIdentifyEvent(map[string]interface{}{"sent_traces": true}, "")
telemetry.SendGroupEvent(map[string]interface{}{"sent_traces": true}) telemetry.SendGroupEvent(map[string]interface{}{"sent_traces": true}, "")
} }
if totalSamples > 0 { if totalSamples > 0 {
telemetry.SendIdentifyEvent(map[string]interface{}{"sent_metrics": true}) telemetry.SendIdentifyEvent(map[string]interface{}{"sent_metrics": true}, "")
telemetry.SendGroupEvent(map[string]interface{}{"sent_metrics": true}) telemetry.SendGroupEvent(map[string]interface{}{"sent_metrics": true}, "")
} }
getDistributedInfoInLastHeartBeatInterval, _ := telemetry.reader.GetDistributedInfoInLastHeartBeatInterval(ctx) getDistributedInfoInLastHeartBeatInterval, _ := telemetry.reader.GetDistributedInfoInLastHeartBeatInterval(ctx)
@ -591,11 +591,20 @@ func (a *Telemetry) IdentifyUser(user *types.User) {
} }
} }
func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}) { func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}, userEmail string) {
if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() { if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() {
return return
} }
// ignore telemetry for default user
if userEmail == DEFAULT_CLOUD_EMAIL || a.GetUserEmail() == DEFAULT_CLOUD_EMAIL {
return
}
if userEmail != "" {
a.SetUserEmail(userEmail)
a.SetCompanyDomain(userEmail)
}
traits := analytics.NewTraits() traits := analytics.NewTraits()
for k, v := range data { for k, v := range data {
@ -615,11 +624,20 @@ func (a *Telemetry) SendIdentifyEvent(data map[string]interface{}) {
} }
} }
func (a *Telemetry) SendGroupEvent(data map[string]interface{}) { func (a *Telemetry) SendGroupEvent(data map[string]interface{}, userEmail string) {
if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() { if !a.isTelemetryEnabled() || a.isTelemetryAnonymous() {
return return
} }
// ignore telemetry for default user
if userEmail == DEFAULT_CLOUD_EMAIL || a.GetUserEmail() == DEFAULT_CLOUD_EMAIL {
return
}
if userEmail != "" {
a.SetUserEmail(userEmail)
a.SetCompanyDomain(userEmail)
}
traits := analytics.NewTraits() traits := analytics.NewTraits()
for k, v := range data { for k, v := range data {