fix(otel): 修正otel环境变量名称和初始化配置

- 将docker-compose中多个服务的serverName环境变量替换为OTEL_SERVICE_NAME
- 将OTEL_COLLECTOR_URL环境变量替换为OTEL_EXPORTER_ENDPOINT以统一命名
- main.go中移除未使用依赖,简化变量声明
- otel配置从环境变量获取OTEL_EXPORTER_ENDPOINT,默认地址保持不变
- otel配置赋值时去除不必要的String转换保持类型一致性
This commit is contained in:
danial
2025-12-14 23:27:37 +08:00
parent 9a5ef23f34
commit cb2bba17f6
2 changed files with 12 additions and 14 deletions

View File

@@ -27,7 +27,7 @@ services:
container_name: kami-merchant-$BRANCH-$VERSION
restart: always
environment:
serverName: $SERVER_NAME
serverName: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
portalAddr: $portalAddr
@@ -48,7 +48,7 @@ services:
container_name: kami-backend-$BRANCH-$VERSION
restart: always
environment:
OTEL_COLLECTOR_URL: $OTEL_COLLECTOR_URL
OTEL_EXPORTER_ENDPOINT: $OTEL_EXPORTER_ENDPOINT
OTEL_SERVICE_NAME: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
@@ -70,7 +70,7 @@ services:
container_name: kami-shop-$BRANCH-$VERSION
restart: always
environment:
serverName: $SERVER_NAME
serverName: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
portalAddr: $portalAddr
@@ -91,8 +91,8 @@ services:
container_name: kami-gateway-$BRANCH-$VERSION
restart: always
environment:
OTEL_COLLECTOR_URL: $OTEL_COLLECTOR_URL
OTEL_SERVICE_NAME: $SERVER_NAME
OTEL_EXPORTER_ENDPOINT: $OTEL_EXPORTER_ENDPOINT
OTEL_SERVICE_NAME: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
portalAddr: $portalAddr
@@ -113,7 +113,7 @@ services:
container_name: kami-boss-$BRANCH-$VERSION
restart: always
environment:
serverName: $SERVER_NAME
serverName: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
portalAddr: $portalAddr
@@ -134,7 +134,7 @@ services:
container_name: kami-frontend-$BRANCH-$VERSION
restart: always
environment:
serverName: $SERVER_NAME
serverName: $OTEL_SERVICE_NAME
gatewayAddr: $gatewayAddr
shopAddr: $shopAddr
portalAddr: $portalAddr

12
main.go
View File

@@ -1,7 +1,6 @@
package main
import (
"github.com/duke-git/lancet/v2/pointer"
_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
_ "github.com/gogf/gf/contrib/nosql/redis/v2"
"github.com/gogf/gf/v2/os/gctx"
@@ -18,8 +17,7 @@ import (
)
var (
serviceName = "后台服务"
collectorURL = "38.38.251.113:31547"
serviceName = "后台服务"
)
func main() {
@@ -30,15 +28,15 @@ func main() {
}
// 从环境变量获取OTEL收集器地址如果不存在则使用默认值
collectorURL := genv.Get("OTEL_COLLECTOR_URL")
if collectorURL.IsNil() {
collectorURL = genv.New("38.38.251.113:31547")
collectorURL := genv.Get("OTEL_EXPORTER_ENDPOINT").String()
if collectorURL == "" {
collectorURL = "38.38.251.113:31547"
}
// 初始化OpenTelemetry系统简化版与GoFrame集成
config := otel.DefaultConfig()
config.ServiceName = serviceName
config.CollectorURL = collectorURL.String()
config.CollectorURL = collectorURL
config.Insecure = true // 根据实际环境调整
//config.Headers = map[string]string{
// "x-service-token": "your-token-here", // 如果需要认证token