GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-07-22 14:54:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: enrich all queries with non materialized attributes (#4772)

Browse Source
This commit is contained in:
Nityananda Gohain 2024-03-30 08:55:46 +05:30 committed by GitHub
parent 43ceb052d8
commit 397da5857f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/query-service/app/logs/v3/enrich_query.go
View File

@ -74,6 +74,12 @@ func isEnriched(field v3.AttributeKey) bool {
if field.Type == v3.AttributeKeyTypeUnspecified || field.DataType == v3.AttributeKeyDataTypeUnspecified { if field.Type == v3.AttributeKeyTypeUnspecified || field.DataType == v3.AttributeKeyDataTypeUnspecified {
return false return false
} }
// try to enrich all attributes which doesn't have isColumn = true
if !field.IsColumn {
return false
}
return true return true
} }

13
pkg/query-service/app/logs/v3/enrich_query_test.go
View File

@ -30,7 +30,7 @@ var testEnrichmentRequiredData = []struct {
}, },
}, },
}, },
EnrichmentRequired: false, EnrichmentRequired: true,
}, },
{ {
Name: "attribute enrichment required", Name: "attribute enrichment required",
@ -66,7 +66,7 @@ var testEnrichmentRequiredData = []struct {
}, },
}, },
}, },
EnrichmentRequired: false, EnrichmentRequired: true,
}, },
{ {
Name: "filter enrichment required", Name: "filter enrichment required",
@ -118,7 +118,7 @@ var testEnrichmentRequiredData = []struct {
}, },
}, },
}, },
EnrichmentRequired: false, EnrichmentRequired: true,
}, },
{ {
Name: "groupBy enrichment required", Name: "groupBy enrichment required",
@ -151,7 +151,7 @@ var testEnrichmentRequiredData = []struct {
}, },
}, },
}, },
EnrichmentRequired: false, EnrichmentRequired: true,
}, },
{ {
Name: "orderBy enrichment required", Name: "orderBy enrichment required",
@ -200,7 +200,7 @@ var testEnrichmentRequiredData = []struct {
}, },
}, },
}, },
EnrichmentRequired: false, EnrichmentRequired: true,
}, },
} }
@ -255,6 +255,7 @@ var testEnrichParamsData = []struct {
Key: "response_time", Key: "response_time",
Type: v3.AttributeKeyTypeTag, Type: v3.AttributeKeyTypeTag,
DataType: v3.AttributeKeyDataTypeInt64, DataType: v3.AttributeKeyDataTypeInt64,
IsColumn: true,
}, },
}, },
Result: v3.QueryRangeParamsV3{ Result: v3.QueryRangeParamsV3{
@ -273,7 +274,7 @@ var testEnrichParamsData = []struct {
{Key: v3.AttributeKey{Key: "user_name", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeString}, Value: "john", Operator: "="}, {Key: v3.AttributeKey{Key: "user_name", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeString}, Value: "john", Operator: "="},
}}, }},
GroupBy: []v3.AttributeKey{{Key: "trace_id", Type: v3.AttributeKeyTypeUnspecified, DataType: v3.AttributeKeyDataTypeString, IsColumn: true}}, GroupBy: []v3.AttributeKey{{Key: "trace_id", Type: v3.AttributeKeyTypeUnspecified, DataType: v3.AttributeKeyDataTypeString, IsColumn: true}},
OrderBy: []v3.OrderBy{{ColumnName: "response_time", Key: "response_time", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeInt64}}, OrderBy: []v3.OrderBy{{ColumnName: "response_time", Key: "response_time", Type: v3.AttributeKeyTypeTag, DataType: v3.AttributeKeyDataTypeInt64, IsColumn: true}},
}, },
}, },
}, },