danial/kami_backend
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(integration): 更新 Camel Oil API 请求地址和日志手机号显示

Browse Source 
- 将所有请求地址由 recharge3.bac365.com 替换为 app.bac365.com
- 修改日志中手机号显示，移除部分掩码，直接展示完整手机号
- 保持发送验证码、登录及查询接口的请求地址一致性
- 更新错误日志和响应日志中手机号的显示格式

perf(otel): 配置 OpenTelemetry gRPC 最大消息大小限制

- 为 trace exporter 添加 gRPC 最大接收和发送消息大小限制（100MB）
- 为 log exporter 添加相同的 gRPC 消息大小限制配置
- 确保大数据量的采样和日志传输过程中不被消息大小限制阻断
This commit is contained in:
danial
2025-12-06 21:58:09 +08:00
parent 8c84aeabf1
commit d3da03990b
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -34,6 +34,7 @@ require (
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
golang.org/x/image v0.32.0 golang.org/x/image v0.32.0
golang.org/x/net v0.46.0 golang.org/x/net v0.46.0
google.golang.org/grpc v1.76.0
) )
require ( require (
@@ -98,7 +99,6 @@ require (
golang.org/x/text v0.30.0 // indirect golang.org/x/text v0.30.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
google.golang.org/grpc v1.76.0 // indirect
google.golang.org/protobuf v1.36.10 // indirect google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect
) )

28
utility/integration/camel_oil_api/api.go
View File

@@ -34,7 +34,7 @@ func NewClient() *Client {
"accept-language": "zh-CN,zh-Hans;q=0.9", "accept-language": "zh-CN,zh-Hans;q=0.9",
"channel": "app", "channel": "app",
"Content-Type": "application/json", "Content-Type": "application/json",
"host": "recharge3.bac365.com", "host": "app.bac365.com",
"User-Agent": "Mozilla/5.0 (iPad; CPU OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app", "User-Agent": "Mozilla/5.0 (iPad; CPU OS 18_7 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 Html5Plus/1.0 (Immersed/20) uni-app",
}) })
return &Client{ return &Client{
@@ -44,8 +44,8 @@ func NewClient() *Client {
func (c *Client) SendCaptcha(ctx context.Context, phone string) (bool, error) { func (c *Client) SendCaptcha(ctx context.Context, phone string) (bool, error) {
// 记录请求开始 // 记录请求开始
glog.Infof(ctx, "开始发送验证码 - 手机号: %s***%s", phone[:3], phone[len(phone)-4:]) glog.Infof(ctx, "开始发送验证码 - 手机号: %s", phone)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求开始 - 手机号: %s***%s, 渠道: app", phone[:3], phone[len(phone)-4:])) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求开始 - 手机号: %s, 渠道: app", phone))
req := struct { req := struct {
Phone string `json:"phone"` Phone string `json:"phone"`
@@ -60,16 +60,16 @@ func (c *Client) SendCaptcha(ctx context.Context, phone string) (bool, error) {
glog.Infof(ctx, "发送验证码请求数据: %s", string(reqData)) glog.Infof(ctx, "发送验证码请求数据: %s", string(reqData))
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求数据 - URL: https://recharge3.bac365.com/camel_wechat_mini_oil_server/sendVerifyMessage, 数据: %s", string(reqData))) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求数据 - URL: https://recharge3.bac365.com/camel_wechat_mini_oil_server/sendVerifyMessage, 数据: %s", string(reqData)))
resp, err := c.Client.ContentJson().Post(ctx, "https://recharge3.bac365.com/camel_wechat_mini_oil_server/sendVerifyMessage", req) resp, err := c.Client.ContentJson().Post(ctx, "https://app.bac365.com/camel_wechat_mini_oil_server/sendVerifyMessage", req)
if err != nil { if err != nil {
glog.Errorf(ctx, "发送验证码请求失败，手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err) glog.Errorf(ctx, "发送验证码请求失败，手机号: %s, 错误: %v", phone, err)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求失败 - 手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码请求失败 - 手机号: %s, 错误: %v", phone, err))
return false, err return false, err
} }
respStr := resp.ReadAllString() respStr := resp.ReadAllString()
glog.Info(ctx, "发送验证码响应数据:", respStr) glog.Info(ctx, "发送验证码响应数据:", respStr)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码响应数据 - 手机号: %s***%s, 响应: %s", phone[:3], phone[len(phone)-4:], respStr)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码响应数据 - 手机号: %s, 响应: %s", phone, respStr))
respStruct := struct { respStruct := struct {
Code string `json:"code"` Code string `json:"code"`
@@ -78,17 +78,17 @@ func (c *Client) SendCaptcha(ctx context.Context, phone string) (bool, error) {
err = json.Unmarshal([]byte(respStr), &respStruct) err = json.Unmarshal([]byte(respStr), &respStruct)
if err != nil { if err != nil {
glog.Errorf(ctx, "解析发送验证码响应失败，手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err) glog.Errorf(ctx, "解析发送验证码响应失败，手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("解析发送验证码响应失败 - 手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("解析发送验证码响应失败 - 手机号: %s, 错误: %v", phone, err))
return false, err return false, err
} }
success := respStruct.Code == "success" success := respStruct.Code == "success"
if success { if success {
glog.Infof(ctx, "发送验证码成功，手机号: %s***%s", phone[:3], phone[len(phone)-4:]) glog.Infof(ctx, "发送验证码成功，手机号: %s***%s", phone[:3], phone[len(phone)-4:])
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码成功 - 手机号: %s***%s, 响应消息: %s", phone[:3], phone[len(phone)-4:], respStruct.Message)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码成功 - 手机号: %s, 响应消息: %s", phone, respStruct.Message))
} else { } else {
glog.Warningf(ctx, "发送验证码失败，手机号: %s***%s, 错误码: %s, 消息: %s", phone[:3], phone[len(phone)-4:], respStruct.Code, respStruct.Message) glog.Warningf(ctx, "发送验证码失败，手机号: %s***%s, 错误码: %s, 消息: %s", phone[:3], phone[len(phone)-4:], respStruct.Code, respStruct.Message)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码失败 - 手机号: %s***%s, 错误码: %s, 消息: %s", phone[:3], phone[len(phone)-4:], respStruct.Code, respStruct.Message)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("发送验证码失败 - 手机号: %s, 错误码: %s, 消息: %s", phone, respStruct.Code, respStruct.Message))
} }
return success, err return success, err
@@ -156,9 +156,9 @@ func (c *Client) LoginWithCaptcha(ctx context.Context, phone string, code string
// 记录请求数据 // 记录请求数据
reqData, _ := json.Marshal(req) reqData, _ := json.Marshal(req)
glog.Infof(ctx, "登录请求数据: %s", string(reqData)) glog.Infof(ctx, "登录请求数据: %s", string(reqData))
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("登录请求数据 - URL: https://recharge3.bac365.com/camel_wechat_mini_oil_server/loginApp, 数据: %s", string(reqData))) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("登录请求数据 - URL: https://app.bac365.com/camel_wechat_mini_oil_server/loginApp, 数据: %s", string(reqData)))
resp, err := c.Client.ContentJson().Post(ctx, "https://recharge3.bac365.com/camel_wechat_mini_oil_server/loginApp", req) resp, err := c.Client.ContentJson().Post(ctx, "https://app.bac365.com/camel_wechat_mini_oil_server/loginApp", req)
if err != nil { if err != nil {
glog.Errorf(ctx, "登录请求失败，手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err) glog.Errorf(ctx, "登录请求失败，手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err)
service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("登录请求失败 - 手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err)) service.CamelOil().SavePrefetchOrderLog(ctx, fmt.Sprintf("登录请求失败 - 手机号: %s***%s, 错误: %v", phone[:3], phone[len(phone)-4:], err))
@@ -229,7 +229,7 @@ func (c *Client) getAuth(ctx context.Context, auth string) string {
// QueryCamelOilCardAvailableDenominations 查询所有可用面额 // QueryCamelOilCardAvailableDenominations 查询所有可用面额
func (c *Client) QueryCamelOilCardAvailableDenominations(ctx context.Context, token string) ([]Good, error) { func (c *Client) QueryCamelOilCardAvailableDenominations(ctx context.Context, token string) ([]Good, error) {
c.Client.SetHeader("authorization", "Bearer "+c.getAuth(ctx, token)) c.Client.SetHeader("authorization", "Bearer "+c.getAuth(ctx, token))
resp, err := c.Client.ContentJson().Post(ctx, "https://recharge3.bac365.com/camel_wechat_mini_oil_server/eCardMall/wechatCardGoods", struct { resp, err := c.Client.ContentJson().Post(ctx, "https://app.bac365.com/camel_wechat_mini_oil_server/eCardMall/wechatCardGoods", struct {
Channel string `json:"channel"` Channel string `json:"channel"`
}{ }{
Channel: "app", Channel: "app",
@@ -379,7 +379,7 @@ func (c *Client) CreateCamelOilOrder(ctx context.Context, phone, token string, a
// glog.Info(ctx, "代理 ip", proxy.String()) // glog.Info(ctx, "代理 ip", proxy.String())
// c.Client.SetProxy(proxy.String()) // c.Client.SetProxy(proxy.String())
//} //}
resp, err1 := c.Client.Post(ctx, "https://recharge3.bac365.com/camel_wechat_mini_oil_server/eCardMall/wechatCardOrder", req) resp, err1 := c.Client.Post(ctx, "https://app.bac365.com/camel_wechat_mini_oil_server/eCardMall/wechatCardOrder", req)
if err1 != nil { if err1 != nil {
resultMutex.Lock() resultMutex.Lock()
if !completed.Load() && resultError == nil { if !completed.Load() && resultError == nil {

15
utility/otel/manager.go
View File

@@ -20,6 +20,7 @@ import (
"go.opentelemetry.io/otel/sdk/trace" "go.opentelemetry.io/otel/sdk/trace"
semconv "go.opentelemetry.io/otel/semconv/v1.26.0" semconv "go.opentelemetry.io/otel/semconv/v1.26.0"
oteltrace "go.opentelemetry.io/otel/trace" oteltrace "go.opentelemetry.io/otel/trace"
"google.golang.org/grpc"
) )
const ( const (
@@ -110,11 +111,18 @@ func (m *Manager) initTracing() error {
var traceExp *otlptrace.Exporter var traceExp *otlptrace.Exporter
var err error var err error
// 配置gRPC消息大小限制
dialOpts := []grpc.DialOption{
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(100 * 1024 * 1024)), // 100MB
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(100 * 1024 * 1024)), // 100MB
}
opts := []otlptracegrpc.Option{ opts := []otlptracegrpc.Option{
otlptracegrpc.WithCompressor(m.config.Compressor), otlptracegrpc.WithCompressor(m.config.Compressor),
otlptracegrpc.WithEndpoint(m.config.CollectorURL), otlptracegrpc.WithEndpoint(m.config.CollectorURL),
otlptracegrpc.WithHeaders(m.config.Headers), otlptracegrpc.WithHeaders(m.config.Headers),
otlptracegrpc.WithTimeout(m.config.Timeout), otlptracegrpc.WithTimeout(m.config.Timeout),
otlptracegrpc.WithDialOption(dialOpts...),
} }
// 配置重试策略 // 配置重试策略
@@ -163,11 +171,18 @@ func (m *Manager) initLogging() error {
var logExp *otlploggrpc.Exporter var logExp *otlploggrpc.Exporter
var err error var err error
// 配置gRPC消息大小限制（与trace exporter保持一致）
logDialOpts := []grpc.DialOption{
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(100 * 1024 * 1024)), // 100MB
grpc.WithDefaultCallOptions(grpc.MaxCallSendMsgSize(100 * 1024 * 1024)), // 100MB
}
opts := []otlploggrpc.Option{ opts := []otlploggrpc.Option{
otlploggrpc.WithCompressor(m.config.Compressor), otlploggrpc.WithCompressor(m.config.Compressor),
otlploggrpc.WithEndpoint(m.config.CollectorURL), otlploggrpc.WithEndpoint(m.config.CollectorURL),
otlploggrpc.WithHeaders(m.config.Headers), otlploggrpc.WithHeaders(m.config.Headers),
otlploggrpc.WithTimeout(m.config.Timeout), otlploggrpc.WithTimeout(m.config.Timeout),
otlploggrpc.WithDialOption(logDialOpts...),
} }
// 配置重试策略 // 配置重试策略