2021-01-25 16:40:31 +08:00
|
|
|
|
package stats
|
|
|
|
|
|
|
|
|
|
|
|
import (
|
2021-07-06 20:06:57 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
|
2021-01-25 16:40:31 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
|
2021-01-26 18:42:46 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/events"
|
2021-12-08 15:17:45 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/goman"
|
2021-01-25 16:40:31 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
|
2021-07-06 20:06:57 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/monitor"
|
2021-01-25 16:40:31 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
|
|
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/rpc"
|
2021-11-14 10:55:09 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/trackers"
|
2022-01-05 16:05:58 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/utils"
|
2021-07-18 15:51:49 +08:00
|
|
|
|
"github.com/TeaOSLab/EdgeNode/internal/waf"
|
2021-01-25 16:40:31 +08:00
|
|
|
|
"github.com/iwind/TeaGo/Tea"
|
2021-07-06 20:06:57 +08:00
|
|
|
|
"github.com/iwind/TeaGo/maps"
|
2021-01-25 16:40:31 +08:00
|
|
|
|
"github.com/iwind/TeaGo/types"
|
|
|
|
|
|
timeutil "github.com/iwind/TeaGo/utils/time"
|
|
|
|
|
|
"strconv"
|
|
|
|
|
|
"strings"
|
|
|
|
|
|
"time"
|
|
|
|
|
|
)
|
|
|
|
|
|
|
2021-12-05 18:57:30 +08:00
|
|
|
|
type StatItem struct {
|
|
|
|
|
|
Bytes int64
|
|
|
|
|
|
CountRequests int64
|
|
|
|
|
|
CountAttackRequests int64
|
|
|
|
|
|
AttackBytes int64
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-01-25 16:40:31 +08:00
|
|
|
|
var SharedHTTPRequestStatManager = NewHTTPRequestStatManager()
|
2022-01-01 22:02:46 +08:00
|
|
|
|
var sharedUserAgentParser = NewUserAgentParser()
|
2021-01-25 16:40:31 +08:00
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// HTTPRequestStatManager HTTP请求相关的统计
|
2021-01-25 16:40:31 +08:00
|
|
|
|
// 这里的统计是一个辅助统计,注意不要因为统计而影响服务工作性能
|
|
|
|
|
|
type HTTPRequestStatManager struct {
|
2021-01-26 18:42:46 +08:00
|
|
|
|
ipChan chan string
|
|
|
|
|
|
userAgentChan chan string
|
|
|
|
|
|
firewallRuleGroupChan chan string
|
2021-01-25 16:40:31 +08:00
|
|
|
|
|
2021-12-05 18:57:30 +08:00
|
|
|
|
cityMap map[string]*StatItem // serverId@country@province@city => *StatItem ,不需要加锁,因为我们是使用channel依次执行的
|
|
|
|
|
|
providerMap map[string]int64 // serverId@provider => count
|
|
|
|
|
|
systemMap map[string]int64 // serverId@system@version => count
|
|
|
|
|
|
browserMap map[string]int64 // serverId@browser@version => count
|
2021-01-26 18:42:46 +08:00
|
|
|
|
|
|
|
|
|
|
dailyFirewallRuleGroupMap map[string]int64 // serverId@firewallRuleGroupId@action => count
|
2021-07-06 20:06:57 +08:00
|
|
|
|
|
|
|
|
|
|
totalAttackRequests int64
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// NewHTTPRequestStatManager 获取新对象
|
2021-01-25 16:40:31 +08:00
|
|
|
|
func NewHTTPRequestStatManager() *HTTPRequestStatManager {
|
|
|
|
|
|
return &HTTPRequestStatManager{
|
2021-01-26 18:42:46 +08:00
|
|
|
|
ipChan: make(chan string, 10_000), // TODO 将来可以配置容量
|
|
|
|
|
|
userAgentChan: make(chan string, 10_000), // TODO 将来可以配置容量
|
|
|
|
|
|
firewallRuleGroupChan: make(chan string, 10_000), // TODO 将来可以配置容量
|
2021-12-05 18:57:30 +08:00
|
|
|
|
cityMap: map[string]*StatItem{},
|
2021-07-05 11:36:50 +08:00
|
|
|
|
providerMap: map[string]int64{},
|
|
|
|
|
|
systemMap: map[string]int64{},
|
|
|
|
|
|
browserMap: map[string]int64{},
|
2021-01-26 18:42:46 +08:00
|
|
|
|
dailyFirewallRuleGroupMap: map[string]int64{},
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// Start 启动
|
2021-01-25 16:40:31 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) Start() {
|
2021-07-06 20:06:57 +08:00
|
|
|
|
// 上传请求总数
|
2021-12-08 15:17:45 +08:00
|
|
|
|
goman.New(func() {
|
2021-07-06 20:06:57 +08:00
|
|
|
|
ticker := time.NewTicker(1 * time.Minute)
|
2021-12-08 15:17:45 +08:00
|
|
|
|
goman.New(func() {
|
2021-07-06 20:06:57 +08:00
|
|
|
|
for range ticker.C {
|
|
|
|
|
|
if this.totalAttackRequests > 0 {
|
|
|
|
|
|
monitor.SharedValueQueue.Add(nodeconfigs.NodeValueItemAttackRequests, maps.Map{"total": this.totalAttackRequests})
|
|
|
|
|
|
this.totalAttackRequests = 0
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2021-12-08 15:17:45 +08:00
|
|
|
|
})
|
|
|
|
|
|
})
|
2021-07-06 20:06:57 +08:00
|
|
|
|
|
2021-01-25 16:40:31 +08:00
|
|
|
|
loopTicker := time.NewTicker(1 * time.Second)
|
|
|
|
|
|
uploadTicker := time.NewTicker(30 * time.Minute)
|
|
|
|
|
|
if Tea.IsTesting() {
|
2021-01-26 18:42:46 +08:00
|
|
|
|
uploadTicker = time.NewTicker(10 * time.Second) // 在测试环境下缩短Ticker时间,以方便我们调试
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
2021-01-26 18:42:46 +08:00
|
|
|
|
remotelogs.Println("HTTP_REQUEST_STAT_MANAGER", "start ...")
|
|
|
|
|
|
events.On(events.EventQuit, func() {
|
|
|
|
|
|
remotelogs.Println("HTTP_REQUEST_STAT_MANAGER", "quit")
|
|
|
|
|
|
loopTicker.Stop()
|
|
|
|
|
|
uploadTicker.Stop()
|
|
|
|
|
|
})
|
2021-01-25 16:40:31 +08:00
|
|
|
|
for range loopTicker.C {
|
|
|
|
|
|
err := this.Loop()
|
|
|
|
|
|
if err != nil {
|
2021-11-10 21:51:56 +08:00
|
|
|
|
if rpc.IsConnError(err) {
|
|
|
|
|
|
remotelogs.Warn("HTTP_REQUEST_STAT_MANAGER", err.Error())
|
|
|
|
|
|
} else {
|
|
|
|
|
|
remotelogs.Error("HTTP_REQUEST_STAT_MANAGER", err.Error())
|
|
|
|
|
|
}
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
select {
|
|
|
|
|
|
case <-uploadTicker.C:
|
2021-11-14 10:55:09 +08:00
|
|
|
|
var tr = trackers.Begin("UPLOAD_REQUEST_STATS")
|
2021-01-25 16:40:31 +08:00
|
|
|
|
err := this.Upload()
|
2021-11-14 10:55:09 +08:00
|
|
|
|
tr.End()
|
2021-01-25 16:40:31 +08:00
|
|
|
|
if err != nil {
|
2021-11-10 21:51:56 +08:00
|
|
|
|
if !rpc.IsConnError(err) {
|
|
|
|
|
|
remotelogs.Error("HTTP_REQUEST_STAT_MANAGER", "upload failed: "+err.Error())
|
|
|
|
|
|
} else {
|
|
|
|
|
|
remotelogs.Warn("HTTP_REQUEST_STAT_MANAGER", "upload failed: "+err.Error())
|
|
|
|
|
|
}
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
default:
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// AddRemoteAddr 添加客户端地址
|
2021-12-05 18:57:30 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) AddRemoteAddr(serverId int64, remoteAddr string, bytes int64, isAttack bool) {
|
2021-01-25 16:40:31 +08:00
|
|
|
|
if len(remoteAddr) == 0 {
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
if remoteAddr[0] == '[' { // 排除IPv6
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
index := strings.Index(remoteAddr, ":")
|
|
|
|
|
|
var ip string
|
|
|
|
|
|
if index < 0 {
|
|
|
|
|
|
ip = remoteAddr
|
|
|
|
|
|
} else {
|
|
|
|
|
|
ip = remoteAddr[:index]
|
|
|
|
|
|
}
|
|
|
|
|
|
if len(ip) > 0 {
|
2021-12-05 18:57:30 +08:00
|
|
|
|
var s string
|
|
|
|
|
|
if isAttack {
|
|
|
|
|
|
s = strconv.FormatInt(serverId, 10) + "@" + ip + "@" + types.String(bytes) + "@1"
|
|
|
|
|
|
} else {
|
|
|
|
|
|
s = strconv.FormatInt(serverId, 10) + "@" + ip + "@" + types.String(bytes) + "@0"
|
|
|
|
|
|
}
|
2021-01-25 16:40:31 +08:00
|
|
|
|
select {
|
2021-12-05 18:57:30 +08:00
|
|
|
|
case this.ipChan <- s:
|
2021-01-25 16:40:31 +08:00
|
|
|
|
default:
|
|
|
|
|
|
// 超出容量我们就丢弃
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// AddUserAgent 添加UserAgent
|
2021-01-25 16:40:31 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) AddUserAgent(serverId int64, userAgent string) {
|
|
|
|
|
|
if len(userAgent) == 0 {
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
select {
|
|
|
|
|
|
case this.userAgentChan <- strconv.FormatInt(serverId, 10) + "@" + userAgent:
|
|
|
|
|
|
default:
|
|
|
|
|
|
// 超出容量我们就丢弃
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// AddFirewallRuleGroupId 添加防火墙拦截动作
|
2021-07-18 15:51:49 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) AddFirewallRuleGroupId(serverId int64, firewallRuleGroupId int64, actions []*waf.ActionConfig) {
|
2021-01-26 18:42:46 +08:00
|
|
|
|
if firewallRuleGroupId <= 0 {
|
|
|
|
|
|
return
|
|
|
|
|
|
}
|
2021-07-06 20:06:57 +08:00
|
|
|
|
|
2021-07-18 15:51:49 +08:00
|
|
|
|
this.totalAttackRequests++
|
2021-07-06 20:06:57 +08:00
|
|
|
|
|
2021-07-18 15:51:49 +08:00
|
|
|
|
for _, action := range actions {
|
|
|
|
|
|
select {
|
|
|
|
|
|
case this.firewallRuleGroupChan <- strconv.FormatInt(serverId, 10) + "@" + strconv.FormatInt(firewallRuleGroupId, 10) + "@" + action.Code:
|
|
|
|
|
|
default:
|
|
|
|
|
|
// 超出容量我们就丢弃
|
|
|
|
|
|
}
|
2021-01-26 18:42:46 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// Loop 单个循环
|
2021-01-25 16:40:31 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) Loop() error {
|
|
|
|
|
|
timeout := time.NewTimer(10 * time.Minute) // 执行的最大时间
|
|
|
|
|
|
Loop:
|
|
|
|
|
|
for {
|
|
|
|
|
|
select {
|
|
|
|
|
|
case ipString := <-this.ipChan:
|
2021-12-05 18:57:30 +08:00
|
|
|
|
// serverId@ip@bytes@isAttack
|
|
|
|
|
|
pieces := strings.Split(ipString, "@")
|
|
|
|
|
|
if len(pieces) < 4 {
|
2021-01-25 16:40:31 +08:00
|
|
|
|
continue
|
|
|
|
|
|
}
|
2021-12-05 18:57:30 +08:00
|
|
|
|
serverId := pieces[0]
|
|
|
|
|
|
ip := pieces[1]
|
|
|
|
|
|
|
2021-01-25 16:40:31 +08:00
|
|
|
|
if iplibrary.SharedLibrary != nil {
|
|
|
|
|
|
result, err := iplibrary.SharedLibrary.Lookup(ip)
|
2021-08-01 09:20:07 +08:00
|
|
|
|
if err == nil && result != nil {
|
2021-12-06 08:56:02 +08:00
|
|
|
|
if len(result.Country) == 0 {
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-12-05 18:57:30 +08:00
|
|
|
|
var key = serverId + "@" + result.Country + "@" + result.Province + "@" + result.City
|
|
|
|
|
|
stat, ok := this.cityMap[key]
|
|
|
|
|
|
if !ok {
|
|
|
|
|
|
stat = &StatItem{}
|
|
|
|
|
|
this.cityMap[key] = stat
|
|
|
|
|
|
}
|
|
|
|
|
|
stat.Bytes += types.Int64(pieces[2])
|
|
|
|
|
|
stat.CountRequests++
|
|
|
|
|
|
if types.Int8(pieces[3]) == 1 {
|
|
|
|
|
|
stat.AttackBytes += types.Int64(pieces[2])
|
|
|
|
|
|
stat.CountAttackRequests++
|
|
|
|
|
|
}
|
2021-01-25 16:40:31 +08:00
|
|
|
|
|
|
|
|
|
|
if len(result.ISP) > 0 {
|
2021-11-10 21:51:56 +08:00
|
|
|
|
this.providerMap[serverId+"@"+result.ISP]++
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
case userAgentString := <-this.userAgentChan:
|
|
|
|
|
|
atIndex := strings.Index(userAgentString, "@")
|
|
|
|
|
|
if atIndex < 0 {
|
|
|
|
|
|
continue
|
|
|
|
|
|
}
|
|
|
|
|
|
serverId := userAgentString[:atIndex]
|
|
|
|
|
|
userAgent := userAgentString[atIndex+1:]
|
|
|
|
|
|
|
2022-01-01 22:02:46 +08:00
|
|
|
|
var result = sharedUserAgentParser.Parse(userAgent)
|
2022-01-01 21:47:59 +08:00
|
|
|
|
var osInfo = result.os
|
2021-01-25 16:40:31 +08:00
|
|
|
|
if len(osInfo.Name) > 0 {
|
|
|
|
|
|
dotIndex := strings.Index(osInfo.Version, ".")
|
|
|
|
|
|
if dotIndex > -1 {
|
|
|
|
|
|
osInfo.Version = osInfo.Version[:dotIndex]
|
|
|
|
|
|
}
|
|
|
|
|
|
this.systemMap[serverId+"@"+osInfo.Name+"@"+osInfo.Version]++
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-01-01 21:47:59 +08:00
|
|
|
|
var browser, browserVersion = result.browserName, result.browserVersion
|
2021-01-25 16:40:31 +08:00
|
|
|
|
if len(browser) > 0 {
|
|
|
|
|
|
dotIndex := strings.Index(browserVersion, ".")
|
|
|
|
|
|
if dotIndex > -1 {
|
|
|
|
|
|
browserVersion = browserVersion[:dotIndex]
|
|
|
|
|
|
}
|
2021-11-10 21:51:56 +08:00
|
|
|
|
this.browserMap[serverId+"@"+browser+"@"+browserVersion]++
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
2021-01-26 18:42:46 +08:00
|
|
|
|
case firewallRuleGroupString := <-this.firewallRuleGroupChan:
|
|
|
|
|
|
this.dailyFirewallRuleGroupMap[firewallRuleGroupString]++
|
2021-01-25 16:40:31 +08:00
|
|
|
|
case <-timeout.C:
|
|
|
|
|
|
break Loop
|
|
|
|
|
|
default:
|
|
|
|
|
|
break Loop
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
timeout.Stop()
|
|
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-06-23 13:14:37 +08:00
|
|
|
|
// Upload 上传数据
|
2021-01-25 16:40:31 +08:00
|
|
|
|
func (this *HTTPRequestStatManager) Upload() error {
|
|
|
|
|
|
// 上传统计数据
|
|
|
|
|
|
rpcClient, err := rpc.SharedRPC()
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
return err
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-01-26 18:42:46 +08:00
|
|
|
|
// 月份相关
|
2021-01-25 16:40:31 +08:00
|
|
|
|
pbCities := []*pb.UploadServerHTTPRequestStatRequest_RegionCity{}
|
|
|
|
|
|
pbProviders := []*pb.UploadServerHTTPRequestStatRequest_RegionProvider{}
|
|
|
|
|
|
pbSystems := []*pb.UploadServerHTTPRequestStatRequest_System{}
|
|
|
|
|
|
pbBrowsers := []*pb.UploadServerHTTPRequestStatRequest_Browser{}
|
2021-12-05 18:57:30 +08:00
|
|
|
|
for k, stat := range this.cityMap {
|
2021-01-25 16:40:31 +08:00
|
|
|
|
pieces := strings.SplitN(k, "@", 4)
|
|
|
|
|
|
pbCities = append(pbCities, &pb.UploadServerHTTPRequestStatRequest_RegionCity{
|
2021-12-05 18:57:30 +08:00
|
|
|
|
ServerId: types.Int64(pieces[0]),
|
|
|
|
|
|
CountryName: pieces[1],
|
|
|
|
|
|
ProvinceName: pieces[2],
|
|
|
|
|
|
CityName: pieces[3],
|
|
|
|
|
|
CountRequests: stat.CountRequests,
|
|
|
|
|
|
CountAttackRequests: stat.CountAttackRequests,
|
|
|
|
|
|
Bytes: stat.Bytes,
|
|
|
|
|
|
AttackBytes: stat.AttackBytes,
|
2021-01-25 16:40:31 +08:00
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
for k, count := range this.providerMap {
|
|
|
|
|
|
pieces := strings.SplitN(k, "@", 2)
|
|
|
|
|
|
pbProviders = append(pbProviders, &pb.UploadServerHTTPRequestStatRequest_RegionProvider{
|
|
|
|
|
|
ServerId: types.Int64(pieces[0]),
|
|
|
|
|
|
Name: pieces[1],
|
|
|
|
|
|
Count: count,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
for k, count := range this.systemMap {
|
|
|
|
|
|
pieces := strings.SplitN(k, "@", 3)
|
|
|
|
|
|
pbSystems = append(pbSystems, &pb.UploadServerHTTPRequestStatRequest_System{
|
|
|
|
|
|
ServerId: types.Int64(pieces[0]),
|
|
|
|
|
|
Name: pieces[1],
|
|
|
|
|
|
Version: pieces[2],
|
|
|
|
|
|
Count: count,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
for k, count := range this.browserMap {
|
|
|
|
|
|
pieces := strings.SplitN(k, "@", 3)
|
|
|
|
|
|
pbBrowsers = append(pbBrowsers, &pb.UploadServerHTTPRequestStatRequest_Browser{
|
|
|
|
|
|
ServerId: types.Int64(pieces[0]),
|
|
|
|
|
|
Name: pieces[1],
|
|
|
|
|
|
Version: pieces[2],
|
|
|
|
|
|
Count: count,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2021-01-26 18:42:46 +08:00
|
|
|
|
// 防火墙相关
|
|
|
|
|
|
pbFirewallRuleGroups := []*pb.UploadServerHTTPRequestStatRequest_HTTPFirewallRuleGroup{}
|
|
|
|
|
|
for k, count := range this.dailyFirewallRuleGroupMap {
|
|
|
|
|
|
pieces := strings.SplitN(k, "@", 3)
|
|
|
|
|
|
pbFirewallRuleGroups = append(pbFirewallRuleGroups, &pb.UploadServerHTTPRequestStatRequest_HTTPFirewallRuleGroup{
|
|
|
|
|
|
ServerId: types.Int64(pieces[0]),
|
|
|
|
|
|
HttpFirewallRuleGroupId: types.Int64(pieces[1]),
|
|
|
|
|
|
Action: pieces[2],
|
|
|
|
|
|
Count: count,
|
|
|
|
|
|
})
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2022-01-05 16:05:58 +08:00
|
|
|
|
// 重置数据
|
|
|
|
|
|
// 这里需要放到上传数据之前,防止因上传失败而导致统计数据堆积
|
|
|
|
|
|
this.cityMap = map[string]*StatItem{}
|
|
|
|
|
|
this.providerMap = map[string]int64{}
|
|
|
|
|
|
this.systemMap = map[string]int64{}
|
|
|
|
|
|
this.browserMap = map[string]int64{}
|
|
|
|
|
|
this.dailyFirewallRuleGroupMap = map[string]int64{}
|
|
|
|
|
|
|
|
|
|
|
|
// 上传数据
|
2021-01-25 16:40:31 +08:00
|
|
|
|
_, err = rpcClient.ServerRPC().UploadServerHTTPRequestStat(rpcClient.Context(), &pb.UploadServerHTTPRequestStatRequest{
|
2021-01-26 18:42:46 +08:00
|
|
|
|
Month: timeutil.Format("Ym"),
|
|
|
|
|
|
Day: timeutil.Format("Ymd"),
|
|
|
|
|
|
RegionCities: pbCities,
|
|
|
|
|
|
RegionProviders: pbProviders,
|
|
|
|
|
|
Systems: pbSystems,
|
|
|
|
|
|
Browsers: pbBrowsers,
|
|
|
|
|
|
HttpFirewallRuleGroups: pbFirewallRuleGroups,
|
2021-01-25 16:40:31 +08:00
|
|
|
|
})
|
|
|
|
|
|
if err != nil {
|
2022-01-05 16:05:58 +08:00
|
|
|
|
// 是否包含了invalid UTF-8
|
|
|
|
|
|
if strings.Contains(err.Error(), "string field contains invalid UTF-8") {
|
|
|
|
|
|
for _, system := range pbSystems {
|
|
|
|
|
|
system.Name = utils.ToValidUTF8string(system.Name)
|
|
|
|
|
|
}
|
|
|
|
|
|
for _, browser := range pbBrowsers {
|
|
|
|
|
|
browser.Name = utils.ToValidUTF8string(browser.Name)
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 再次尝试
|
|
|
|
|
|
_, err = rpcClient.ServerRPC().UploadServerHTTPRequestStat(rpcClient.Context(), &pb.UploadServerHTTPRequestStatRequest{
|
|
|
|
|
|
Month: timeutil.Format("Ym"),
|
|
|
|
|
|
Day: timeutil.Format("Ymd"),
|
|
|
|
|
|
RegionCities: pbCities,
|
|
|
|
|
|
RegionProviders: pbProviders,
|
|
|
|
|
|
Systems: pbSystems,
|
|
|
|
|
|
Browsers: pbBrowsers,
|
|
|
|
|
|
HttpFirewallRuleGroups: pbFirewallRuleGroups,
|
|
|
|
|
|
})
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
return err
|
|
|
|
|
|
}
|
|
|
|
|
|
}
|
2021-01-25 16:40:31 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return nil
|
|
|
|
|
|
}
|