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

logs select statement converted to a const

Browse Source
This commit is contained in:
nityanandagohain 2022-07-22 16:07:19 +05:30
parent f8be4a6d5b
commit 373cbbc375
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2861,13 +2861,7 @@ func (r *ClickHouseReader) GetLogs(ctx context.Context, params *model.LogsFilter
return nil, &model.ApiError{Err: err, Typ: model.ErrorBadData} return nil, &model.ApiError{Err: err, Typ: model.ErrorBadData}
} }
query := fmt.Sprintf("SELECT "+ query := fmt.Sprintf("%s from %s.%s", constants.LogsSQLSelect, r.logsDB, r.logsTable)
"timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body,"+
"CAST((attributes_string_key, attributes_string_value), 'Map(String, String)') as attributes_string,"+
"CAST((attributes_int64_key, attributes_int64_value), 'Map(String, Int64)') as attributes_int64,"+
"CAST((attributes_float64_key, attributes_float64_value), 'Map(String, Float64)') as attributes_float64,"+
"CAST((resources_string_key, resources_string_value), 'Map(String, String)') as resources_string "+
"from %s.%s", r.logsDB, r.logsTable)
if filterSql != "" { if filterSql != "" {
query += fmt.Sprintf(" where %s", filterSql) query += fmt.Sprintf(" where %s", filterSql)
@ -2900,13 +2894,7 @@ func (r *ClickHouseReader) TailLogs(ctx context.Context, client *model.LogsTailC
return return
} }
query := fmt.Sprintf("SELECT "+ query := fmt.Sprintf("%s from %s.%s", constants.LogsSQLSelect, r.logsDB, r.logsTable)
"timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body,"+
"CAST((attributes_string_key, attributes_string_value), 'Map(String, String)') as attributes_string,"+
"CAST((attributes_int64_key, attributes_int64_value), 'Map(String, Int64)') as attributes_int64,"+
"CAST((attributes_float64_key, attributes_float64_value), 'Map(String, Float64)') as attributes_float64,"+
"CAST((resources_string_key, resources_string_value), 'Map(String, String)') as resources_string "+
"from %s.%s", r.logsDB, r.logsTable)
tsStart := uint64(time.Now().UnixNano()) tsStart := uint64(time.Now().UnixNano())
if client.Filter.TimestampStart != nil { if client.Filter.TimestampStart != nil {
@ -2958,10 +2946,7 @@ func (r *ClickHouseReader) TailLogs(ctx context.Context, client *model.LogsTailC
} }
} }
} }
if len == 0 { time.Sleep(10 * time.Second)
tsStart = uint64(time.Now().UnixNano())
}
time.Sleep(2 * time.Second)
} }
} }
} }

9
pkg/query-service/constants/constants.go
View File

@ -139,3 +139,12 @@ var StaticSelectedLogFields = []model.LogField{
Type: Static, Type: Static,
}, },
} }
const (
LogsSQLSelect = "SELECT " +
"timestamp, id, trace_id, span_id, trace_flags, severity_text, severity_number, body," +
"CAST((attributes_string_key, attributes_string_value), 'Map(String, String)') as attributes_string," +
"CAST((attributes_int64_key, attributes_int64_value), 'Map(String, Int64)') as attributes_int64," +
"CAST((attributes_float64_key, attributes_float64_value), 'Map(String, Float64)') as attributes_float64," +
"CAST((resources_string_key, resources_string_value), 'Map(String, String)') as resources_string "
)