Skip to content

Commit c1c5c4d

Browse files
makeavishsrikanthccv
makeavish
and
srikanthccv
authored
chore: deprecate old columns in traces (#5016)
Co-authored-by: Srikanth Chekuri <[email protected]>
1 parent 1d86e5e commit c1c5c4d

File tree

8 files changed

+0
-103
lines changed

8 files changed

+0
-103
lines changed

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

-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ export const AllTraceFilterEnum: TraceFilterEnum[] = [
77
'status',
88
'serviceName',
99
'operation',
10-
'component',
1110
'rpcMethod',
1211
'responseStatusCode',
13-
// 'httpCode',
1412
'httpHost',
1513
'httpMethod',
1614
'httpRoute',

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

-4
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,6 @@ export const groupBy: DefaultOptionType[] = [
6363
label: 'Messaging Operation',
6464
value: 'msgOperation',
6565
},
66-
{
67-
label: 'Component',
68-
value: 'component',
69-
},
7066
];
7167

7268
export const functions: Dropdown[] = [

‎frontend/src/store/reducers/trace.ts

-2
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@ const initialValue: TraceReducer = {
5757
payload: { items: {} },
5858
},
5959
filterDisplayValue: new Map<TraceFilterEnum, number>([
60-
['component', INITIAL_FILTER_VALUE],
6160
['duration', INITIAL_FILTER_VALUE],
62-
['httpCode', INITIAL_FILTER_VALUE],
6361
['httpHost', INITIAL_FILTER_VALUE],
6462
['httpMethod', INITIAL_FILTER_VALUE],
6563
['httpUrl', INITIAL_FILTER_VALUE],

‎frontend/src/types/reducer/trace.ts

-10
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,7 @@ export type OperatorValues =
7272
| 'NotStartsWith';
7373

7474
export type TraceFilterEnum =
75-
| 'component'
7675
| 'duration'
77-
| 'httpCode'
7876
| 'httpHost'
7977
| 'httpMethod'
8078
| 'httpRoute'
@@ -90,18 +88,10 @@ export const AllPanelHeading: {
9088
key: TraceFilterEnum;
9189
displayValue: string;
9290
}[] = [
93-
{
94-
displayValue: 'Component',
95-
key: 'component',
96-
},
9791
{
9892
key: 'duration',
9993
displayValue: 'Duration',
10094
},
101-
{
102-
displayValue: 'HTTP Code',
103-
key: 'httpCode',
104-
},
10595
{
10696
key: 'httpHost',
10797
displayValue: 'HTTP Host',

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

-67
Original file line numberDiff line numberDiff line change
@@ -1075,9 +1075,6 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
10751075
if len(queryParams.HttpRoute) > 0 {
10761076
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
10771077
}
1078-
if len(queryParams.HttpCode) > 0 {
1079-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
1080-
}
10811078
if len(queryParams.HttpHost) > 0 {
10821079
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
10831080
}
@@ -1087,9 +1084,6 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
10871084
if len(queryParams.HttpUrl) > 0 {
10881085
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
10891086
}
1090-
if len(queryParams.Component) > 0 {
1091-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
1092-
}
10931087
if len(queryParams.Operation) > 0 {
10941088
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
10951089
}
@@ -1123,12 +1117,10 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
11231117
Operation: map[string]uint64{},
11241118
ResponseStatusCode: map[string]uint64{},
11251119
RPCMethod: map[string]uint64{},
1126-
HttpCode: map[string]uint64{},
11271120
HttpMethod: map[string]uint64{},
11281121
HttpUrl: map[string]uint64{},
11291122
HttpRoute: map[string]uint64{},
11301123
HttpHost: map[string]uint64{},
1131-
Component: map[string]uint64{},
11321124
}
11331125

11341126
for _, e := range queryParams.GetFilters {
@@ -1152,23 +1144,6 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
11521144
traceFilterReponse.ServiceName[service.ServiceName] = service.Count
11531145
}
11541146
}
1155-
case constants.HttpCode:
1156-
finalQuery := fmt.Sprintf("SELECT httpCode, count() as count FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.TraceDB, r.indexTable)
1157-
finalQuery += query
1158-
finalQuery += " GROUP BY httpCode"
1159-
var dBResponse []model.DBResponseHttpCode
1160-
err := r.db.Select(ctx, &dBResponse, finalQuery, args...)
1161-
zap.L().Info(finalQuery)
1162-
1163-
if err != nil {
1164-
zap.L().Error("Error in processing sql query", zap.Error(err))
1165-
return nil, &model.ApiError{Typ: model.ErrorExec, Err: fmt.Errorf("Error in processing sql query: %s", err)}
1166-
}
1167-
for _, service := range dBResponse {
1168-
if service.HttpCode != "" {
1169-
traceFilterReponse.HttpCode[service.HttpCode] = service.Count
1170-
}
1171-
}
11721147
case constants.HttpRoute:
11731148
finalQuery := fmt.Sprintf("SELECT httpRoute, count() as count FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.TraceDB, r.indexTable)
11741149
finalQuery += query
@@ -1254,23 +1229,6 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
12541229
traceFilterReponse.Operation[service.Operation] = service.Count
12551230
}
12561231
}
1257-
case constants.Component:
1258-
finalQuery := fmt.Sprintf("SELECT component, count() as count FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU", r.TraceDB, r.indexTable)
1259-
finalQuery += query
1260-
finalQuery += " GROUP BY component"
1261-
var dBResponse []model.DBResponseComponent
1262-
err := r.db.Select(ctx, &dBResponse, finalQuery, args...)
1263-
zap.L().Info(finalQuery)
1264-
1265-
if err != nil {
1266-
zap.L().Error("Error in processing sql query", zap.Error(err))
1267-
return nil, &model.ApiError{Typ: model.ErrorExec, Err: fmt.Errorf("Error in processing sql query: %s", err)}
1268-
}
1269-
for _, service := range dBResponse {
1270-
if service.Component != "" {
1271-
traceFilterReponse.Component[service.Component] = service.Count
1272-
}
1273-
}
12741232
case constants.Status:
12751233
finalQuery := fmt.Sprintf("SELECT COUNT(*) as numTotal FROM %s.%s WHERE timestamp >= @timestampL AND timestamp <= @timestampU AND hasError = true", r.TraceDB, r.indexTable)
12761234
finalQuery += query
@@ -1441,9 +1399,6 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo
14411399
if len(queryParams.HttpRoute) > 0 {
14421400
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
14431401
}
1444-
if len(queryParams.HttpCode) > 0 {
1445-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
1446-
}
14471402
if len(queryParams.HttpHost) > 0 {
14481403
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
14491404
}
@@ -1453,9 +1408,6 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo
14531408
if len(queryParams.HttpUrl) > 0 {
14541409
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
14551410
}
1456-
if len(queryParams.Component) > 0 {
1457-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
1458-
}
14591411
if len(queryParams.Operation) > 0 {
14601412
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
14611413
}
@@ -1736,9 +1688,6 @@ func (r *ClickHouseReader) GetTagFilters(ctx context.Context, queryParams *model
17361688
if len(queryParams.HttpRoute) > 0 {
17371689
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
17381690
}
1739-
if len(queryParams.HttpCode) > 0 {
1740-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
1741-
}
17421691
if len(queryParams.HttpHost) > 0 {
17431692
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
17441693
}
@@ -1748,9 +1697,6 @@ func (r *ClickHouseReader) GetTagFilters(ctx context.Context, queryParams *model
17481697
if len(queryParams.HttpUrl) > 0 {
17491698
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
17501699
}
1751-
if len(queryParams.Component) > 0 {
1752-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
1753-
}
17541700
if len(queryParams.Operation) > 0 {
17551701
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
17561702
}
@@ -1811,7 +1757,6 @@ func excludeTags(ctx context.Context, tags []string) []string {
18111757
"http.host": true,
18121758
"messaging.system": true,
18131759
"messaging.operation": true,
1814-
"component": true,
18151760
"error": true,
18161761
"service.name": true,
18171762
}
@@ -1861,9 +1806,6 @@ func (r *ClickHouseReader) GetTagValues(ctx context.Context, queryParams *model.
18611806
if len(queryParams.HttpRoute) > 0 {
18621807
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
18631808
}
1864-
if len(queryParams.HttpCode) > 0 {
1865-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
1866-
}
18671809
if len(queryParams.HttpHost) > 0 {
18681810
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
18691811
}
@@ -1873,9 +1815,6 @@ func (r *ClickHouseReader) GetTagValues(ctx context.Context, queryParams *model.
18731815
if len(queryParams.HttpUrl) > 0 {
18741816
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
18751817
}
1876-
if len(queryParams.Component) > 0 {
1877-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
1878-
}
18791818
if len(queryParams.Operation) > 0 {
18801819
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
18811820
}
@@ -2194,9 +2133,6 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
21942133
if len(queryParams.HttpRoute) > 0 {
21952134
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpRoute, constants.HttpRoute, &query, args)
21962135
}
2197-
if len(queryParams.HttpCode) > 0 {
2198-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpCode, constants.HttpCode, &query, args)
2199-
}
22002136
if len(queryParams.HttpHost) > 0 {
22012137
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpHost, constants.HttpHost, &query, args)
22022138
}
@@ -2206,9 +2142,6 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
22062142
if len(queryParams.HttpUrl) > 0 {
22072143
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.HttpUrl, constants.HttpUrl, &query, args)
22082144
}
2209-
if len(queryParams.Component) > 0 {
2210-
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
2211-
}
22122145
if len(queryParams.Operation) > 0 {
22132146
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
22142147
}

‎pkg/query-service/constants/constants.go

-3
Original file line numberDiff line numberDiff line change
@@ -154,11 +154,9 @@ const (
154154
TraceID = "traceID"
155155
ServiceName = "serviceName"
156156
HttpRoute = "httpRoute"
157-
HttpCode = "httpCode"
158157
HttpHost = "httpHost"
159158
HttpUrl = "httpUrl"
160159
HttpMethod = "httpMethod"
161-
Component = "component"
162160
OperationDB = "name"
163161
OperationRequest = "operation"
164162
Status = "status"
@@ -193,7 +191,6 @@ var GroupByColMap = map[string]struct{}{
193191
HttpRoute: {},
194192
HttpUrl: {},
195193
HttpMethod: {},
196-
Component: {},
197194
OperationDB: {},
198195
DBName: {},
199196
DBOperation: {},

‎pkg/query-service/model/queryParams.go

-8
Original file line numberDiff line numberDiff line change
@@ -374,11 +374,9 @@ type GetFilteredSpansParams struct {
374374
SpanKind string `json:"spanKind"`
375375
Status []string `json:"status"`
376376
HttpRoute []string `json:"httpRoute"`
377-
HttpCode []string `json:"httpCode"`
378377
HttpUrl []string `json:"httpUrl"`
379378
HttpHost []string `json:"httpHost"`
380379
HttpMethod []string `json:"httpMethod"`
381-
Component []string `json:"component"`
382380
RPCMethod []string `json:"rpcMethod"`
383381
ResponseStatusCode []string `json:"responseStatusCode"`
384382
StartStr string `json:"start"`
@@ -402,11 +400,9 @@ type GetFilteredSpanAggregatesParams struct {
402400
SpanKind string `json:"spanKind"`
403401
Status []string `json:"status"`
404402
HttpRoute []string `json:"httpRoute"`
405-
HttpCode []string `json:"httpCode"`
406403
HttpUrl []string `json:"httpUrl"`
407404
HttpHost []string `json:"httpHost"`
408405
HttpMethod []string `json:"httpMethod"`
409-
Component []string `json:"component"`
410406
RPCMethod []string `json:"rpcMethod"`
411407
ResponseStatusCode []string `json:"responseStatusCode"`
412408
MinDuration string `json:"minDuration"`
@@ -430,11 +426,9 @@ type SpanFilterParams struct {
430426
ServiceName []string `json:"serviceName"`
431427
SpanKind string `json:"spanKind"`
432428
HttpRoute []string `json:"httpRoute"`
433-
HttpCode []string `json:"httpCode"`
434429
HttpUrl []string `json:"httpUrl"`
435430
HttpHost []string `json:"httpHost"`
436431
HttpMethod []string `json:"httpMethod"`
437-
Component []string `json:"component"`
438432
Operation []string `json:"operation"`
439433
RPCMethod []string `json:"rpcMethod"`
440434
ResponseStatusCode []string `json:"responseStatusCode"`
@@ -453,12 +447,10 @@ type TagFilterParams struct {
453447
Status []string `json:"status"`
454448
ServiceName []string `json:"serviceName"`
455449
HttpRoute []string `json:"httpRoute"`
456-
HttpCode []string `json:"httpCode"`
457450
SpanKind string `json:"spanKind"`
458451
HttpUrl []string `json:"httpUrl"`
459452
HttpHost []string `json:"httpHost"`
460453
HttpMethod []string `json:"httpMethod"`
461-
Component []string `json:"component"`
462454
Operation []string `json:"operation"`
463455
RPCMethod []string `json:"rpcMethod"`
464456
ResponseStatusCode []string `json:"responseStatusCode"`

‎pkg/query-service/model/response.go

-7
Original file line numberDiff line numberDiff line change
@@ -394,11 +394,6 @@ type DBResponseServiceName struct {
394394
Count uint64 `ch:"count"`
395395
}
396396

397-
type DBResponseHttpCode struct {
398-
HttpCode string `ch:"httpCode"`
399-
Count uint64 `ch:"count"`
400-
}
401-
402397
type DBResponseHttpRoute struct {
403398
HttpRoute string `ch:"httpRoute"`
404399
Count uint64 `ch:"count"`
@@ -453,14 +448,12 @@ type SpanFiltersResponse struct {
453448
Status map[string]uint64 `json:"status"`
454449
Duration map[string]uint64 `json:"duration"`
455450
Operation map[string]uint64 `json:"operation"`
456-
HttpCode map[string]uint64 `json:"httpCode"`
457451
ResponseStatusCode map[string]uint64 `json:"responseStatusCode"`
458452
RPCMethod map[string]uint64 `json:"rpcMethod"`
459453
HttpUrl map[string]uint64 `json:"httpUrl"`
460454
HttpMethod map[string]uint64 `json:"httpMethod"`
461455
HttpRoute map[string]uint64 `json:"httpRoute"`
462456
HttpHost map[string]uint64 `json:"httpHost"`
463-
Component map[string]uint64 `json:"component"`
464457
}
465458
type Error struct {
466459
ExceptionType string `json:"exceptionType" ch:"exceptionType"`

0 commit comments

Comments
 (0)