From 835251b34247792a0fdbdc79af73199d4abc2264 Mon Sep 17 00:00:00 2001 From: Vishal Sharma Date: Wed, 4 Jan 2023 16:15:08 +0530 Subject: [PATCH] fix: use rpc method and responseStatusCode (#1971) Co-authored-by: Palash Gupta Co-authored-by: Srikanth Chekuri --- pkg/query-service/app/clickhouseReader/reader.go | 11 +++-------- pkg/query-service/model/response.go | 6 +----- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go index 15c88e2b71..492e457c0f 100644 --- a/pkg/query-service/app/clickhouseReader/reader.go +++ b/pkg/query-service/app/clickhouseReader/reader.go @@ -1401,18 +1401,13 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo var getFilterSpansResponseItems []model.GetFilterSpansResponseItem - baseQuery := fmt.Sprintf("SELECT timestamp, spanID, traceID, serviceName, name, durationNano, httpCode, gRPCCode, gRPCMethod, httpMethod, rpcMethod, responseStatusCode FROM %s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryTable) + baseQuery := fmt.Sprintf("SELECT timestamp, spanID, traceID, serviceName, name, durationNano, httpMethod, rpcMethod, responseStatusCode FROM %s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryTable) baseQuery += query err := r.db.Select(ctx, &getFilterSpansResponseItems, baseQuery, args...) // Fill status and method for i, e := range getFilterSpansResponseItems { - if e.GRPCode != "" { - getFilterSpansResponseItems[i].StatusCode = e.GRPCode - } else { - getFilterSpansResponseItems[i].StatusCode = e.HttpCode - } - if e.GRPMethod != "" { - getFilterSpansResponseItems[i].Method = e.GRPMethod + if e.RPCMethod != "" { + getFilterSpansResponseItems[i].Method = e.RPCMethod } else { getFilterSpansResponseItems[i].Method = e.HttpMethod } diff --git a/pkg/query-service/model/response.go b/pkg/query-service/model/response.go index 5441f894b2..bcc85749fa 100644 --- a/pkg/query-service/model/response.go +++ b/pkg/query-service/model/response.go @@ -180,13 +180,9 @@ type GetFilterSpansResponseItem struct { ServiceName string `ch:"serviceName" json:"serviceName"` Operation string `ch:"name" json:"operation"` DurationNano uint64 `ch:"durationNano" json:"durationNano"` - HttpCode string `ch:"httpCode"` HttpMethod string `ch:"httpMethod"` - GRPCode string `ch:"gRPCCode"` - GRPMethod string `ch:"gRPCMethod"` - StatusCode string `json:"statusCode"` Method string `json:"method"` - ResponseStatusCode string `ch:"responseStatusCode"` + ResponseStatusCode string `ch:"responseStatusCode" json:"statusCode"` RPCMethod string `ch:"rpcMethod"` }