third/APIPark
1
0
Fork 0
mirror of https://github.com/APIParkLab/APIPark.git synced 2026-06-12 18:11:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/liujian-1.8' into 'main'

Browse Source 
Feature/liujian 1.8

See merge request apipark/APIPark!369
This commit is contained in:
刘健
2025-05-06 10:49:33 +08:00
parent 00905e4167 ef1c48e395
commit 61025763ed
7 changed files with 205 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/format.go
+16 -1
View File
@@ -5,7 +5,7 @@ import (
"strconv"
)
func FormatCount(count int64) string {
func FormatCountInt64(count int64) string {
switch {
case count < 1000:
return strconv.FormatInt(count, 10)
@@ -20,6 +20,21 @@ func FormatCount(count int64) string {
}
}
func FormatCountFloat64(count float64) string {
switch {
case count < 1000:
return fmt.Sprintf("%.1f", count)
case count < 1000000:
return fmt.Sprintf("%.1fK", count/1000)
case count < 1000000000:
return fmt.Sprintf("%.1fM", count/1000000)
case count < 1000000000000:
return fmt.Sprintf("%.1fB", count/1000000000)
default:
return fmt.Sprintf("%.1fT", count/1000000000000)
}
}
func FormatTime(t int64) string {
if t < 1000 {
return strconv.FormatInt(t, 10) + "ms"
module/monitor/driver/driver.go
+1
View File
@@ -32,6 +32,7 @@ type IExecutor interface {
type IBasicOverview interface {
RequestOverview(ctx context.Context, start time.Time, end time.Time, wheres []monitor.MonWhereItem) ([]time.Time, *monitor.StatusCodeOverview, []*monitor.StatusCodeOverview, error)
TopN(ctx context.Context, start time.Time, end time.Time, limit int, groupBy string, wheres []monitor.MonWhereItem) ([]*monitor.TopN, error)
ConsumerOverview(ctx context.Context, start time.Time, end time.Time, wheres []monitor.MonWhereItem) (int64, map[time.Time]int64, error)
}
type IRestOverview interface {
module/monitor/driver/influxdb-v2/executor.go
+8
View File
@@ -684,3 +684,11 @@ func (e *executor) TokenOverview(ctx context.Context, start time.Time, end time.
}
return dates, totalOverview, result, nil
}
func (e *executor) ConsumerOverview(ctx context.Context, start time.Time, end time.Time, wheres []monitor.MonWhereItem) (int64, map[time.Time]int64, error) {
newStartTime, every, _, bucket := getTimeIntervalAndBucket(start, end)
filters := formatFilter(wheres)
return e.fluxQuery.CommonTendencyTag(ctx, e.openApi, newStartTime, end, bucket, "request", filters, every, "app")
}
module/monitor/driver/influxdb-v2/flux/flux.go
+42
View File
@@ -15,6 +15,7 @@ type IFluxQuery interface {
CommonStatistics(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, groupBy, filters string, statisticsConf []*StatisticsFilterConf, limit int) (map[string]*FluxStatistics, error)
CommonProxyStatistics(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, groupBy, filters string, statisticsConf []*StatisticsFilterConf, limit int) (map[string]*FluxStatistics, error)
CommonTendency(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, table, filters string, dataFields []string, every, windowOffset string, fn AggregateFn) ([]time.Time, map[string][]int64, error)
CommonTendencyTag(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, table, filters, every, tag string) (int64, map[time.Time]int64, error)
// CommonQueryOnce 查询只返回一条结果
CommonQueryOnce(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, filters string, fieldsConf *StatisticsFilterConf) (map[string]interface{}, error)
CommonWarnStatistics(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, groupBy, filters string, statisticsConf *StatisticsFilterConf) (map[string]*FluxWarnStatistics, error)
@@ -171,6 +172,35 @@ func (f *fluxQuery) CommonTendency(ctx context.Context, queryApi api.QueryAPI, s
return dates, resultMap, nil
}
func (f *fluxQuery) CommonTendencyTag(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, table, filters, every, tag string) (int64, map[time.Time]int64, error) {
query := f.assembleTendencyTagFlux(start, end, bucket, table, filters, every, tag)
log.Info("flux sql=", query)
result, err := queryApi.Query(ctx, query)
if err != nil {
log.Error("flux err=", err)
return 0, nil, err
}
dateMap := map[time.Time]map[string]struct{}{}
tagMap := make(map[string]struct{})
defer result.Close()
for result.Next() {
date := result.Record().Values()["_stop"].(time.Time).In(time.Local)
if _, ok := dateMap[date]; !ok {
dateMap[date] = map[string]struct{}{}
}
if vv, ok := result.Record().Values()[tag]; ok {
v := vv.(string)
tagMap[v] = struct{}{}
dateMap[date][v] = struct{}{}
}
}
returnMap := make(map[time.Time]int64)
for k, v := range dateMap {
returnMap[k] = int64(len(v))
}
return int64(len(tagMap)), returnMap, nil
}
func (f *fluxQuery) CommonQueryOnce(ctx context.Context, queryApi api.QueryAPI, start, end time.Time, bucket, filters string, fieldsConf *StatisticsFilterConf) (map[string]interface{}, error) {
query := f.getCircularMapFlux(start, end, bucket, filters, fieldsConf)
@@ -180,6 +210,7 @@ func (f *fluxQuery) CommonQueryOnce(ctx context.Context, queryApi api.QueryAPI,
log.Error("flux err=", err)
return nil, err
}
defer result.Close()
for result.Next() {
return result.Record().Values(), nil
@@ -324,6 +355,17 @@ func (f *fluxQuery) assembleTendencyFlux(start, end time.Time, bucket, table, fi
}
func (f *fluxQuery) assembleTendencyTagFlux(start, end time.Time, bucket, table, filters string, every, tag string) string {
return fmt.Sprintf(`
from(bucket: "%s")
|> range(start: %d, stop: %d)
|> filter(fn: (r) => r["_measurement"] == "%s")
%s
|> keep(columns: ["_time", "%s"])
|> window(every: %s)
|> distinct(column: "%s")`, bucket, start.Unix(), end.Unix(), table, filters, tag, every, tag)
}
// assembleTendencyFieldCondition 封装趋势图需要的Field数据
func (f *fluxQuery) assembleTendencyFieldCondition(fieldConditions []string) string {
/*
module/monitor/dto/output.go
+46 -35
View File
@@ -154,50 +154,61 @@ type TokenOverview struct {
InputToken int64 `json:"input_token"` //最小token流量
}
type TokenFloatOverview struct {
TotalToken float64 `json:"total_token"` //总token流量
OutputToken float64 `json:"output_token"`
InputToken float64 `json:"input_token"` //最小token流量
}
type ChartAIOverview struct {
RequestOverview []*StatusCodeOverview `json:"request_overview"`
AvgRequestPerSubscriber string `json:"avg_request_per_subscriber"` //请求概况
AvgRequestPerSubscriberOverview []int64 `json:"avg_request_per_subscriber_overview"` //平均响应时间概况
RequestTotal string `json:"request_total"`
Request2xxTotal string `json:"request_2xx_total"`
Request4xxTotal string `json:"request_4xx_total"`
Request5xxTotal string `json:"request_5xx_total"`
TokenTotal string `json:"token_total"` //总token流量
InputTokenTotal string `json:"input_token_total"`
OutputTokenTotal string `json:"output_token_total"` //最大token流量
TokenOverview []*TokenOverview `json:"token_overview"` //token概况
AvgTokenOverview []int64 `json:"avg_token_overview"`
AvgTokenPerSubscriberOverview []*TokenOverview `json:"avg_token_per_subscriber_overview"`
AvgToken string `json:"avg_token"`
MaxToken string `json:"max_token"`
MinToken string `json:"min_token"`
AvgTokenPerSubscriber string `json:"avg_token_per_subscriber"`
Date []string `json:"date"`
AvgRequestPerSubscriberOverview []float64 `json:"avg_request_per_subscriber_overview"` //平均响应时间概况
MaxRequestPerSubscriber float64 `json:"max_request_per_subscriber"`
MinRequestPerSubscriber float64 `json:"min_request_per_subscriber"`
RequestTotal int64 `json:"request_total"`
Request2xxTotal int64 `json:"request_2xx_total"`
Request4xxTotal int64 `json:"request_4xx_total"`
Request5xxTotal int64 `json:"request_5xx_total"`
TokenTotal int64 `json:"token_total"` //总token流量
InputTokenTotal int64 `json:"input_token_total"`
OutputTokenTotal int64 `json:"output_token_total"` //最大token流量
TokenOverview []*TokenOverview `json:"token_overview"` //token概况
AvgTokenOverview []float64 `json:"avg_token_overview"`
AvgTokenPerSubscriberOverview []*TokenFloatOverview `json:"avg_token_per_subscriber_overview"`
AvgToken float64 `json:"avg_token"`
MaxToken float64 `json:"max_token"`
MinToken float64 `json:"min_token"`
Date []string `json:"date"`
MaxTokenPerSubscriber float64 `json:"max_token_per_subscriber"`
MinTokenPerSubscriber float64 `json:"min_token_per_subscriber"`
}
type ChartRestOverview struct {
RequestOverview []*StatusCodeOverview `json:"request_overview"` //请求概况
AvgRequestPerSubscriber string `json:"avg_request_per_subscriber"`
AvgRequestPerSubscriberOverview []int64 `json:"avg_request_per_subscriber_overview"` //平均响应时间概况
RequestOverview []*StatusCodeOverview `json:"request_overview"` //请求概况
AvgRequestPerSubscriberOverview []float64 `json:"avg_request_per_subscriber_overview"` //平均响应时间概况
MaxRequestPerSubscriber float64 `json:"max_request_per_subscriber"`
MinRequestPerSubscriber float64 `json:"min_request_per_subscriber"`
RequestTotal string `json:"request_total"`
Request2xxTotal string `json:"request_2xx_total"`
Request4xxTotal string `json:"request_4xx_total"`
Request5xxTotal string `json:"request_5xx_total"`
RequestTotal int64 `json:"request_total"`
Request2xxTotal int64 `json:"request_2xx_total"`
Request4xxTotal int64 `json:"request_4xx_total"`
Request5xxTotal int64 `json:"request_5xx_total"`
TrafficOverview []*StatusCodeOverview `json:"traffic_overview"` //流量概况
Traffic2xxTotal string `json:"traffic_2xx_total"`
Traffic4xxTotal string `json:"traffic_4xx_total"` //流量概况
Traffic5xxTotal string `json:"traffic_5xx_total"` //流量概况
Traffic2xxTotal int64 `json:"traffic_2xx_total"`
Traffic4xxTotal int64 `json:"traffic_4xx_total"` //流量概况
Traffic5xxTotal int64 `json:"traffic_5xx_total"` //流量概况
AvgResponseTimeOverview []int64 `json:"avg_response_time_overview"` //平均响应时间概况
AvgTrafficPerSubscriberOverview []int64 `json:"avg_traffic_per_subscriber_overview"`
TrafficTotal string `json:"traffic_total"`
AvgResponseTime string `json:"avg_response_time"` //平均响应时间
MaxResponseTime string `json:"max_response_time"` //最大响应时间
MinResponseTime string `json:"min_response_time"` //最小响应时间
AvgTrafficPerSubscriber string `json:"avg_traffic_per_subscriber"`
Date []string `json:"date"`
AvgResponseTimeOverview []int64 `json:"avg_response_time_overview"` //平均响应时间概况
AvgTrafficPerSubscriberOverview []float64 `json:"avg_traffic_per_subscriber_overview"`
TrafficTotal int64 `json:"traffic_total"`
AvgResponseTime int64 `json:"avg_response_time"` //平均响应时间
MaxResponseTime int64 `json:"max_response_time"` //最大响应时间
MinResponseTime int64 `json:"min_response_time"` //最小响应时间
Date []string `json:"date"`
MaxTrafficPerSubscriber float64 `json:"max_traffic_per_subscriber"`
MinTrafficPerSubscriber float64 `json:"min_traffic_per_subscriber"`
}
type ServiceChartRestOverview struct {
module/monitor/format.go
-52
View File
@@ -1,52 +0,0 @@
package monitor
import (
"time"
)
const (
oneMinute = 60
oneHour = 3600
oneDay = 24 * oneHour
tenDay = 10 * oneDay
oneYear = 365 * oneDay
bucketMinuteRetention = (7) * oneDay
bucketHourRetention = (90) * oneDay
bucketDayRetention = (5 * 365) * oneDay
)
// getTimeIntervalAndBucket 根据start和end来获取窗口时间间隔，窗口偏移量offset，以及使用的bucket, 查询的startTime也会格式化
func getTimeInterval(startTime, endTime time.Time) int64 {
startToNow := time.Now().Unix() - startTime.Unix()
//结合可使用的最小桶，根据end-start时间间隔来得出合适的桶和趋势图时间间隔
diff := endTime.Unix() - startTime.Unix()
if diff <= oneHour {
return 5 * oneMinute
} else if diff <= oneDay {
switch {
case startToNow <= bucketHourRetention:
return oneHour
case startToNow <= bucketDayRetention:
return oneDay
default:
return 7 * oneDay
}
} else if diff <= tenDay {
switch {
case startToNow <= bucketHourRetention:
return oneHour
case startToNow <= bucketDayRetention:
return oneDay
default:
return 7 * oneDay
}
} else {
return 7 * oneDay
}
}
module/monitor/iml.go
+92 -98
View File
@@ -83,32 +83,10 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
return nil, err
}
serviceIds := make([]string, 0)
// 从数据库中获取相关信息
if serviceId == "" {
// 获取全部服务
list, err := i.serviceService.ServiceListByKind(ctx, service.AIService)
if err != nil {
return nil, err
}
serviceIds = utils.SliceToSlice(list, func(t *service.Service) string {
return t.Id
})
} else {
serviceIds = append(serviceIds, serviceId)
_, consumerMap, err := executor.ConsumerOverview(ctx, formatTimeByMinute(start), formatTimeByMinute(end), wheres)
if err != nil {
return nil, err
}
appMap := make(map[string]struct{})
for _, sId := range serviceIds {
items, err := i.subscribeService.ListBySubscribeStatus(ctx, sId, subscribe.ApplyStatusSubscribe)
if err != nil {
return nil, err
}
for _, item := range items {
appMap[item.Application] = struct{}{}
}
}
subscriberNum := int64(len(appMap))
var wg sync.WaitGroup
wg.Add(3)
errChan := make(chan error, 3)
@@ -123,21 +101,26 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
result.Date = utils.SliceToSlice(date, func(t time.Time) string {
return t.Format("2006/01/02 15:04")
})
result.AvgRequestPerSubscriberOverview = make([]int64, 0, len(items))
result.AvgRequestPerSubscriberOverview = make([]float64, 0, len(items))
result.RequestOverview = make([]*monitor_dto.StatusCodeOverview, 0, len(items))
for _, item := range items {
result.AvgRequestPerSubscriberOverview = append(result.AvgRequestPerSubscriberOverview, item.StatusTotal/subscriberNum)
for index, item := range items {
consumerNum := consumerMap[date[index]]
avgRequestPerSubscriber := 0.0
if consumerNum != 0 {
avgRequestPerSubscriber = float64(item.StatusTotal) / float64(consumerNum)
}
result.AvgRequestPerSubscriberOverview = append(result.AvgRequestPerSubscriberOverview, avgRequestPerSubscriber)
result.RequestOverview = append(result.RequestOverview, &monitor_dto.StatusCodeOverview{
Status2xx: item.Status2xx,
Status4xx: item.Status4xx,
Status5xx: item.Status5xx,
})
}
result.AvgRequestPerSubscriber = common.FormatCount(summary.StatusTotal / subscriberNum)
result.RequestTotal = common.FormatCount(summary.StatusTotal)
result.Request2xxTotal = common.FormatCount(summary.Status2xx)
result.Request4xxTotal = common.FormatCount(summary.Status4xx)
result.Request5xxTotal = common.FormatCount(summary.Status5xx)
result.RequestTotal = summary.StatusTotal
result.Request2xxTotal = summary.Status2xx
result.Request4xxTotal = summary.Status4xx
result.Request5xxTotal = summary.Status5xx
}()
sumResponseTimes := make([]int64, 0)
go func() {
@@ -156,16 +139,16 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
defer wg.Done()
startTime := formatTimeByMinute(start)
endTime := formatTimeByMinute(end)
_, summary, items, err := executor.TokenOverview(ctx, startTime, endTime, wheres)
date, summary, items, err := executor.TokenOverview(ctx, startTime, endTime, wheres)
if err != nil {
errChan <- err
return
}
result.TokenOverview = make([]*monitor_dto.TokenOverview, 0, len(items))
result.AvgTokenOverview = make([]int64, 0, len(items))
result.AvgTokenPerSubscriberOverview = make([]*monitor_dto.TokenOverview, 0, len(items))
result.AvgTokenOverview = make([]float64, 0, len(items))
result.AvgTokenPerSubscriberOverview = make([]*monitor_dto.TokenFloatOverview, 0, len(items))
var maxToken, minToken int64 = 0, 0
for _, item := range items {
for index, item := range items {
if maxToken < item.TotalToken {
maxToken = item.TotalToken
}
@@ -178,23 +161,39 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
InputToken: item.InputToken,
})
totalTokens = append(totalTokens, item.TotalToken)
result.AvgTokenPerSubscriberOverview = append(result.AvgTokenPerSubscriberOverview, &monitor_dto.TokenOverview{
TotalToken: item.TotalToken / subscriberNum,
OutputToken: item.OutputToken / subscriberNum,
InputToken: item.InputToken / subscriberNum,
consumerNum := consumerMap[date[index]]
avgTotalPerSubscriber := 0.0
avgOutputPerSubscriber := 0.0
avgInputPerSubscriber := 0.0
if consumerNum != 0 {
avgTotalPerSubscriber = float64(item.TotalToken) / float64(consumerNum)
avgOutputPerSubscriber = float64(item.OutputToken) / float64(consumerNum)
avgInputPerSubscriber = float64(item.InputToken) / float64(consumerNum)
}
result.AvgTokenPerSubscriberOverview = append(result.AvgTokenPerSubscriberOverview, &monitor_dto.TokenFloatOverview{
TotalToken: avgTotalPerSubscriber,
OutputToken: avgOutputPerSubscriber,
InputToken: avgInputPerSubscriber,
})
}
result.AvgTokenPerSubscriber = common.FormatCount(summary.TotalToken / subscriberNum)
result.TokenTotal = common.FormatCount(summary.TotalToken)
result.InputTokenTotal = common.FormatCount(summary.InputToken)
result.OutputTokenTotal = common.FormatCount(summary.OutputToken)
//avgTokenPerSubscriber := 0.0
//if totalConsumerCount != 0 {
// avgTokenPerSubscriber = float64(summary.TotalToken) / float64(totalConsumerCount)
//}
//result.AvgToken = avgTokenPerSubscriber
//result.MaxToken = maxToken
//result.MinToken = minToken
result.TokenTotal = summary.TotalToken
result.InputTokenTotal = summary.InputToken
result.OutputTokenTotal = summary.OutputToken
}()
go func() {
wg.Wait()
close(errChan)
}()
errs := make([]error, 0, 2)
errs := make([]error, 0, 3)
// 收集错误
for err := range errChan {
errs = append(errs, err)
@@ -203,12 +202,12 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
if len(errs) > 0 {
return nil, fmt.Errorf("errors occurred: %v", errs)
}
var maxTokenPerSecond, minTokenPerSecond, avgTokenPerSecond int64 = 0, 0, 0
var maxTokenPerSecond, minTokenPerSecond, avgTokenPerSecond float64 = 0, 0, 0
for index, token := range totalTokens {
var p int64 = 0
var p float64 = 0
if len(sumResponseTimes) > index && sumResponseTimes[index] > 0 {
// 由于时间单位是ms，因此需要✖️1000
p = int64(float64(token) * 1000 / float64(sumResponseTimes[index]))
p = float64(token) * 1000 / float64(sumResponseTimes[index])
}
result.AvgTokenOverview = append(result.AvgTokenOverview, p)
if maxTokenPerSecond < p {
@@ -220,10 +219,10 @@ func (i *imlMonitorStatisticModule) AIChartOverview(ctx context.Context, service
avgTokenPerSecond += p
}
if len(sumResponseTimes) > 0 {
result.AvgToken = fmt.Sprintf("%s Token/s", common.FormatCount(avgTokenPerSecond/int64(len(sumResponseTimes))))
result.AvgToken = avgTokenPerSecond / float64(len(sumResponseTimes))
}
result.MaxToken = fmt.Sprintf("%s Token/s", common.FormatCount(maxTokenPerSecond))
result.MinToken = fmt.Sprintf("%s Token/s", common.FormatCount(minTokenPerSecond))
result.MaxToken = maxTokenPerSecond
result.MinToken = minTokenPerSecond
return result, nil
}
@@ -237,31 +236,11 @@ func (i *imlMonitorStatisticModule) RestChartOverview(ctx context.Context, servi
return nil, err
}
serviceIds := make([]string, 0)
// 从数据库中获取相关信息
if serviceId == "" {
// 获取全部服务
list, err := i.serviceService.ServiceListByKind(ctx, service.RestService)
if err != nil {
return nil, err
}
serviceIds = utils.SliceToSlice(list, func(t *service.Service) string {
return t.Id
})
} else {
serviceIds = append(serviceIds, serviceId)
_, consumerMap, err := executor.ConsumerOverview(ctx, formatTimeByMinute(start), formatTimeByMinute(end), wheres)
if err != nil {
return nil, err
}
appMap := make(map[string]struct{})
for _, sId := range serviceIds {
items, err := i.subscribeService.ListBySubscribeStatus(ctx, sId, subscribe.ApplyStatusSubscribe)
if err != nil {
return nil, err
}
for _, item := range items {
appMap[item.Id] = struct{}{}
}
}
subscriberNum := int64(len(appMap))
var wg sync.WaitGroup
wg.Add(3)
errChan := make(chan error, 2)
@@ -276,21 +255,31 @@ func (i *imlMonitorStatisticModule) RestChartOverview(ctx context.Context, servi
result.Date = utils.SliceToSlice(date, func(t time.Time) string {
return t.Format("2006/01/02 15:04")
})
result.AvgRequestPerSubscriberOverview = make([]int64, 0, len(items))
result.AvgRequestPerSubscriberOverview = make([]float64, 0, len(items))
result.RequestOverview = make([]*monitor_dto.StatusCodeOverview, 0, len(items))
for _, item := range items {
result.AvgRequestPerSubscriberOverview = append(result.AvgRequestPerSubscriberOverview, item.StatusTotal/int64(subscriberNum))
for index, item := range items {
t := date[index]
log.Infof("date: %v, item: %v", t, item)
consumerNum := consumerMap[date[index]]
avgRequestPerSubscriber := 0.0
if consumerNum != 0 {
avgRequestPerSubscriber = float64(summary.StatusTotal) / float64(consumerNum)
}
result.AvgRequestPerSubscriberOverview = append(result.AvgRequestPerSubscriberOverview, avgRequestPerSubscriber)
result.RequestOverview = append(result.RequestOverview, &monitor_dto.StatusCodeOverview{
Status2xx: item.Status2xx,
Status4xx: item.Status4xx,
Status5xx: item.Status5xx,
})
}
result.AvgRequestPerSubscriber = common.FormatCount(summary.StatusTotal / subscriberNum)
result.RequestTotal = common.FormatCount(summary.StatusTotal)
result.Request2xxTotal = common.FormatCount(summary.Status2xx)
result.Request4xxTotal = common.FormatCount(summary.Status4xx)
result.Request5xxTotal = common.FormatCount(summary.Status5xx)
//avgRequestPerSubscriber := 0.0
//if totalConsumerCount != 0 {
// avgRequestPerSubscriber = float64(summary.StatusTotal) / float64(totalConsumerCount)
//}
result.RequestTotal = summary.StatusTotal
result.Request2xxTotal = summary.Status2xx
result.Request4xxTotal = summary.Status4xx
result.Request5xxTotal = summary.Status5xx
}()
go func() {
@@ -303,35 +292,40 @@ func (i *imlMonitorStatisticModule) RestChartOverview(ctx context.Context, servi
return
}
result.AvgResponseTimeOverview = items
result.AvgResponseTime = fmt.Sprintf("%d ms", summary.Avg)
result.MaxResponseTime = fmt.Sprintf("%d ms", summary.Max)
result.MinResponseTime = fmt.Sprintf("%d ms", summary.Min)
result.AvgResponseTime = summary.Avg
result.MaxResponseTime = summary.Max
result.MinResponseTime = summary.Min
}()
go func() {
defer wg.Done()
startTime := formatTimeByMinute(start)
endTime := formatTimeByMinute(end)
_, summary, items, err := executor.TrafficOverviewByStatusCode(ctx, startTime, endTime, wheres)
date, summary, items, err := executor.TrafficOverviewByStatusCode(ctx, startTime, endTime, wheres)
if err != nil {
errChan <- err
return
}
result.TrafficOverview = make([]*monitor_dto.StatusCodeOverview, 0, len(items))
result.AvgTrafficPerSubscriberOverview = make([]int64, 0, len(items))
for _, item := range items {
result.AvgTrafficPerSubscriberOverview = make([]float64, 0, len(items))
for index, item := range items {
result.TrafficOverview = append(result.TrafficOverview, &monitor_dto.StatusCodeOverview{
Status2xx: item.Status2xx,
Status4xx: item.Status4xx,
Status5xx: item.Status5xx,
})
result.AvgTrafficPerSubscriberOverview = append(result.AvgTrafficPerSubscriberOverview, item.StatusTotal/subscriberNum)
consumerNum := consumerMap[date[index]]
avgTrafficPerSubscriber := 0.0
if consumerNum != 0 {
avgTrafficPerSubscriber = float64(item.StatusTotal) / float64(consumerNum)
}
result.AvgTrafficPerSubscriberOverview = append(result.AvgTrafficPerSubscriberOverview, avgTrafficPerSubscriber)
}
result.TrafficTotal = common.FormatByte(summary.StatusTotal)
result.Traffic2xxTotal = common.FormatByte(summary.Status2xx)
result.Traffic4xxTotal = common.FormatByte(summary.Status4xx)
result.Traffic5xxTotal = common.FormatByte(summary.Status5xx)
result.AvgTrafficPerSubscriber = common.FormatCount(summary.StatusTotal / subscriberNum)
result.TrafficTotal = summary.StatusTotal
result.Traffic2xxTotal = summary.Status2xx
result.Traffic4xxTotal = summary.Status4xx
result.Traffic5xxTotal = summary.Status5xx
}()
go func() {
wg.Wait()
@@ -353,13 +347,13 @@ func generateTopN(id string, name string, item *monitor.TopN, apiKind string) *m
n := &monitor_dto.TopN{
Id: id,
Name: name,
Request: common.FormatCount(item.Request),
Request: common.FormatCountInt64(item.Request),
}
switch apiKind {
case "rest":
n.Traffic = common.FormatByte(item.Traffic)
case "ai":
n.Token = common.FormatCount(item.Token)
n.Token = common.FormatCountInt64(item.Token)
}
return n
}