diff --git a/go.mod b/go.mod index 884e2d9..31b03f3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.24.2 toolchain go1.24.4 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250715125819-e735f78e58c6 + cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 github.com/beego/beego/v2 v2.3.8 github.com/golang-jwt/jwt/v5 v5.2.2 github.com/gorilla/websocket v1.5.3 diff --git a/go.sum b/go.sum index 00703d9..a0c5b43 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20250715125819-e735f78e58c6 h1:Gnkv59Ntl2RebC5tNauXuxyRXLfZ2XAJ0+ujMyFte5U= cloud.o-forge.io/core/oc-lib v0.0.0-20250715125819-e735f78e58c6/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= +cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7 h1:NRFGRqN+j5g3DrtXMYN5T5XSYICG+OU2DisjBdID3j8= +cloud.o-forge.io/core/oc-lib v0.0.0-20260129122033-186ba3e689c7/go.mod h1:vHWauJsS6ryf7UDqq8hRXoYD5RsONxcFTxeZPOztEuI= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.8 h1:wplhB1pF4TxR+2SS4PUej8eDoH4xGfxuHfS7wAk9VBc= github.com/beego/beego/v2 v2.3.8/go.mod h1:8vl9+RrXqvodrl9C8yivX1e6le6deCK6RWeq8R7gTTg= diff --git a/infrastructure/prometheus.go b/infrastructure/prometheus.go index 9af2c33..8a21c28 100644 --- a/infrastructure/prometheus.go +++ b/infrastructure/prometheus.go @@ -83,6 +83,7 @@ func (p *PrometheusService) queryPrometheus(promURL string, expr string, namespa } func (p *PrometheusService) Call(book *booking.Booking, user string, peerID string, groups []string) (*booking.Booking, map[string]models.MetricsSnapshot) { + logger := oclib.GetLogger() var wg sync.WaitGroup metrics := map[string]models.MetricsSnapshot{} @@ -93,7 +94,7 @@ func (p *PrometheusService) Call(book *booking.Booking, user string, peerID stri rr := cRAccess.LoadOne(book.ResourceID) if rr.Err != "" { - fmt.Errorf("can't proceed because of unfound resource %s : %s", book.ResourceID, rr.Err) + logger.Err(fmt.Errorf("can't proceed because of unfound resource %s : %s", book.ResourceID, rr.Err)) return book, metrics } computeRes := rr.ToComputeResource() @@ -132,14 +133,14 @@ var LockKill = &sync.Mutex{} // TODO kill procedure func (p *PrometheusService) Stream(bookingID string, interval time.Duration, user string, peerID string, groups []string, websocket *websocket.Conn) { - + logger := oclib.GetLogger() max := 100 bookIDS := []string{} mets := map[string][]models.MetricsSnapshot{} bAccess := oclib.NewRequest(oclib.LibDataEnum(oclib.BOOKING), user, peerID, groups, nil) book := bAccess.LoadOne(bookingID) if book.Err != "" { - fmt.Errorf("stop because of empty : %s", book.Err) + logger.Err(fmt.Errorf("stop because of empty : %s", book.Err)) } f := func(e *booking.Booking) bool { if e.ExpectedEndDate == nil {