From c5d43e87fe89c7beebf202e646be436996b6696d Mon Sep 17 00:00:00 2001
From: Anker Jam <jianzhiyao020@qq.com>
Date: Sun, 4 Oct 2020 22:16:19 +0800
Subject: [PATCH] seperate orm alone

---
 pkg/client/orm/filter/prometheus/filter.go    | 22 ++++++++-----------
 .../orm/filter/prometheus/filter_test.go      | 13 ++++++-----
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/pkg/client/orm/filter/prometheus/filter.go b/pkg/client/orm/filter/prometheus/filter.go
index 175b26be..2d819ef7 100644
--- a/pkg/client/orm/filter/prometheus/filter.go
+++ b/pkg/client/orm/filter/prometheus/filter.go
@@ -23,7 +23,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/astaxie/beego/pkg/client/orm"
-	"github.com/astaxie/beego/pkg/server/web"
 )
 
 // FilterChainBuilder is an extension point,
@@ -35,27 +34,24 @@ import (
 // actually we only records metrics of invoking "QueryTable" and "QueryTableWithCtx"
 type FilterChainBuilder struct {
 	summaryVec prometheus.ObserverVec
+	AppName    string
+	ServerName string
+	RunMode    string
 }
 
-func NewFilterChainBuilder() *FilterChainBuilder {
-	summaryVec := prometheus.NewSummaryVec(prometheus.SummaryOpts{
+func (builder *FilterChainBuilder) FilterChain(next orm.Filter) orm.Filter {
+
+	builder.summaryVec = prometheus.NewSummaryVec(prometheus.SummaryOpts{
 		Name:      "beego",
 		Subsystem: "orm_operation",
 		ConstLabels: map[string]string{
-			"server":  web.BConfig.ServerName,
-			"env":     web.BConfig.RunMode,
-			"appname": web.BConfig.AppName,
+			"server":  builder.ServerName,
+			"env":     builder.RunMode,
+			"appname": builder.AppName,
 		},
 		Help: "The statics info for orm operation",
 	}, []string{"method", "name", "duration", "insideTx", "txName"})
 
-	prometheus.MustRegister(summaryVec)
-	return &FilterChainBuilder{
-		summaryVec: summaryVec,
-	}
-}
-
-func (builder *FilterChainBuilder) FilterChain(next orm.Filter) orm.Filter {
 	return func(ctx context.Context, inv *orm.Invocation) []interface{} {
 		startTime := time.Now()
 		res := next(ctx, inv)
diff --git a/pkg/client/orm/filter/prometheus/filter_test.go b/pkg/client/orm/filter/prometheus/filter_test.go
index 1b55b989..0368d321 100644
--- a/pkg/client/orm/filter/prometheus/filter_test.go
+++ b/pkg/client/orm/filter/prometheus/filter_test.go
@@ -24,14 +24,15 @@ import (
 	"github.com/astaxie/beego/pkg/client/orm"
 )
 
-func TestFilterChainBuilder_FilterChain(t *testing.T) {
-	builder := NewFilterChainBuilder()
-	assert.NotNil(t, builder.summaryVec)
-
-	filter := builder.FilterChain(func(ctx context.Context, inv *orm.Invocation) []interface{} {
+func TestFilterChainBuilder_FilterChain1(t *testing.T) {
+	next := func(ctx context.Context, inv *orm.Invocation) []interface{} {
 		inv.Method = "coming"
 		return []interface{}{}
-	})
+	}
+	builder := &FilterChainBuilder{}
+	filter := builder.FilterChain(next)
+
+	assert.NotNil(t, builder.summaryVec)
 	assert.NotNil(t, filter)
 
 	inv := &orm.Invocation{}
-- 
GitLab