lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-10 09:11:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor metric function to be separated in terms of lock

Browse Source
This commit is contained in:
gx578007 2023-03-09 11:26:02 +08:00
parent 5988567d09
commit 045c8de2a6
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/strategy/grid2/strategy.go
View File

@ -960,16 +960,14 @@ func (s *Strategy) newGrid() *Grid {
func (s *Strategy) openGrid(ctx context.Context, session *bbgo.ExchangeSession) error {
// grid object guard
s.mu.Lock()
defer func() {
s.mu.Unlock()
s.updateGridNumOfOrdersMetricsWithLock()
}()
defer s.mu.Unlock()
if s.grid != nil {
return nil
}
s.grid = s.newGrid()
grid := s.newGrid()
s.grid = grid
s.logger.Info("OPENING GRID: ", s.grid.String())
lastPrice, err := s.getLastTradePrice(ctx, session)
@ -1080,6 +1078,7 @@ func (s *Strategy) openGrid(ctx context.Context, session *bbgo.ExchangeSession)
s.logger.Infof("ALL GRID ORDERS SUBMITTED")
s.updateGridNumOfOrdersMetrics(grid)
s.updateOpenOrderPricesMetrics(createdOrders)
return nil
}
@ -1091,6 +1090,10 @@ func (s *Strategy) updateFilledOrderMetrics(order types.Order) {
}
func (s *Strategy) updateGridNumOfOrdersMetricsWithLock() {
s.updateGridNumOfOrdersMetrics(s.getGrid())
}
func (s *Strategy) updateGridNumOfOrdersMetrics(grid *Grid) {
baseLabels := s.newPrometheusLabels()
makerOrders := s.orderExecutor.ActiveMakerOrders()
numOfOrders := makerOrders.NumOfOrders()
@ -1100,7 +1103,7 @@ func (s *Strategy) updateGridNumOfOrdersMetricsWithLock() {
metricsGridQuoteInvestment.With(baseLabels).Set(s.QuoteInvestment.Float64())
metricsGridBaseInvestment.With(baseLabels).Set(s.BaseInvestment.Float64())
if grid := s.getGrid(); grid != nil {
if grid != nil {
gridNum := grid.Size.Int()
metricsGridNum.With(baseLabels).Set(float64(gridNum))
numOfMissingOrders := gridNum - 1 - numOfOrders