Skip to content

Commit 24bb11c

Browse files
committed
remove metrics
Signed-off-by: Patrick Zhao <zhaoyu@koderover.com>
1 parent 648ed49 commit 24bb11c

File tree

3 files changed

+0
-330
lines changed

3 files changed

+0
-330
lines changed

pkg/microservice/aslan/server/rest/router.go

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ package rest
1818

1919
import (
2020
"github.com/gin-gonic/gin"
21-
"github.com/prometheus/client_golang/prometheus"
22-
"github.com/prometheus/client_golang/prometheus/promhttp"
2321
swaggerfiles "github.com/swaggo/files"
2422
ginswagger "github.com/swaggo/gin-swagger"
2523

@@ -29,13 +27,11 @@ import (
2927
codehosthandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/code/handler"
3028
collaborationhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/collaboration/handler"
3129
commonhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/handler"
32-
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/service/workflowcontroller"
3330
cronhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/cron/handler"
3431
deliveryhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/delivery/handler"
3532
environmenthandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/environment/handler"
3633
loghandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/log/handler"
3734
multiclusterhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/multicluster/handler"
38-
clusterservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/multicluster/service"
3935
pluginhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/plugin/handler"
4036
projecthandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/project/handler"
4137
releaseplanhandler "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/release_plan/handler"
@@ -56,29 +52,10 @@ import (
5652
connectorHandler "github.com/koderover/zadig/v2/pkg/microservice/systemconfig/core/connector/handler"
5753
emailHandler "github.com/koderover/zadig/v2/pkg/microservice/systemconfig/core/email/handler"
5854
featuresHandler "github.com/koderover/zadig/v2/pkg/microservice/systemconfig/core/features/handler"
59-
"github.com/koderover/zadig/v2/pkg/tool/metrics"
6055
// Note: have to load docs for swagger to work. See https://blog.csdn.net/weixin_43249914/article/details/103035711
6156
// _ "github.com/koderover/zadig/v2/pkg/microservice/aslan/server/rest/doc"
6257
)
6358

64-
func init() {
65-
// initialization for prometheus metrics
66-
metrics.Metrics = prometheus.NewRegistry()
67-
68-
metrics.Metrics.MustRegister(metrics.RunningWorkflows)
69-
metrics.Metrics.MustRegister(metrics.PendingWorkflows)
70-
metrics.Metrics.MustRegister(metrics.RequestTotal)
71-
metrics.Metrics.MustRegister(metrics.CPU)
72-
metrics.Metrics.MustRegister(metrics.Memory)
73-
metrics.Metrics.MustRegister(metrics.CPUPercentage)
74-
metrics.Metrics.MustRegister(metrics.MemoryPercentage)
75-
metrics.Metrics.MustRegister(metrics.Healthy)
76-
metrics.Metrics.MustRegister(metrics.Cluster)
77-
metrics.Metrics.MustRegister(metrics.ResponseTime)
78-
79-
metrics.UpdatePodMetrics()
80-
}
81-
8259
// @title Zadig aslan service REST APIs
8360
// @version 1.0
8461
// @description The API doc is targeting for Zadig developers rather than Zadig users.
@@ -188,26 +165,6 @@ func (s *engine) injectRouterGroup(router *gin.RouterGroup) {
188165
}
189166

190167
router.GET("/api/apidocs/*any", ginswagger.WrapHandler(swaggerfiles.Handler))
191-
192-
// prometheus metrics API
193-
handlefunc := func(c *gin.Context) {
194-
metrics.UpdatePodMetrics()
195-
196-
runningCustomQueue := workflowcontroller.RunningTasks()
197-
pendingCustomQueue := workflowcontroller.PendingTasks()
198-
199-
metrics.SetRunningWorkflows(int64(len(runningCustomQueue)))
200-
metrics.SetPendingWorkflows(int64(len(pendingCustomQueue)))
201-
202-
metrics.Cluster.Reset()
203-
clusterStatusMap := clusterservice.GetClusterStatus()
204-
for clusterName, status := range clusterStatusMap {
205-
metrics.SetClusterStatus(clusterName, status)
206-
}
207-
208-
promhttp.HandlerFor(metrics.Metrics, promhttp.HandlerOpts{}).ServeHTTP(c.Writer, c.Request)
209-
}
210-
router.GET("/api/metrics", handlefunc)
211168
}
212169

213170
type injector interface {

pkg/middleware/gin/request_metrics.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

pkg/tool/metrics/prometheus.go

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)