feat: make SigNoz rpc aware (#1366)

* feat: make SigNoz rpc aware
* chore: update the code/method logic

frontend/src/container/MetricsApplication/Tabs/External.tsx

@@ -14,7 +14,7 @@ function External({ getWidget }: ExternalProps): JSX.Element {
 	const { resourceAttributePromQLQuery } = useSelector<AppState, MetricReducer>(
 		(state) => state.metrics,
 	);
-	const legend = '{{http_url}}';
+	const legend = '{{address}}';
 
 	return (
 		<>
@@ -28,7 +28,7 @@ function External({ getWidget }: ExternalProps): JSX.Element {
 								fullViewOptions={false}
 								widget={getWidget([
 									{
-										query: `max((sum(rate(signoz_external_call_latency_count{service_name="${servicename}", status_code="STATUS_CODE_ERROR"${resourceAttributePromQLQuery}}[5m]) OR rate(signoz_external_call_latency_count{service_name="${servicename}", http_status_code=~"5.."${resourceAttributePromQLQuery}}[5m]) OR vector(0)) by (http_url))*100/sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (http_url)) < 1000 OR vector(0)`,
+										query: `max((sum(rate(signoz_external_call_latency_count{service_name="${servicename}", status_code="STATUS_CODE_ERROR"${resourceAttributePromQLQuery}}[5m]) OR vector(0)) by (address))*100/sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (address)) < 1000 OR vector(0)`,
 										legend: 'External Call Error Percentage',
 									},
 								])}
@@ -68,7 +68,7 @@ function External({ getWidget }: ExternalProps): JSX.Element {
 								fullViewOptions={false}
 								widget={getWidget([
 									{
-										query: `sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (http_url)`,
+										query: `sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (address)`,
 										legend,
 									},
 								])}
@@ -87,7 +87,7 @@ function External({ getWidget }: ExternalProps): JSX.Element {
 								fullViewOptions={false}
 								widget={getWidget([
 									{
-										query: `(sum(rate(signoz_external_call_latency_sum{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (http_url))/(sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (http_url))`,
+										query: `(sum(rate(signoz_external_call_latency_sum{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (address))/(sum(rate(signoz_external_call_latency_count{service_name="${servicename}"${resourceAttributePromQLQuery}}[5m])) by (address))`,
 										legend,
 									},
 								])}

frontend/src/container/Trace/Filters/index.tsx

@@ -9,7 +9,9 @@ export const AllTraceFilterEnum: TraceFilterEnum[] = [
 	'serviceName',
 	'operation',
 	'component',
-	'httpCode',
+	'rpcMethod',
+	'responseStatusCode',
+	// 'httpCode',
 	'httpHost',
 	'httpMethod',
 	'httpRoute',

frontend/src/container/Trace/TraceGraphFilter/config.ts

@@ -38,6 +38,14 @@ export const groupBy: Dropdown[] = [
 		displayValue: 'HTTP status code',
 		key: 'httpCode',
 	},
+	{
+		displayValue: 'RPC Method',
+		key: 'rpcMethod',
+	},
+	{
+		displayValue: 'Status Code',
+		key: 'responseStatusCode',
+	},
 	{
 		displayValue: 'Database name',
 		key: 'dbName',

frontend/src/store/reducers/trace.ts

@@ -64,6 +64,8 @@ const initialValue: TraceReducer = {
 		['httpMethod', INITIAL_FILTER_VALUE],
 		['httpUrl', INITIAL_FILTER_VALUE],
 		['operation', INITIAL_FILTER_VALUE],
+		['rpcMethod', INITIAL_FILTER_VALUE],
+		['responseStatusCode', INITIAL_FILTER_VALUE],
 		['serviceName', INITIAL_FILTER_VALUE],
 		['status', INITIAL_FILTER_VALUE],
 	]),

frontend/src/types/reducer/trace.ts

@@ -69,7 +69,9 @@ export type TraceFilterEnum =
 	| 'httpUrl'
 	| 'operation'
 	| 'serviceName'
-	| 'status';
+	| 'status'
+	| 'responseStatusCode'
+	| 'rpcMethod';
 
 export const AllPanelHeading: {
 	key: TraceFilterEnum;
@@ -107,6 +109,14 @@ export const AllPanelHeading: {
 		key: 'operation',
 		displayValue: 'Operation',
 	},
+	{
+		key: 'responseStatusCode',
+		displayValue: 'Status Code',
+	},
+	{
+		key: 'rpcMethod',
+		displayValue: 'RPC Method',
+	},
 	{
 		key: 'serviceName',
 		displayValue: 'Service Name',

pkg/query-service/app/clickhouseReader/reader.go

@@ -1348,6 +1348,12 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
 	if len(queryParams.Operation) > 0 {
 		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
 	}
+	if len(queryParams.RPCMethod) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.RPCMethod, constants.RPCMethod, &query, args)
+	}
+	if len(queryParams.ResponseStatusCode) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.ResponseStatusCode, constants.ResponseStatusCode, &query, args)
+	}
 
 	if len(queryParams.MinDuration) != 0 {
 		query = query + " AND durationNano >= @durationNanoMin"
@@ -1365,6 +1371,8 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
 		Duration:           map[string]uint64{},
 		ServiceName:        map[string]uint64{},
 		Operation:          map[string]uint64{},
+		ResponseStatusCode: map[string]uint64{},
+		RPCMethod:          map[string]uint64{},
 		HttpCode:           map[string]uint64{},
 		HttpMethod:         map[string]uint64{},
 		HttpUrl:            map[string]uint64{},
@@ -1571,6 +1579,42 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
 			if len(dBResponse2) > 0 {
 				traceFilterReponse.Duration["maxDuration"] = dBResponse2[0].NumTotal
 			}
+		case constants.RPCMethod:
+			finalQuery := fmt.Sprintf("SELECT rpcMethod, count() as count FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.traceDB, r.indexTable)
+			finalQuery += query
+			finalQuery += " GROUP BY rpcMethod"
+			var dBResponse []model.DBResponseRPCMethod
+			err := r.db.Select(ctx, &dBResponse, finalQuery, args...)
+			zap.S().Info(finalQuery)
+
+			if err != nil {
+				zap.S().Debug("Error in processing sql query: ", err)
+				return nil, &model.ApiError{Typ: model.ErrorExec, Err: fmt.Errorf("error in processing sql query: %s", err)}
+			}
+			for _, service := range dBResponse {
+				if service.RPCMethod != "" {
+					traceFilterReponse.RPCMethod[service.RPCMethod] = service.Count
+				}
+			}
+
+		case constants.ResponseStatusCode:
+			finalQuery := fmt.Sprintf("SELECT responseStatusCode, count() as count FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.traceDB, r.indexTable)
+			finalQuery += query
+			finalQuery += " GROUP BY responseStatusCode"
+			var dBResponse []model.DBResponseStatusCodeMethod
+			err := r.db.Select(ctx, &dBResponse, finalQuery, args...)
+			zap.S().Info(finalQuery)
+
+			if err != nil {
+				zap.S().Debug("Error in processing sql query: ", err)
+				return nil, &model.ApiError{Typ: model.ErrorExec, Err: fmt.Errorf("error in processing sql query: %s", err)}
+			}
+			for _, service := range dBResponse {
+				if service.ResponseStatusCode != "" {
+					traceFilterReponse.ResponseStatusCode[service.ResponseStatusCode] = service.Count
+				}
+			}
+
 		default:
 			return nil, &model.ApiError{Typ: model.ErrorBadData, Err: fmt.Errorf("filter type: %s not supported", e)}
 		}
@@ -1639,6 +1683,14 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo
 	if len(queryParams.Operation) > 0 {
 		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
 	}
+	if len(queryParams.RPCMethod) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.RPCMethod, constants.RPCMethod, &query, args)
+	}
+
+	if len(queryParams.ResponseStatusCode) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.ResponseStatusCode, constants.ResponseStatusCode, &query, args)
+	}
+
 	if len(queryParams.MinDuration) != 0 {
 		query = query + " AND durationNano >= @durationNanoMin"
 		args = append(args, clickhouse.Named("durationNanoMin", queryParams.MinDuration))
@@ -1698,17 +1750,17 @@ 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 FROM %s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryTable)
+	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 += query
 	err := r.db.Select(ctx, &getFilterSpansResponseItems, baseQuery, args...)
 	// Fill status and method
 	for i, e := range getFilterSpansResponseItems {
-		if e.HttpCode == "" {
+		if e.GRPCode != "" {
 			getFilterSpansResponseItems[i].StatusCode = e.GRPCode
 		} else {
 			getFilterSpansResponseItems[i].StatusCode = e.HttpCode
 		}
-		if e.HttpMethod == "" {
+		if e.GRPMethod != "" {
 			getFilterSpansResponseItems[i].Method = e.GRPMethod
 		} else {
 			getFilterSpansResponseItems[i].Method = e.HttpMethod
@@ -1821,6 +1873,12 @@ func (r *ClickHouseReader) GetTagFilters(ctx context.Context, queryParams *model
 	if len(queryParams.Operation) > 0 {
 		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
 	}
+	if len(queryParams.RPCMethod) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.RPCMethod, constants.RPCMethod, &query, args)
+	}
+	if len(queryParams.ResponseStatusCode) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.ResponseStatusCode, constants.ResponseStatusCode, &query, args)
+	}
 	if len(queryParams.MinDuration) != 0 {
 		query = query + " AND durationNano >= @durationNanoMin"
 		args = append(args, clickhouse.Named("durationNanoMin", queryParams.MinDuration))
@@ -2158,6 +2216,11 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
 			query = fmt.Sprintf("SELECT toStartOfInterval(timestamp, INTERVAL %d minute) as time, dbSystem as groupBy, %s FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryParams.StepSeconds/60, aggregation_query, r.traceDB, r.indexTable)
 		case constants.Component:
 			query = fmt.Sprintf("SELECT toStartOfInterval(timestamp, INTERVAL %d minute) as time, component as groupBy, %s FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryParams.StepSeconds/60, aggregation_query, r.traceDB, r.indexTable)
+		case constants.RPCMethod:
+			query = fmt.Sprintf("SELECT toStartOfInterval(timestamp, INTERVAL %d minute) as time, rpcMethod as groupBy, %s FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryParams.StepSeconds/60, aggregation_query, r.traceDB, r.indexTable)
+		case constants.ResponseStatusCode:
+			query = fmt.Sprintf("SELECT toStartOfInterval(timestamp, INTERVAL %d minute) as time, responseStatusCode as groupBy, %s FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", queryParams.StepSeconds/60, aggregation_query, r.traceDB, r.indexTable)
+
 		default:
 			return nil, &model.ApiError{Typ: model.ErrorBadData, Err: fmt.Errorf("groupBy type: %s not supported", queryParams.GroupBy)}
 		}
@@ -2189,6 +2252,12 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
 	if len(queryParams.Operation) > 0 {
 		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
 	}
+	if len(queryParams.RPCMethod) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.RPCMethod, constants.RPCMethod, &query, args)
+	}
+	if len(queryParams.ResponseStatusCode) > 0 {
+		args = buildFilterArrayQuery(ctx, excludeMap, queryParams.ResponseStatusCode, constants.ResponseStatusCode, &query, args)
+	}
 	if len(queryParams.MinDuration) != 0 {
 		query = query + " AND durationNano >= @durationNanoMin"
 		args = append(args, clickhouse.Named("durationNanoMin", queryParams.MinDuration))
@@ -2237,6 +2306,11 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
 			query = query + " GROUP BY time, dbSystem as groupBy ORDER BY time"
 		case constants.Component:
 			query = query + " GROUP BY time, component as groupBy ORDER BY time"
+		case constants.RPCMethod:
+			query = query + " GROUP BY time, rpcMethod as groupBy ORDER BY time"
+		case constants.ResponseStatusCode:
+			query = query + " GROUP BY time, responseStatusCode as groupBy ORDER BY time"
+
 		default:
 			return nil, &model.ApiError{Typ: model.ErrorBadData, Err: fmt.Errorf("groupBy type: %s not supported", queryParams.GroupBy)}
 		}

pkg/query-service/constants/constants.go

@@ -55,6 +55,8 @@ const (
 	MsgSystem          = "msgSystem"
 	MsgOperation       = "msgOperation"
 	Timestamp          = "timestamp"
+	RPCMethod          = "rpcMethod"
+	ResponseStatusCode = "responseStatusCode"
 	Descending         = "descending"
 	Ascending          = "ascending"
 	ContextTimeout     = 60 // seconds

pkg/query-service/model/queryParams.go

@@ -191,6 +191,8 @@ type GetFilteredSpansParams struct {
 	HttpHost           []string   `json:"httpHost"`
 	HttpMethod         []string   `json:"httpMethod"`
 	Component          []string   `json:"component"`
+	RPCMethod          []string   `json:"rpcMethod"`
+	ResponseStatusCode []string   `json:"responseStatusCode"`
 	StartStr           string     `json:"start"`
 	EndStr             string     `json:"end"`
 	MinDuration        string     `json:"minDuration"`
@@ -216,6 +218,8 @@ type GetFilteredSpanAggregatesParams struct {
 	HttpHost           []string   `json:"httpHost"`
 	HttpMethod         []string   `json:"httpMethod"`
 	Component          []string   `json:"component"`
+	RPCMethod          []string   `json:"rpcMethod"`
+	ResponseStatusCode []string   `json:"responseStatusCode"`
 	MinDuration        string     `json:"minDuration"`
 	MaxDuration        string     `json:"maxDuration"`
 	Tags               []TagQuery `json:"tags"`
@@ -241,6 +245,8 @@ type SpanFilterParams struct {
 	HttpMethod         []string `json:"httpMethod"`
 	Component          []string `json:"component"`
 	Operation          []string `json:"operation"`
+	RPCMethod          []string `json:"rpcMethod"`
+	ResponseStatusCode []string `json:"responseStatusCode"`
 	GetFilters         []string `json:"getFilters"`
 	Exclude            []string `json:"exclude"`
 	MinDuration        string   `json:"minDuration"`
@@ -261,6 +267,8 @@ type TagFilterParams struct {
 	HttpMethod         []string `json:"httpMethod"`
 	Component          []string `json:"component"`
 	Operation          []string `json:"operation"`
+	RPCMethod          []string `json:"rpcMethod"`
+	ResponseStatusCode []string `json:"responseStatusCode"`
 	Exclude            []string `json:"exclude"`
 	MinDuration        string   `json:"minDuration"`
 	MaxDuration        string   `json:"maxDuration"`

pkg/query-service/model/response.go

@@ -130,6 +130,8 @@ type GetFilterSpansResponseItem struct {
 	GRPMethod          string    `ch:"gRPCMethod"`
 	StatusCode         string    `json:"statusCode"`
 	Method             string    `json:"method"`
+	ResponseStatusCode string    `ch:"responseStatusCode"`
+	RPCMethod          string    `ch:"rpcMethod"`
 }
 
 type GetFilterSpansResponse struct {
@@ -303,6 +305,16 @@ type DBResponseHttpMethod struct {
 	Count      uint64 `ch:"count"`
 }
 
+type DBResponseStatusCodeMethod struct {
+	ResponseStatusCode string `ch:"responseStatusCode"`
+	Count              uint64 `ch:"count"`
+}
+
+type DBResponseRPCMethod struct {
+	RPCMethod string `ch:"rpcMethod"`
+	Count     uint64 `ch:"count"`
+}
+
 type DBResponseHttpHost struct {
 	HttpHost string `ch:"httpHost"`
 	Count    uint64 `ch:"count"`
@@ -328,6 +340,8 @@ type SpanFiltersResponse struct {
 	Duration           map[string]uint64 `json:"duration"`
 	Operation          map[string]uint64 `json:"operation"`
 	HttpCode           map[string]uint64 `json:"httpCode"`
+	ResponseStatusCode map[string]uint64 `json:"responseStatusCode"`
+	RPCMethod          map[string]uint64 `json:"rpcMethod"`
 	HttpUrl            map[string]uint64 `json:"httpUrl"`
 	HttpMethod         map[string]uint64 `json:"httpMethod"`
 	HttpRoute          map[string]uint64 `json:"httpRoute"`