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

chore: update active user event (#4271)

Browse Source 
Merged on request by Visha
This commit is contained in:
Vishal Sharma 2023-12-21 19:05:21 +05:30 committed by GitHub
parent a363b98657
commit d93cc767a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/query-service/app/clickhouseReader/reader.go
View File

@ -3381,9 +3381,9 @@ func (r *ClickHouseReader) GetLogsInfoInLastHeartBeatInterval(ctx context.Contex
queryStr := fmt.Sprintf("select count() from %s.%s where timestamp > toUnixTimestamp(now()-toIntervalMinute(%d))*1000000000;", r.logsDB, r.logsTable, 30) queryStr := fmt.Sprintf("select count() from %s.%s where timestamp > toUnixTimestamp(now()-toIntervalMinute(%d))*1000000000;", r.logsDB, r.logsTable, 30)
r.db.QueryRow(ctx, queryStr).Scan(&totalLogLines) err := r.db.QueryRow(ctx, queryStr).Scan(&totalLogLines)
return totalLogLines, nil return totalLogLines, err
} }
func (r *ClickHouseReader) GetTagsInfoInLastHeartBeatInterval(ctx context.Context) (*model.TagsInfo, error) { func (r *ClickHouseReader) GetTagsInfoInLastHeartBeatInterval(ctx context.Context) (*model.TagsInfo, error) {

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

@ -199,6 +199,12 @@ func createTelemetry() {
for { for {
select { select {
case <-activeUserTicker.C: case <-activeUserTicker.C:
if telemetry.activeUser["logs"] != 0 {
getLogsInfoInLastHeartBeatInterval, err := telemetry.reader.GetLogsInfoInLastHeartBeatInterval(context.Background())
if err != nil && getLogsInfoInLastHeartBeatInterval == 0 {
telemetry.activeUser["logs"] = 0
}
}
if (telemetry.activeUser["traces"] != 0) || (telemetry.activeUser["metrics"] != 0) || (telemetry.activeUser["logs"] != 0) { if (telemetry.activeUser["traces"] != 0) || (telemetry.activeUser["metrics"] != 0) || (telemetry.activeUser["logs"] != 0) {
telemetry.activeUser["any"] = 1 telemetry.activeUser["any"] = 1
} }