diff --git a/pkg/query-service/app/integrations/thirdPartyApi/translator.go b/pkg/query-service/app/integrations/thirdPartyApi/translator.go index 869ce872c7..022ad6015e 100644 --- a/pkg/query-service/app/integrations/thirdPartyApi/translator.go +++ b/pkg/query-service/app/integrations/thirdPartyApi/translator.go @@ -1,8 +1,14 @@ package thirdPartyApi import ( - v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" "net" + + v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3" +) + +const ( + urlPathKey = "http.url" + serverNameKey = "net.peer.name" ) var defaultStepInterval int64 = 60 @@ -17,7 +23,7 @@ func FilterResponse(results []*v3.Result) []*v3.Result { filteredRows := make([]*v3.TableRow, 0, len(res.Table.Rows)) for _, row := range res.Table.Rows { if row.Data != nil { - if domainVal, ok := row.Data["net.peer.name"]; ok { + if domainVal, ok := row.Data[serverNameKey]; ok { if domainStr, ok := domainVal.(string); ok { if net.ParseIP(domainStr) != nil { continue @@ -63,7 +69,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er StepInterval: defaultStepInterval, AggregateOperator: v3.AggregateOperatorCountDistinct, AggregateAttribute: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -74,7 +80,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -96,7 +102,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Expression: "endpoints", GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "net.peer.name", + Key: serverNameKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -122,7 +128,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -144,7 +150,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Expression: "lastseen", GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "net.peer.name", + Key: serverNameKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -170,7 +176,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -192,7 +198,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Expression: "rps", GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "net.peer.name", + Key: serverNameKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -228,7 +234,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er }, { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -250,7 +256,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Expression: "error", GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "net.peer.name", + Key: serverNameKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -329,7 +335,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -351,7 +357,7 @@ func BuildDomainList(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Expression: "p99", GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "net.peer.name", + Key: serverNameKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -401,7 +407,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er StepInterval: defaultStepInterval, AggregateOperator: v3.AggregateOperatorCount, AggregateAttribute: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -412,7 +418,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -435,7 +441,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Disabled: false, GroupBy: getGroupBy([]v3.AttributeKey{ { - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, Type: v3.AttributeKeyTypeTag, }, @@ -461,7 +467,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -503,7 +509,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag, @@ -544,7 +550,7 @@ func BuildDomainInfo(thirdPartyApis *ThirdPartyApis) (*v3.QueryRangeParamsV3, er Items: getFilterSet([]v3.FilterItem{ { Key: v3.AttributeKey{ - Key: "http.url", + Key: urlPathKey, DataType: v3.AttributeKeyDataTypeString, IsColumn: false, Type: v3.AttributeKeyTypeTag,