Compare commits

...

4 Commits

Author Message Date
bryanqiu
98eac47127 add AlreadyHaveResult function 2024-02-04 15:34:07 +08:00
bryanqiu
69b0fb05aa add AlreadyHaveResult function 2024-02-04 15:29:11 +08:00
bryanqiu
ba9357e166 add GET 2023-11-24 11:41:57 +08:00
bryanqiu
9df516247c export metricRegistry 2023-05-30 10:46:56 +08:00
4 changed files with 21 additions and 8 deletions

6
api.go
View File

@ -54,6 +54,12 @@ func (e *Engine) POST(uri string, handler Handler) {
e.Engine.POST(uri, h) e.Engine.POST(uri, h)
} }
func (e *Engine) GET(uri string, handler Handler) {
h := handlerWrapper(handler)
log.Infof("api handler [%v] registor success", handler)
e.Engine.GET(uri, h)
}
// handlerWrapper // handlerWrapper
func handlerWrapper(handler Handler) gin.HandlerFunc { func handlerWrapper(handler Handler) gin.HandlerFunc {
handlerFunc := handler.HandlerFunc() handlerFunc := handler.HandlerFunc()

View File

@ -120,7 +120,14 @@ func (c *Context) SetCookie(cookie *http.Cookie) {
http.SetCookie(c.Writer, cookie) http.SetCookie(c.Writer, cookie)
} }
func (c *Context) AlreadyHaveResult() (done bool, entry string) {
return c.resultentry != "", c.resultentry
}
func (c *Context) RESULT(output interface{}) error { func (c *Context) RESULT(output interface{}) error {
if c.resultentry == "" {
c.resultentry = "RESULT"
}
var t = reflect.TypeOf(output) var t = reflect.TypeOf(output)
defer func(o *interface{}) { defer func(o *interface{}) {
b, err := json.Marshal(o) b, err := json.Marshal(o)
@ -149,7 +156,6 @@ func (c *Context) RESULT(output interface{}) error {
cost := time.Now().Sub(c.starttime).Milliseconds() cost := time.Now().Sub(c.starttime).Milliseconds()
noticeStr := fmt.Sprintf("cost: %dms, output: '%s'", cost, string(b)) noticeStr := fmt.Sprintf("cost: %dms, output: '%s'", cost, string(b))
log.NoticefWithDepth(calldepth, noticeStr) log.NoticefWithDepth(calldepth, noticeStr)
}(&output) }(&output)
if _, ok := t.FieldByName("ErrCode"); !ok { if _, ok := t.FieldByName("ErrCode"); !ok {

View File

@ -15,7 +15,7 @@ import (
var ( var (
MetricExporterPusher = func() error { return nil } MetricExporterPusher = func() error { return nil }
MetricExporterHandler Handler = nil MetricExporterHandler Handler = nil
metricRegistry *prometheus.Registry = nil MetricRegistry *prometheus.Registry = nil
metricApiCounter *prometheus.CounterVec = nil metricApiCounter *prometheus.CounterVec = nil
metricApiSummary *prometheus.SummaryVec = nil metricApiSummary *prometheus.SummaryVec = nil
instance string = "--unknown--" instance string = "--unknown--"
@ -68,9 +68,9 @@ func InitMetrics(instanceValue string) {
[]string{"api", "errcode", "appid"}, []string{"api", "errcode", "appid"},
) )
metricRegistry = prometheus.NewRegistry() MetricRegistry = prometheus.NewRegistry()
metricRegistry.MustRegister(metricApiCounter) MetricRegistry.MustRegister(metricApiCounter)
metricRegistry.MustRegister(metricApiSummary) MetricRegistry.MustRegister(metricApiSummary)
} }
func SetupMetricsExporterHandler(apiname string) { func SetupMetricsExporterHandler(apiname string) {
@ -78,10 +78,10 @@ func SetupMetricsExporterHandler(apiname string) {
apiname = "premetheus_metrics_exporter" apiname = "premetheus_metrics_exporter"
} }
opt := promhttp.HandlerOpts{Registry: metricRegistry} opt := promhttp.HandlerOpts{Registry: MetricRegistry}
MetricExporterHandler = &metricExporterHandler{ MetricExporterHandler = &metricExporterHandler{
name: apiname, name: apiname,
promhttpHandler: promhttp.HandlerFor(metricRegistry, opt), promhttpHandler: promhttp.HandlerFor(MetricRegistry, opt),
} }
} }
@ -93,7 +93,7 @@ func SetupMetricsExporterPusher(pushgateway string, jobname string) {
var pusher = push. var pusher = push.
New(pushgateway, jobname). New(pushgateway, jobname).
Grouping("instance", instance). Grouping("instance", instance).
Gatherer(metricRegistry) Gatherer(MetricRegistry)
MetricExporterPusher = func() error { MetricExporterPusher = func() error {
RecordMetrics("push_metrics_to_prometheus", "0", "selfmonitoring", 1.0) RecordMetrics("push_metrics_to_prometheus", "0", "selfmonitoring", 1.0)

View File

@ -47,6 +47,7 @@ type Handler interface {
type HandlerFunc func(*Context) error type HandlerFunc func(*Context) error
type IRoutes interface { type IRoutes interface {
GET(uri string, handler Handler)
POST(uri string, handler Handler) POST(uri string, handler Handler)
} }