diff --git a/local/omc.yaml b/local/omc.yaml index 2b8521f3..19f3e4e5 100644 --- a/local/omc.yaml +++ b/local/omc.yaml @@ -81,10 +81,10 @@ logger: duration: 24 count: 90 -# pprof grafana Performance Monitor -pprof: - enabled: true - addr: "0.0.0.0:33060" +# prometheus metrics +metrics: true +# pprof go +pprofAddr: "0.0.0.0:33060" # 静态文件配置, 相对项目根路径或填绝对路径 staticFile: diff --git a/main.go b/main.go index a4dfcd0d..f4f6fca4 100644 --- a/main.go +++ b/main.go @@ -201,19 +201,20 @@ func loadGlobalPre(app *gin.Engine) { app.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) } - //性能分析监控 Prometheus - pprofEnabled := config.Get("pprof.enabled") - if parse.Boolean(pprofEnabled) { + // Prometheus metrics + metricsEnabled := config.Get("metrics") + if parse.Boolean(metricsEnabled) { // Grafana Monitor 1 m := ginmetrics.GetMonitor() m.UseWithoutExposingEndpoint(app) // Grafana Monitor 2 app.Use(ginprom.PromMiddleware(nil)) app.GET("/metrics", ginprom.PromHandler(promhttp.Handler())) - + } + // 启用 pprof HTTP服务 + pprofAddr := fmt.Sprint(config.Get("pprofAddr")) + if pprofAddr != "" && pprofAddr != "" { wg.Add(1) - // 启用pprof HTTP服务 - pprofAddr := config.Get("pprof.addr").(string) go func(addr string) { defer wg.Done() fmt.Println(http.ListenAndServe(addr, nil))