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

fix: minor fixes

Browse Source 
Signed-off-by: Shivanshu Raj Shrivastava <shivanshu1333@gmail.com>
This commit is contained in:
Shivanshu Raj Shrivastava 2025-05-30 19:18:24 +05:30
parent d5ee6ca2c3
commit 189046865a
No known key found for this signature in database
GPG Key ID: D34D26C62AC3E9AE
2 changed files with 172 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

225
pkg/modules/tracefunnel/clickhouse_queries.go
View File

@ -157,24 +157,18 @@ WITH
'%[4]s' AS latency_pointer_t2, '%[4]s' AS latency_pointer_t2,
toDateTime64(%[5]d/1e9, 9) AS start_ts, toDateTime64(%[5]d/1e9, 9) AS start_ts,
toDateTime64(%[6]d/1e9, 9) AS end_ts, toDateTime64(%[6]d/1e9, 9) AS end_ts,
(%[6]d-%[5]d)/1e9 AS time_window_sec, (%[6]d - %[5]d)/1e9 AS time_window_sec,
('%[7]s','%[8]s') AS step1, ('%[7]s','%[8]s') AS step1,
('%[9]s','%[10]s') AS step2 ('%[9]s','%[10]s') AS step2
SELECT , funnel AS (
round(countIf(t1_time>0 AND t2_time>0)*100.0/countIf(t1_time>0),2) AS conversion_rate,
countIf(t1_time>0 AND t2_time>0)/time_window_sec AS avg_rate,
greatest(sum(s1_error), sum(s2_error)) AS errors,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration,
quantile(0.99)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency
FROM (
SELECT SELECT
trace_id, trace_id,
minIf(timestamp, serviceName=step1.1 AND name=step1.2) AS t1_time, minIf(timestamp, serviceName=step1.1 AND name=step1.2) AS t1_time,
minIf(timestamp, serviceName=step2.1 AND name=step2.2) AS t2_time, minIf(timestamp, serviceName=step2.1 AND name=step2.2) AS t2_time,
anyIf(has_error,serviceName=step1.1 AND name=step1.2) AS s1_error, anyIf(has_error, serviceName=step1.1 AND name=step1.2) AS s1_error,
anyIf(has_error,serviceName=step2.1 AND name=step2.2) AS s2_error anyIf(has_error, serviceName=step2.1 AND name=step2.2) AS s2_error
FROM signoz_traces.signoz_index_v3 FROM signoz_traces.signoz_index_v3
WHERE WHERE
timestamp BETWEEN start_ts AND end_ts timestamp BETWEEN start_ts AND end_ts
@ -184,8 +178,28 @@ FROM (
(serviceName=step2.1 AND name=step2.2 AND (contains_error_t2=0 OR has_error=true) %[12]s) (serviceName=step2.1 AND name=step2.2 AND (contains_error_t2=0 OR has_error=true) %[12]s)
) )
GROUP BY trace_id GROUP BY trace_id
) AS funnel )
WHERE t1_time>0 AND t2_time>t1_time;`
, totals AS (
SELECT
countIf(t1_time>0) AS total_s1_spans,
countIf(t1_time>0 AND t2_time>t1_time) AS total_s2_spans,
countIf(t1_time>0 AND t2_time>0) AS total_s2_raw_spans,
sum(s1_error) AS sum_s1_error,
sum(s2_error) AS sum_s2_error,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration,
quantile(0.99)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency
FROM funnel
)
SELECT
round(total_s2_spans * 100.0 / total_s1_spans, 2) AS conversion_rate,
total_s2_raw_spans / time_window_sec AS avg_rate,
greatest(sum_s1_error, sum_s2_error) AS errors,
avg_duration,
latency
FROM totals;
`
return fmt.Sprintf(queryTemplate, return fmt.Sprintf(queryTemplate,
containsErrorT1, containsErrorT1,
containsErrorT2, containsErrorT2,
@ -231,40 +245,55 @@ WITH
'%[6]s' AS latency_pointer_t3, '%[6]s' AS latency_pointer_t3,
toDateTime64(%[7]d/1e9,9) AS start_ts, toDateTime64(%[7]d/1e9,9) AS start_ts,
toDateTime64(%[8]d/1e9,9) AS end_ts, toDateTime64(%[8]d/1e9,9) AS end_ts,
(%[8]d-%[7]d)/1e9 AS time_window_sec, (%[8]d - %[7]d)/1e9 AS time_window_sec,
('%[9]s','%[10]s') AS step1, ('%[9]s','%[10]s') AS step1,
('%[11]s','%[12]s') AS step2, ('%[11]s','%[12]s') AS step2,
('%[13]s','%[14]s') AS step3 ('%[13]s','%[14]s') AS step3
SELECT , funnel AS (
round(countIf(t1_time>0 AND t2_time>t1_time AND t3_time>t2_time)*100.0/countIf(t1_time>0),2) AS conversion_rate,
countIf(t1_time>0 AND t2_time>t1_time)/time_window_sec AS avg_rate,
greatest(sum(s1_error), sum(s2_error), sum(s3_error)) AS errors,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration,
quantile(0.99)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency
FROM (
SELECT SELECT
trace_id, trace_id,
minIf(timestamp,serviceName=step1.1 AND name=step1.2) AS t1_time, minIf(timestamp, serviceName=step1.1 AND name=step1.2) AS t1_time,
minIf(timestamp,serviceName=step2.1 AND name=step2.2) AS t2_time, minIf(timestamp, serviceName=step2.1 AND name=step2.2) AS t2_time,
minIf(timestamp,serviceName=step3.1 AND name=step3.2) AS t3_time, minIf(timestamp, serviceName=step3.1 AND name=step3.2) AS t3_time,
anyIf(has_error,serviceName=step1.1 AND name=step1.2) AS s1_error, anyIf(has_error, serviceName=step1.1 AND name=step1.2) AS s1_error,
anyIf(has_error,serviceName=step2.1 AND name=step2.2) AS s2_error, anyIf(has_error, serviceName=step2.1 AND name=step2.2) AS s2_error,
anyIf(has_error,serviceName=step3.1 AND name=step3.2) AS s3_error anyIf(has_error, serviceName=step3.1 AND name=step3.2) AS s3_error
FROM signoz_traces.signoz_index_v3 FROM signoz_traces.signoz_index_v3
WHERE WHERE
timestamp BETWEEN start_ts AND end_ts timestamp BETWEEN start_ts AND end_ts
AND ( AND (
(serviceName=step1.1 AND name=step1.2 AND (contains_error_t1=0 OR has_error=true) %[15]s) (serviceName=step1.1 AND name=step1.2 AND (contains_error_t1=0 OR has_error=true) %[15]s)
OR OR (serviceName=step2.1 AND name=step2.2 AND (contains_error_t2=0 OR has_error=true) %[16]s)
(serviceName=step2.1 AND name=step2.2 AND (contains_error_t2=0 OR has_error=true) %[16]s) OR (serviceName=step3.1 AND name=step3.2 AND (contains_error_t3=0 OR has_error=true) %[17]s)
OR
(serviceName=step3.1 AND name=step3.2 AND (contains_error_t3=0 OR has_error=true) %[17]s)
) )
GROUP BY trace_id GROUP BY trace_id
) AS funnel )
WHERE t1_time>0 AND t2_time>t1_time AND t3_time>t2_time;`
, totals AS (
SELECT
countIf(t1_time > 0) AS total_s1_spans,
countIf(t1_time > 0 AND t2_time > t1_time) AS total_s2_spans,
countIf(t1_time > 0 AND t2_time > t1_time AND t3_time > t2_time) AS total_s3_spans,
sum(s1_error) AS sum_s1_error,
sum(s2_error) AS sum_s2_error,
sum(s3_error) AS sum_s3_error,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration,
quantile(0.99)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency
FROM funnel
)
SELECT
-- compute conversion_rate before dropping any “failures”
round(total_s3_spans * 100.0 / total_s1_spans, 2) AS conversion_rate,
-- avg_rate remains step-2 hits per second
total_s2_spans / time_window_sec AS avg_rate,
greatest(sum_s1_error, sum_s2_error, sum_s3_error) AS errors,
avg_duration,
latency
FROM totals;
`
return fmt.Sprintf(queryTemplate, return fmt.Sprintf(queryTemplate,
containsErrorT1, containsErrorT1,
containsErrorT2, containsErrorT2,
@ -566,22 +595,7 @@ WITH
('%[7]s','%[8]s') AS step1, ('%[7]s','%[8]s') AS step1,
('%[9]s','%[10]s') AS step2 ('%[9]s','%[10]s') AS step2
SELECT , funnel AS (
round(
countIf(t1_time > 0 AND t2_time > t1_time) * 100.0
/ countIf(t1_time > 0),
2
) AS conversion_rate,
countIf(t1_time > 0 AND t2_time > t1_time)
/ time_window_sec AS avg_rate,
greatest(sum(s1_error), sum(s2_error)) AS errors,
avg(
dateDiff('microseconds', t1_time, t2_time) / 1000.0
) AS avg_duration,
quantile(0.99)(
dateDiff('microseconds', t1_time, t2_time) / 1000.0
) AS latency
FROM (
SELECT SELECT
trace_id, trace_id,
minIf(timestamp, serviceName = step1.1 AND name = step1.2) AS t1_time, minIf(timestamp, serviceName = step1.1 AND name = step1.2) AS t1_time,
@ -598,8 +612,25 @@ FROM (
%[11]s %[11]s
%[12]s %[12]s
GROUP BY trace_id GROUP BY trace_id
) AS funnel )
WHERE t1_time > 0 AND t2_time > t1_time;`
, totals AS (
SELECT
countIf(t1_time > 0) AS total_s1_spans,
countIf(t1_time > 0 AND t2_time > t1_time) AS total_s2_spans,
greatest(sum(s1_error), sum(s2_error)) AS errors,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration,
quantile(%[13]s)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency
FROM funnel
)
SELECT
round(total_s2_spans * 100.0 / total_s1_spans, 2) AS conversion_rate,
total_s2_spans / time_window_sec AS avg_rate,
errors,
avg_duration,
latency
FROM totals;`
return fmt.Sprintf(tpl, return fmt.Sprintf(tpl,
containsErrorT1, containsErrorT1,
@ -641,7 +672,7 @@ func BuildThreeStepFunnelStepOverviewQuery(
latencyTypeT2 string, latencyTypeT2 string,
latencyTypeT3 string, latencyTypeT3 string,
) string { ) string {
const tpl = ` const baseTpl = `
WITH WITH
toDateTime64(%[7]d/1e9,9) AS start_ts, toDateTime64(%[7]d/1e9,9) AS start_ts,
toDateTime64(%[8]d/1e9,9) AS end_ts, toDateTime64(%[8]d/1e9,9) AS end_ts,
@ -649,28 +680,13 @@ WITH
('%[9]s','%[10]s') AS step1, ('%[9]s','%[10]s') AS step1,
('%[11]s','%[12]s') AS step2, ('%[11]s','%[12]s') AS step2,
('%[13]s','%[14]s') AS step3 ('%[13]s','%[14]s') AS step3,
SELECT %[1]d AS contains_error_t1,
round( %[2]d AS contains_error_t2,
countIf( %[3]d AS contains_error_t3
t1_time > 0
AND t2_time > t1_time , funnel AS (
AND t3_time > t2_time
) * 100.0
/ countIf(t1_time > 0),
2
) AS conversion_rate,
countIf(t1_time > 0 AND t2_time > t1_time)
/ time_window_sec AS avg_rate,
greatest(sum(s1_error), sum(s2_error), sum(s3_error)) AS errors,
avg(
dateDiff('microseconds', t1_time, t2_time) / 1000.0
) AS avg_duration,
quantile(0.99)(
dateDiff('microseconds', t1_time, t2_time) / 1000.0
) AS latency
FROM (
SELECT SELECT
trace_id, trace_id,
minIf(timestamp, serviceName = step1.1 AND name = step1.2) AS t1_time, minIf(timestamp, serviceName = step1.1 AND name = step1.2) AS t1_time,
@ -684,19 +700,60 @@ FROM (
timestamp BETWEEN start_ts AND end_ts timestamp BETWEEN start_ts AND end_ts
AND serviceName IN (step1.1, step2.1, step3.1) AND serviceName IN (step1.1, step2.1, step3.1)
AND name IN (step1.2, step2.2, step3.2) AND name IN (step1.2, step2.2, step3.2)
AND ((%[1]d = 0) OR (has_error AND serviceName = step1.1 AND name = step1.2)) AND ((contains_error_t1=0) OR (has_error AND serviceName=step1.1 AND name=step1.2)) %[15]s
AND ((%[2]d = 0) OR (has_error AND serviceName = step2.1 AND name = step2.2)) AND ((contains_error_t2=0) OR (has_error AND serviceName=step2.1 AND name=step2.2)) %[16]s
AND ((%[3]d = 0) OR (has_error AND serviceName = step3.1 AND name = step3.2)) AND ((contains_error_t3=0) OR (has_error AND serviceName=step3.1 AND name=step3.2)) %[17]s
%[15]s
%[16]s
%[17]s
GROUP BY trace_id GROUP BY trace_id
) AS funnel )
WHERE t1_time > 0
AND t2_time > t1_time
AND t3_time > t2_time;`
return fmt.Sprintf(tpl, , totals AS (
SELECT
countIf(t1_time > 0) AS total_s1_spans,
countIf(t1_time > 0 AND t2_time > t1_time) AS total_s2_spans,
countIf(t1_time > 0 AND t2_time > t1_time AND t3_time > t2_time) AS total_s3_spans,
sum(s1_error) AS sum_s1_error,
sum(s2_error) AS sum_s2_error,
sum(s3_error) AS sum_s3_error,
avg(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS avg_duration_12,
quantile(%[18]s)(dateDiff('microseconds', t1_time, t2_time)/1000.0) AS latency_12,
avg(dateDiff('microseconds', t2_time, t3_time)/1000.0) AS avg_duration_23,
quantile(%[19]s)(dateDiff('microseconds', t2_time, t3_time)/1000.0) AS latency_23
FROM funnel
)
`
const select12 = `
SELECT
round(total_s2_spans * 100.0 / total_s1_spans, 2) AS conversion_rate,
total_s2_spans / time_window_sec AS avg_rate,
greatest(sum_s1_error, sum_s2_error) AS errors,
avg_duration_12 AS avg_duration,
latency_12 AS latency
FROM totals;
`
const select23 = `
SELECT
round(total_s3_spans * 100.0 / total_s2_spans, 2) AS conversion_rate,
total_s3_spans / time_window_sec AS avg_rate,
greatest(sum_s2_error, sum_s3_error) AS errors,
avg_duration_23 AS avg_duration,
latency_23 AS latency
FROM totals;
`
var selectTpl string
switch {
case stepStart == 1 && stepEnd == 2:
selectTpl = select12
case stepStart == 2 && stepEnd == 3:
selectTpl = select23
default:
selectTpl = `SELECT 0 AS conversion_rate, 0 AS avg_rate, 0 AS errors, 0 AS avg_duration, 0 AS latency;`
}
return fmt.Sprintf(
baseTpl+selectTpl,
containsErrorT1, containsErrorT1,
containsErrorT2, containsErrorT2,
containsErrorT3, containsErrorT3,
@ -714,8 +771,6 @@ WHERE t1_time > 0
clauseStep1, clauseStep1,
clauseStep2, clauseStep2,
clauseStep3, clauseStep3,
stepStart,
stepEnd,
latencyTypeT2, latencyTypeT2,
latencyTypeT3, latencyTypeT3,
) )

22
pkg/modules/tracefunnel/query.go
View File

@ -176,8 +176,8 @@ func GetFunnelStepAnalytics(funnel *tracefunneltypes.StorableFunnel, timeRange t
if len(funnel.Steps) > 2 { if len(funnel.Steps) > 2 {
latencyPointerT3 = funnelSteps[2].LatencyPointer latencyPointerT3 = funnelSteps[2].LatencyPointer
} }
latencyTypeT2 := "p99" latencyTypeT2 := "0.99"
latencyTypeT3 := "p99" latencyTypeT3 := "0.99"
if stepStart == stepEnd { if stepStart == stepEnd {
return nil, fmt.Errorf("step start and end cannot be the same for /step/overview") return nil, fmt.Errorf("step start and end cannot be the same for /step/overview")
@ -194,10 +194,24 @@ func GetFunnelStepAnalytics(funnel *tracefunneltypes.StorableFunnel, timeRange t
} }
if funnelSteps[1].LatencyType != "" { if funnelSteps[1].LatencyType != "" {
latencyTypeT2 = strings.ToLower(funnelSteps[1].LatencyType) latency := strings.ToLower(funnelSteps[1].LatencyType)
if latency == "p90" {
latencyTypeT2 = "0.90"
} else if latency == "p95" {
latencyTypeT2 = "0.95"
} else {
latencyTypeT2 = "0.99"
}
} }
if len(funnel.Steps) > 2 && funnelSteps[2].LatencyType != "" { if len(funnel.Steps) > 2 && funnelSteps[2].LatencyType != "" {
latencyTypeT3 = strings.ToLower(funnelSteps[2].LatencyType) latency := strings.ToLower(funnelSteps[2].LatencyType)
if latency == "p90" {
latencyTypeT3 = "0.90"
} else if latency == "p95" {
latencyTypeT3 = "0.95"
} else {
latencyTypeT3 = "0.99"
}
} }
// Build filter clauses for each step // Build filter clauses for each step