GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-11 02:48:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: exclude operation in trace APIs (#682)

Browse Source
This commit is contained in:
Vishal Sharma 2022-02-08 17:45:40 +05:30 committed by GitHub
parent 821b80acde
commit f74467e33c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,6 +1356,10 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
var query string var query string
excludeMap := make(map[string]struct{}) excludeMap := make(map[string]struct{})
for _, e := range queryParams.Exclude { for _, e := range queryParams.Exclude {
if e == constants.OperationRequest {
excludeMap[constants.OperationDB] = struct{}{}
continue
}
excludeMap[e] = struct{}{} excludeMap[e] = struct{}{}
} }
@ -1382,7 +1386,7 @@ func (r *ClickHouseReader) GetSpanFilters(ctx context.Context, queryParams *mode
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
} }
if len(queryParams.Operation) > 0 { if len(queryParams.Operation) > 0 {
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.Operation, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
} }
if len(queryParams.MinDuration) != 0 { if len(queryParams.MinDuration) != 0 {
@ -1599,6 +1603,10 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo
excludeMap := make(map[string]struct{}) excludeMap := make(map[string]struct{})
for _, e := range queryParams.Exclude { for _, e := range queryParams.Exclude {
if e == constants.OperationRequest {
excludeMap[constants.OperationDB] = struct{}{}
continue
}
excludeMap[e] = struct{}{} excludeMap[e] = struct{}{}
} }
@ -1626,7 +1634,7 @@ func (r *ClickHouseReader) GetFilteredSpans(ctx context.Context, queryParams *mo
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
} }
if len(queryParams.Operation) > 0 { if len(queryParams.Operation) > 0 {
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.Operation, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
} }
if len(queryParams.MinDuration) != 0 { if len(queryParams.MinDuration) != 0 {
query = query + " AND durationNano >= ?" query = query + " AND durationNano >= ?"
@ -1746,6 +1754,10 @@ func (r *ClickHouseReader) GetTagFilters(ctx context.Context, queryParams *model
excludeMap := make(map[string]struct{}) excludeMap := make(map[string]struct{})
for _, e := range queryParams.Exclude { for _, e := range queryParams.Exclude {
if e == constants.OperationRequest {
excludeMap[constants.OperationDB] = struct{}{}
continue
}
excludeMap[e] = struct{}{} excludeMap[e] = struct{}{}
} }
@ -1773,7 +1785,7 @@ func (r *ClickHouseReader) GetTagFilters(ctx context.Context, queryParams *model
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
} }
if len(queryParams.Operation) > 0 { if len(queryParams.Operation) > 0 {
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.Operation, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
} }
if len(queryParams.MinDuration) != 0 { if len(queryParams.MinDuration) != 0 {
query = query + " AND durationNano >= ?" query = query + " AND durationNano >= ?"
@ -2261,6 +2273,10 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
excludeMap := make(map[string]struct{}) excludeMap := make(map[string]struct{})
for _, e := range queryParams.Exclude { for _, e := range queryParams.Exclude {
if e == constants.OperationRequest {
excludeMap[constants.OperationDB] = struct{}{}
continue
}
excludeMap[e] = struct{}{} excludeMap[e] = struct{}{}
} }
@ -2352,7 +2368,7 @@ func (r *ClickHouseReader) GetFilteredSpansAggregates(ctx context.Context, query
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Component, constants.Component, &query, args)
} }
if len(queryParams.Operation) > 0 { if len(queryParams.Operation) > 0 {
args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.Operation, &query, args) args = buildFilterArrayQuery(ctx, excludeMap, queryParams.Operation, constants.OperationDB, &query, args)
} }
if len(queryParams.MinDuration) != 0 { if len(queryParams.MinDuration) != 0 {
query = query + " AND durationNano >= ?" query = query + " AND durationNano >= ?"

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

@ -34,5 +34,6 @@ const (
HttpUrl = "httpUrl" HttpUrl = "httpUrl"
HttpMethod = "httpMethod" HttpMethod = "httpMethod"
Component = "component" Component = "component"
Operation = "name" OperationDB = "name"
OperationRequest = "operation"
) )