增加API方法调用耗时统计

internal/rpc/services/service_admin.go

@@ -477,7 +477,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	var tx = this.NullTx()
 
 	// 默认集群
+	this.BeginTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters")
 	nodeClusters, err := models.SharedNodeClusterDAO.ListEnabledClusters(tx, "", 0, 1)
+	this.EndTag(ctx, "SharedNodeClusterDAO.ListEnabledClusters")
 	if err != nil {
 		return nil, err
 	}
@@ -486,84 +488,108 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	}
 
 	// 集群数
+	this.BeginTag(ctx, "SharedNodeClusterDAO.CountAllEnabledClusters")
 	countClusters, err := models.SharedNodeClusterDAO.CountAllEnabledClusters(tx, "")
+	this.EndTag(ctx, "SharedNodeClusterDAO.CountAllEnabledClusters")
 	if err != nil {
 		return nil, err
 	}
 	result.CountNodeClusters = countClusters
 
 	// 节点数
+	this.BeginTag(ctx, "SharedNodeDAO.CountAllEnabledNodes")
 	countNodes, err := models.SharedNodeDAO.CountAllEnabledNodes(tx)
+	this.EndTag(ctx, "SharedNodeDAO.CountAllEnabledNodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountNodes = countNodes
 
 	// 离线节点
+	this.BeginTag(ctx, "SharedNodeDAO.CountAllEnabledOfflineNodes")
 	countOfflineNodes, err := models.SharedNodeDAO.CountAllEnabledOfflineNodes(tx)
+	this.EndTag(ctx, "SharedNodeDAO.CountAllEnabledOfflineNodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountOfflineNodes = countOfflineNodes
 
 	// 服务数
+	this.BeginTag(ctx, "SharedServerDAO.CountAllEnabledServers")
 	countServers, err := models.SharedServerDAO.CountAllEnabledServers(tx)
+	this.EndTag(ctx, "SharedServerDAO.CountAllEnabledServers")
 	if err != nil {
 		return nil, err
 	}
 	result.CountServers = countServers
 
+	this.BeginTag(ctx, "SharedServerDAO.CountAllEnabledServersMatch")
 	countAuditingServers, err := models.SharedServerDAO.CountAllEnabledServersMatch(tx, 0, "", 0, 0, configutils.BoolStateYes, nil)
+	this.EndTag(ctx, "SharedServerDAO.CountAllEnabledServersMatch")
 	if err != nil {
 		return nil, err
 	}
 	result.CountAuditingServers = countAuditingServers
 
 	// 用户数
+	this.BeginTag(ctx, "SharedUserDAO.CountAllEnabledUsers")
 	countUsers, err := models.SharedUserDAO.CountAllEnabledUsers(tx, 0, "", false)
+	this.EndTag(ctx, "SharedUserDAO.CountAllEnabledUsers")
 	if err != nil {
 		return nil, err
 	}
 	result.CountUsers = countUsers
 
 	// API节点数
+	this.BeginTag(ctx, "SharedAPINodeDAO.CountAllEnabledAndOnAPINodes")
 	countAPINodes, err := models.SharedAPINodeDAO.CountAllEnabledAndOnAPINodes(tx)
+	this.EndTag(ctx, "SharedAPINodeDAO.CountAllEnabledAndOnAPINodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountAPINodes = countAPINodes
 
 	// 离线API节点
+	this.BeginTag(ctx, "SharedAPINodeDAO.CountAllEnabledAndOnOfflineAPINodes")
 	countOfflineAPINodes, err := models.SharedAPINodeDAO.CountAllEnabledAndOnOfflineAPINodes(tx)
+	this.EndTag(ctx, "SharedAPINodeDAO.CountAllEnabledAndOnOfflineAPINodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountOfflineAPINodes = countOfflineAPINodes
 
 	// 数据库节点数
+	this.BeginTag(ctx, "SharedDBNodeDAO.CountAllEnabledNodes")
 	countDBNodes, err := models.SharedDBNodeDAO.CountAllEnabledNodes(tx)
+	this.EndTag(ctx, "SharedDBNodeDAO.CountAllEnabledNodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountDBNodes = countDBNodes
 
 	// 用户节点数
+	this.BeginTag(ctx, "SharedUserNodeDAO.CountAllEnabledAndOnUserNodes")
 	countUserNodes, err := models.SharedUserNodeDAO.CountAllEnabledAndOnUserNodes(tx)
+	this.EndTag(ctx, "SharedUserNodeDAO.CountAllEnabledAndOnUserNodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountUserNodes = countUserNodes
 
 	// 离线用户节点数
+	this.BeginTag(ctx, "SharedUserNodeDAO.CountAllEnabledAndOnOfflineNodes")
 	countOfflineUserNodes, err := models.SharedUserNodeDAO.CountAllEnabledAndOnOfflineNodes(tx)
+	this.EndTag(ctx, "SharedUserNodeDAO.CountAllEnabledAndOnOfflineNodes")
 	if err != nil {
 		return nil, err
 	}
 	result.CountOfflineUserNodes = countOfflineUserNodes
 
 	// 按日流量统计
+	this.BeginTag(ctx, "SharedTrafficDailyStatDAO.FindDailyStats")
 	dayFrom := timeutil.Format("Ymd", time.Now().AddDate(0, 0, -14))
 	dailyTrafficStats, err := stats.SharedTrafficDailyStatDAO.FindDailyStats(tx, dayFrom, timeutil.Format("Ymd"))
+	this.EndTag(ctx, "SharedTrafficDailyStatDAO.FindDailyStats")
 	if err != nil {
 		return nil, err
 	}
@@ -582,7 +608,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	// 小时流量统计
 	hourFrom := timeutil.Format("YmdH", time.Now().Add(-23*time.Hour))
 	hourTo := timeutil.Format("YmdH")
+	this.BeginTag(ctx, "SharedTrafficHourlyStatDAO.FindHourlyStats")
 	hourlyTrafficStats, err := stats.SharedTrafficHourlyStatDAO.FindHourlyStats(tx, hourFrom, hourTo)
+	this.EndTag(ctx, "SharedTrafficHourlyStatDAO.FindHourlyStats")
 	if err != nil {
 		return nil, err
 	}
@@ -609,7 +637,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.NodeVersion,
 		}
+		this.BeginTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -622,7 +652,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.MonitorNodeVersion,
 		}
+		this.BeginTag(ctx, "SharedMonitorNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedMonitorNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedMonitorNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -635,7 +667,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.AuthorityNodeVersion,
 		}
+		this.BeginTag(ctx, "SharedAuthorityNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := authority.SharedAuthorityNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedAuthorityNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -648,7 +682,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.UserNodeVersion,
 		}
+		this.BeginTag(ctx, "SharedUserNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedUserNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedUserNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -665,7 +701,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: apiVersion,
 		}
+		this.BeginTag(ctx, "SharedAPINodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedAPINodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedAPINodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -678,7 +716,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.DNSNodeVersion,
 		}
+		this.BeginTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedNSNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedNSNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -691,7 +731,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 		upgradeInfo := &pb.ComposeAdminDashboardResponse_UpgradeInfo{
 			NewVersion: teaconst.ReportNodeVersion,
 		}
+		this.BeginTag(ctx, "SharedReportNodeDAO.CountAllLowerVersionNodes")
 		countNodes, err := models.SharedReportNodeDAO.CountAllLowerVersionNodes(tx, upgradeInfo.NewVersion)
+		this.EndTag(ctx, "SharedReportNodeDAO.CountAllLowerVersionNodes")
 		if err != nil {
 			return nil, err
 		}
@@ -700,7 +742,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	}
 
 	// 域名排行
+	this.BeginTag(ctx, "SharedServerDomainHourlyStatDAO.FindTopDomainStats")
 	topDomainStats, err := stats.SharedServerDomainHourlyStatDAO.FindTopDomainStats(tx, hourFrom, hourTo, 10)
+	this.EndTag(ctx, "SharedServerDomainHourlyStatDAO.FindTopDomainStats")
 	if err != nil {
 		return nil, err
 	}
@@ -715,7 +759,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 
 	// 节点排行
 	if isPlus {
+		this.BeginTag(ctx, "SharedNodeTrafficHourlyStatDAO.FindTopNodeStats")
 		topNodeStats, err := stats.SharedNodeTrafficHourlyStatDAO.FindTopNodeStats(tx, "node", hourFrom, hourTo, 10)
+		this.EndTag(ctx, "SharedNodeTrafficHourlyStatDAO.FindTopNodeStats")
 		if err != nil {
 			return nil, err
 		}
@@ -738,7 +784,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 
 	// 地区流量排行
 	if isPlus {
+		this.BeginTag(ctx, "SharedServerRegionCountryDailyStatDAO.SumDailyTotalBytes")
 		totalCountryBytes, err := stats.SharedServerRegionCountryDailyStatDAO.SumDailyTotalBytes(tx, timeutil.Format("Ymd"))
+		this.EndTag(ctx, "SharedServerRegionCountryDailyStatDAO.SumDailyTotalBytes")
 		if err != nil {
 			return nil, err
 		}
@@ -767,7 +815,9 @@ func (this *AdminService) ComposeAdminDashboard(ctx context.Context, req *pb.Com
 	}
 
 	// 指标数据
+	this.BeginTag(ctx, "findMetricDataCharts")
 	pbCharts, err := this.findMetricDataCharts(tx)
+	this.EndTag(ctx, "findMetricDataCharts")
 	if err != nil {
 		return nil, err
 	}

internal/rpc/services/service_api_method_stat.go

@@ -0,0 +1,83 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package services
+
+import (
+	"context"
+	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/utils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
+	timeutil "github.com/iwind/TeaGo/utils/time"
+)
+
+// APIMethodStatService API方法统计服务
+type APIMethodStatService struct {
+	BaseService
+}
+
+// FindAPIMethodStatsWithDay 查找某天的统计
+func (this *APIMethodStatService) FindAPIMethodStatsWithDay(ctx context.Context, req *pb.FindAPIMethodStatsWithDayRequest) (*pb.FindAPIMethodStatsWithDayResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var day = req.Day
+	if len(day) == 0 {
+		day = timeutil.Format("Ymd")
+	}
+	var tx = this.NullTx()
+	stats, err := models.SharedAPIMethodStatDAO.FindAllStatsWithDay(tx, day)
+	if err != nil {
+		return nil, err
+	}
+	var pbStats = []*pb.APIMethodStat{}
+	var cacheMap = utils.NewCacheMap()
+	for _, stat := range stats {
+		apiNode, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, int64(stat.ApiNodeId), cacheMap)
+		if err != nil {
+			return nil, err
+		}
+		if apiNode == nil {
+			continue
+		}
+
+		pbStats = append(pbStats, &pb.APIMethodStat{
+			Id:         int64(stat.Id),
+			ApiNodeId:  int64(stat.ApiNodeId),
+			Method:     stat.Method,
+			Tag:        stat.Tag,
+			CostMs:     float32(stat.CostMs),
+			PeekMs:     float32(stat.PeekMs),
+			CountCalls: int64(stat.CountCalls),
+			ApiNode: &pb.APINode{
+				Id:   int64(apiNode.Id),
+				Name: apiNode.Name,
+			},
+		})
+	}
+
+	return &pb.FindAPIMethodStatsWithDayResponse{
+		ApiMethodStats: pbStats,
+	}, nil
+}
+
+// CountAPIMethodStatsWithDay 检查是否有统计数据
+func (this *APIMethodStatService) CountAPIMethodStatsWithDay(ctx context.Context, req *pb.CountAPIMethodStatsWithDayRequest) (*pb.RPCCountResponse, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	var day = req.Day
+	if len(day) == 0 {
+		day = timeutil.Format("Ymd")
+	}
+
+	var tx = this.NullTx()
+	count, err := models.SharedAPIMethodStatDAO.CountAllStatsWithDay(tx, day)
+	if err != nil {
+		return nil, err
+	}
+	return this.SuccessCount(count)
+}

internal/rpc/services/service_api_node.go

@@ -189,7 +189,7 @@ func (this *APINodeService) FindEnabledAPINode(ctx context.Context, req *pb.Find
 
 	tx := this.NullTx()
 
-	node, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, req.ApiNodeId)
+	node, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, req.ApiNodeId, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -241,7 +241,7 @@ func (this *APINodeService) FindCurrentAPINode(ctx context.Context, req *pb.Find
 
 	var nodeId = teaconst.NodeId
 	var tx *dbs.Tx
-	node, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, nodeId)
+	node, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, nodeId, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -295,3 +295,14 @@ func (this *APINodeService) CountAllEnabledAPINodesWithSSLCertId(ctx context.Con
 	}
 	return this.SuccessCount(count)
 }
+
+// DebugAPINode 修改调试模式状态
+func (this *APINodeService) DebugAPINode(ctx context.Context, req *pb.DebugAPINodeRequest) (*pb.RPCSuccess, error) {
+	_, err := this.ValidateAdmin(ctx, 0)
+	if err != nil {
+		return nil, err
+	}
+
+	teaconst.Debug = req.Debug
+	return this.Success()
+}

internal/rpc/services/service_base.go

@@ -9,6 +9,7 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models/authority"
 	"github.com/TeaOSLab/EdgeAPI/internal/encrypt"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	"github.com/TeaOSLab/EdgeAPI/internal/rpc"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -236,3 +237,25 @@ func (this *BaseService) RunTx(callback func(tx *dbs.Tx) error) error {
 	}
 	return db.RunTx(callback)
 }
+
+// BeginTag 开始标签统计
+func (this *BaseService) BeginTag(ctx context.Context, name string) {
+	if !teaconst.Debug {
+		return
+	}
+	traceCtx, ok := ctx.(*rpc.Context)
+	if ok {
+		traceCtx.Begin(name)
+	}
+}
+
+// EndTag 结束标签统计
+func (this *BaseService) EndTag(ctx context.Context, name string) {
+	if !teaconst.Debug {
+		return
+	}
+	traceCtx, ok := ctx.(*rpc.Context)
+	if ok {
+		traceCtx.End(name)
+	}
+}

internal/rpc/services/service_node_cluster.go

@@ -197,7 +197,7 @@ func (this *NodeClusterService) FindAPINodesWithNodeCluster(ctx context.Context,
 		if len(apiNodeIds) > 0 {
 			apiNodes := []*pb.APINode{}
 			for _, apiNodeId := range apiNodeIds {
-				apiNode, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, apiNodeId)
+				apiNode, err := models.SharedAPINodeDAO.FindEnabledAPINode(tx, apiNodeId, nil)
 				if err != nil {
 					return nil, err
 				}

internal/rpc/services/service_plan_community.go

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-//go:build community
-// +build community
+//go:build !plus
+// +build !plus
 
 package services
 

internal/rpc/services/service_user_plan_community.go

@@ -1,6 +1,6 @@
 // Copyright 2021 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
-//go:build community
-// +build community
+//go:build !plus
+// +build !plus
 
 package services