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

feat: fixProducerAPI (#6422)

Browse Source 
chore: bugfix
This commit is contained in:
Ekansh Gupta 2024-11-12 11:00:36 +05:30 committed by GitHub
parent e974e9d47f
commit d1503f1418
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/query-service/app/http_handler.go
View File

@ -3222,16 +3222,16 @@ func (aH *APIHandler) getProducerThroughputOverview(
} }
for _, res := range result { for _, res := range result {
for _, series := range res.Series { for _, list := range res.List {
serviceName, serviceNameOk := series.Labels["service_name"] serviceName, serviceNameOk := list.Data["service_name"].(*string)
topicName, topicNameOk := series.Labels["topic"] topicName, topicNameOk := list.Data["topic"].(*string)
params := []string{serviceName, topicName} params := []string{*serviceName, *topicName}
hashKey := uniqueIdentifier(params, "#") hashKey := uniqueIdentifier(params, "#")
_, ok := attributeCache.Hash[hashKey] _, ok := attributeCache.Hash[hashKey]
if topicNameOk && serviceNameOk && !ok { if topicNameOk && serviceNameOk && !ok {
attributeCache.Hash[hashKey] = struct{}{} attributeCache.Hash[hashKey] = struct{}{}
attributeCache.TopicName = append(attributeCache.TopicName, topicName) attributeCache.TopicName = append(attributeCache.TopicName, *topicName)
attributeCache.ServiceName = append(attributeCache.ServiceName, serviceName) attributeCache.ServiceName = append(attributeCache.ServiceName, *serviceName)
} }
} }
} }
@ -3256,25 +3256,23 @@ func (aH *APIHandler) getProducerThroughputOverview(
} }
latencyColumn := &v3.Result{QueryName: "latency"} latencyColumn := &v3.Result{QueryName: "latency"}
var latencySeries []*v3.Series var latencySeries []*v3.Row
for _, res := range resultFetchLatency { for _, res := range resultFetchLatency {
for _, series := range res.Series { for _, list := range res.List {
topic, topicOk := series.Labels["topic"] topic, topicOk := list.Data["topic"].(*string)
serviceName, serviceNameOk := series.Labels["service_name"] serviceName, serviceNameOk := list.Data["service_name"].(*string)
params := []string{topic, serviceName} params := []string{*serviceName, *topic}
hashKey := uniqueIdentifier(params, "#") hashKey := uniqueIdentifier(params, "#")
_, ok := attributeCache.Hash[hashKey] _, ok := attributeCache.Hash[hashKey]
if topicOk && serviceNameOk && ok { if topicOk && serviceNameOk && ok {
latencySeries = append(latencySeries, series) latencySeries = append(latencySeries, list)
} }
} }
} }
latencyColumn.Series = latencySeries latencyColumn.List = latencySeries
result = append(result, latencyColumn) result = append(result, latencyColumn)
resultFetchLatency = postprocess.TransformToTableForBuilderQueries(result, queryRangeParams)
resp := v3.QueryRangeResponse{ resp := v3.QueryRangeResponse{
Result: resultFetchLatency, Result: resultFetchLatency,
} }

4
pkg/query-service/app/integrations/messagingQueues/kafka/translator.go
View File

@ -284,7 +284,7 @@ func BuildQRParamsWithCache(messagingQueue *MessagingQueue, queryContext string,
cq = &v3.CompositeQuery{ cq = &v3.CompositeQuery{
QueryType: v3.QueryTypeBuilder, QueryType: v3.QueryTypeBuilder,
BuilderQueries: bhq, BuilderQueries: bhq,
PanelType: v3.PanelTypeTable, PanelType: v3.PanelTypeList,
} }
} }
@ -364,7 +364,7 @@ func BuildClickHouseQuery(messagingQueue *MessagingQueue, queueType string, quer
func buildCompositeQuery(chq *v3.ClickHouseQuery, queryContext string) (*v3.CompositeQuery, error) { func buildCompositeQuery(chq *v3.ClickHouseQuery, queryContext string) (*v3.CompositeQuery, error) {
if queryContext == "producer-consumer-eval" { if queryContext == "producer-consumer-eval" || queryContext == "producer-throughput-overview" {
return &v3.CompositeQuery{ return &v3.CompositeQuery{
QueryType: v3.QueryTypeClickHouseSQL, QueryType: v3.QueryTypeClickHouseSQL,
ClickHouseQueries: map[string]*v3.ClickHouseQuery{queryContext: chq}, ClickHouseQueries: map[string]*v3.ClickHouseQuery{queryContext: chq},