chore: use MinAllowedStepInterval

This commit is contained in:
shivanshu 2024-08-27 14:04:00 +05:30
parent 90cb8ba9a1
commit 8d655bf419
No known key found for this signature in database
GPG Key ID: 0F9ACBC3AA12DC71

View File

@ -1,8 +1,8 @@
package kafka package kafka
import ( import (
"encoding/json"
"fmt" "fmt"
"go.signoz.io/signoz/pkg/query-service/common"
v3 "go.signoz.io/signoz/pkg/query-service/model/v3" v3 "go.signoz.io/signoz/pkg/query-service/model/v3"
) )
@ -50,14 +50,14 @@ func buildClickHouseQueryNetwork(messagingQueue *MessagingQueue, queueType strin
}, nil }, nil
} }
func buildBuilderQueriesNetwork(attributeCache []Clients) (map[string]*v3.BuilderQuery, error) { func buildBuilderQueriesNetwork(unixMilliStart, unixMilliEnd int64, attributeCache []Clients) (map[string]*v3.BuilderQuery, error) {
bq := make(map[string]*v3.BuilderQuery) bq := make(map[string]*v3.BuilderQuery)
for i, instanceInfo := range attributeCache { for i, instanceInfo := range attributeCache {
queryName := fmt.Sprintf("latency_%d", i) queryName := fmt.Sprintf("latency_%d", i)
chq := &v3.BuilderQuery{ chq := &v3.BuilderQuery{
QueryName: queryName, QueryName: queryName,
StepInterval: defaultStepInterval, StepInterval: common.MinAllowedStepInterval(unixMilliStart, unixMilliEnd),
DataSource: v3.DataSourceMetrics, DataSource: v3.DataSourceMetrics,
AggregateAttribute: v3.AttributeKey{ AggregateAttribute: v3.AttributeKey{
Key: "kafka_consumer_fetch_latency_avg", Key: "kafka_consumer_fetch_latency_avg",
@ -127,6 +127,9 @@ func BuildQRParamsNetwork(messagingQueue *MessagingQueue, queryContext string, a
queueType := kafkaQueue queueType := kafkaQueue
unixMilliStart := messagingQueue.Start / 1000000
unixMilliEnd := messagingQueue.End / 1000000
var cq *v3.CompositeQuery var cq *v3.CompositeQuery
if queryContext == "throughput" { if queryContext == "throughput" {
@ -139,7 +142,7 @@ func BuildQRParamsNetwork(messagingQueue *MessagingQueue, queryContext string, a
cq, err = buildCompositeQuery(chq, queryContext) cq, err = buildCompositeQuery(chq, queryContext)
} else if queryContext == "fetch-latency" { } else if queryContext == "fetch-latency" {
bhq, err := buildBuilderQueriesNetwork(attributeCache) bhq, err := buildBuilderQueriesNetwork(unixMilliStart, unixMilliEnd, attributeCache)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -150,20 +153,14 @@ func BuildQRParamsNetwork(messagingQueue *MessagingQueue, queryContext string, a
} }
} }
unixMiliStart := messagingQueue.Start / 1000000
unixMiliEnd := messagingQueue.End / 1000000
queryRangeParams := &v3.QueryRangeParamsV3{ queryRangeParams := &v3.QueryRangeParamsV3{
Start: unixMiliStart, Start: unixMilliStart,
End: unixMiliEnd, End: unixMilliEnd,
Step: defaultStepInterval, Step: defaultStepInterval,
CompositeQuery: cq, CompositeQuery: cq,
Version: "v4", Version: "v4",
FormatForWeb: true, FormatForWeb: true,
} }
tmp, _ := json.Marshal(queryRangeParams)
xx := string(tmp)
fmt.Print(xx)
return queryRangeParams, nil return queryRangeParams, nil
} }