forked from erda-project/erda
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
bugfix: microservice projects statistics error (erda-project#3196) (e…
…rda-project#3198) * bugfix: microservice projects statistics * bugfix: fix unit test Co-authored-by: 郭刚平 <512979011@qq.com>
- Loading branch information
Showing
3 changed files
with
239 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| // Copyright (c) 2021 Terminus, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package project | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "strconv" | ||
| "time" | ||
|
|
||
| "google.golang.org/protobuf/types/known/structpb" | ||
|
|
||
| metricpb "github.com/erda-project/erda-proto-go/core/monitor/metric/pb" | ||
| "github.com/erda-project/erda-proto-go/msp/tenant/project/pb" | ||
| ) | ||
|
|
||
| type projectStats struct { | ||
| serviceCount int64 | ||
| lastActiveTime int64 | ||
| alertCount int64 | ||
| } | ||
|
|
||
| func (p *projectStats) merge(data *projectStats) *projectStats { | ||
| p.serviceCount += data.serviceCount | ||
| p.alertCount += data.alertCount | ||
| if data.lastActiveTime > p.lastActiveTime { | ||
| p.lastActiveTime = data.lastActiveTime | ||
| } | ||
| return p | ||
| } | ||
|
|
||
| type projectStatisticMap map[string]map[string]*projectStats | ||
|
|
||
| func (ps projectStatisticMap) initOrUpdate(projectId, terminusKey string, updateFunc func(*projectStats)) { | ||
| if ps[projectId] == nil { | ||
| ps[projectId] = map[string]*projectStats{} | ||
| } | ||
| if ps[projectId][terminusKey] == nil { | ||
| ps[projectId][terminusKey] = &projectStats{serviceCount: 0, lastActiveTime: 0, alertCount: 0} | ||
| } | ||
| updateFunc(ps[projectId][terminusKey]) | ||
| } | ||
|
|
||
| func (ps projectStatisticMap) statForProjectId(projectId string) (*projectStats, bool) { | ||
| tkMap, ok := ps[projectId] | ||
| if !ok { | ||
| return nil, false | ||
| } | ||
| result := &projectStats{} | ||
| for _, stats := range tkMap { | ||
| result.merge(stats) | ||
| } | ||
| return result, true | ||
| } | ||
|
|
||
| func (ps projectStatisticMap) statForTerminusKeys(projectId string, terminusKeys ...string) (*projectStats, bool) { | ||
| tkMap, ok := ps[projectId] | ||
| if !ok { | ||
| return nil, false | ||
| } | ||
| result := &projectStats{} | ||
| for _, terminusKey := range terminusKeys { | ||
| if stats, ok := tkMap[terminusKey]; ok { | ||
| result.merge(stats) | ||
| } | ||
| } | ||
| return result, true | ||
| } | ||
|
|
||
| func (s *projectService) getProjectsStatistics(projects Projects) error { | ||
| if len(projects) == 0 { | ||
| return nil | ||
| } | ||
| endMillSeconds := time.Now().UnixNano() / int64(time.Millisecond) | ||
| oneDayAgoMillSeconds := endMillSeconds - int64(24*time.Hour/time.Millisecond) | ||
| sevenDayAgoMillSeconds := endMillSeconds - int64(7*24*time.Hour/time.Millisecond) | ||
|
|
||
| projectIdList, _ := structpb.NewList(projects. | ||
| Select(func(item *pb.Project) interface{} { return item.Id })) | ||
| terminusKeyList, _ := structpb.NewList(projects. | ||
| SelectMany(func(item *pb.Project) []interface{} { | ||
| var list []interface{} | ||
| for _, relationship := range item.Relationship { | ||
| list = append(list, relationship.TenantID) | ||
| } | ||
| return list | ||
| })) | ||
| statisticMap := projectStatisticMap{} | ||
|
|
||
| // get services count and last active time | ||
| req := &metricpb.QueryWithInfluxFormatRequest{ | ||
| Start: strconv.FormatInt(sevenDayAgoMillSeconds, 10), | ||
| End: strconv.FormatInt(endMillSeconds, 10), | ||
| Filters: []*metricpb.Filter{ | ||
| { | ||
| Key: "tags.project_id", | ||
| Op: "or_in", | ||
| Value: structpb.NewListValue(projectIdList), | ||
| }, | ||
| { | ||
| Key: "tags.terminus_key", | ||
| Op: "or_in", | ||
| Value: structpb.NewListValue(terminusKeyList), | ||
| }, | ||
| }, | ||
| Statement: ` | ||
| SELECT project_id::tag, terminus_key::tag, distinct(service_id::tag), max(timestamp) | ||
| FROM application_service_node | ||
| WHERE _metric_scope::tag = 'micro_service' | ||
| GROUP BY project_id::tag, terminus_key::tag | ||
| `, | ||
| } | ||
| if err := s.doInfluxQuery(req, func(row *metricpb.Row) { | ||
| projectId := row.Values[0].GetStringValue() | ||
| terminusKey := row.Values[1].GetStringValue() | ||
| servicesCount := row.Values[2].GetNumberValue() | ||
| activeTime := row.Values[3].GetNumberValue() | ||
|
|
||
| statisticMap.initOrUpdate(projectId, terminusKey, func(stats *projectStats) { | ||
| stats.serviceCount = int64(servicesCount) | ||
| stats.lastActiveTime = int64(activeTime) / int64(time.Millisecond) | ||
| }) | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // get alert count | ||
| req = &metricpb.QueryWithInfluxFormatRequest{ | ||
| Start: strconv.FormatInt(oneDayAgoMillSeconds, 10), | ||
| End: strconv.FormatInt(endMillSeconds, 10), | ||
| Filters: []*metricpb.Filter{ | ||
| { | ||
| Key: "tags.project_id", | ||
| Op: "in", | ||
| Value: structpb.NewListValue(projectIdList), | ||
| }, | ||
| }, | ||
| Statement: ` | ||
| SELECT project_id::tag, terminus_key::tag, count(project_id::tag) | ||
| FROM analyzer_alert | ||
| WHERE alert_scope::tag = 'micro_service' | ||
| GROUP BY project_id::tag, terminus_key::tag | ||
| `, | ||
| } | ||
| if err := s.doInfluxQuery(req, func(row *metricpb.Row) { | ||
| projectId := row.Values[0].GetStringValue() | ||
| terminusKey := row.Values[1].GetStringValue() | ||
| alertCount := row.Values[2].GetNumberValue() | ||
|
|
||
| statisticMap.initOrUpdate(projectId, terminusKey, func(stats *projectStats) { | ||
| stats.alertCount = int64(alertCount) | ||
| }) | ||
| }); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // merge results | ||
| for _, project := range projects { | ||
| stats, ok := statisticMap.statForProjectId(project.Id) | ||
| if !ok { | ||
| var tks []string | ||
| for _, relationship := range project.Relationship { | ||
| tks = append(tks, relationship.TenantID) | ||
| } | ||
| stats, ok = statisticMap.statForTerminusKeys("", tks...) | ||
| } | ||
| if !ok { | ||
| continue | ||
| } | ||
|
|
||
| project.ServiceCount = stats.serviceCount | ||
| project.Last24HAlertCount = stats.alertCount | ||
| project.LastActiveTime = stats.lastActiveTime | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (s *projectService) doInfluxQuery(req *metricpb.QueryWithInfluxFormatRequest, rowCallback func(row *metricpb.Row)) error { | ||
| ctx, cancel := context.WithTimeout(context.Background(), time.Minute) | ||
| defer cancel() | ||
| resp, err := s.metricq.QueryWithInfluxFormat(ctx, req) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to do metrics: %s", err) | ||
| } | ||
| if len(resp.Results) > 0 && | ||
| len(resp.Results[0].Series) > 0 && | ||
| len(resp.Results[0].Series[0].Rows) > 0 { | ||
|
|
||
| for _, row := range resp.Results[0].Series[0].Rows { | ||
| rowCallback(row) | ||
| } | ||
| } | ||
| return nil | ||
| } |