forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #211 from r4f4ss/hotfix_metrics

Browse source 
Fix error verification in metrics
This commit is contained in:
rafaelss 2024-10-29 08:07:23 -04:00 committed by GitHub
commit a679321ff1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
portalnetwork/beacon/storage.go
View file

@ -185,7 +185,7 @@ func (bs *BeaconStorage) getLcUpdateValueByRange(start, end uint64) ([]byte, err
func (bs *BeaconStorage) putContentValue(contentId, contentKey, value []byte) error { func (bs *BeaconStorage) putContentValue(contentId, contentKey, value []byte) error {
length := 32 + len(contentKey) + len(value) length := 32 + len(contentKey) + len(value)
_, err := bs.db.ExecContext(context.Background(), InsertQueryBeacon, contentId, contentKey, value, length) _, err := bs.db.ExecContext(context.Background(), InsertQueryBeacon, contentId, contentKey, value, length)
if metrics.Enabled && err != nil { if metrics.Enabled && err == nil {
portalStorageMetrics.EntriesCount.Inc(1) portalStorageMetrics.EntriesCount.Inc(1)
portalStorageMetrics.ContentStorageUsage.Inc(int64(len(value))) portalStorageMetrics.ContentStorageUsage.Inc(int64(len(value)))
} }
@ -194,7 +194,7 @@ func (bs *BeaconStorage) putContentValue(contentId, contentKey, value []byte) er
func (bs *BeaconStorage) putLcUpdate(period uint64, value []byte) error { func (bs *BeaconStorage) putLcUpdate(period uint64, value []byte) error {
_, err := bs.db.ExecContext(context.Background(), InsertLCUpdateQuery, period, value, 0, len(value)) _, err := bs.db.ExecContext(context.Background(), InsertLCUpdateQuery, period, value, 0, len(value))
if metrics.Enabled && err != nil { if metrics.Enabled && err == nil {
portalStorageMetrics.EntriesCount.Inc(1) portalStorageMetrics.EntriesCount.Inc(1)
portalStorageMetrics.ContentStorageUsage.Inc(int64(len(value))) portalStorageMetrics.ContentStorageUsage.Inc(int64(len(value)))
} }

6
portalnetwork/history/storage.go
View file

@ -456,7 +456,7 @@ func (p *ContentStorage) del(contentId []byte) error {
} }
} }
_, err = p.delStmt.Exec(contentId) _, err = p.delStmt.Exec(contentId)
if metrics.Enabled && err != nil { if metrics.Enabled && err == nil {
portalStorageMetrics.EntriesCount.Dec(1) portalStorageMetrics.EntriesCount.Dec(1)
portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel)) portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel))
} }
@ -480,7 +480,7 @@ func (p *ContentStorage) batchDel(ids [][]byte) error {
// delete items // delete items
_, err = p.sqliteDB.Exec(query, args...) _, err = p.sqliteDB.Exec(query, args...)
if metrics.Enabled && err != nil { if metrics.Enabled && err == nil {
portalStorageMetrics.EntriesCount.Dec(int64(len(args))) portalStorageMetrics.EntriesCount.Dec(int64(len(args)))
portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel)) portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel))
} }
@ -509,7 +509,7 @@ func (p *ContentStorage) deleteContentOutOfRadius(radius *uint256.Int) error {
} }
count, err := res.RowsAffected() count, err := res.RowsAffected()
p.log.Trace("delete items", "count", count) p.log.Trace("delete items", "count", count)
if metrics.Enabled && err != nil { if metrics.Enabled && err == nil {
portalStorageMetrics.EntriesCount.Dec(count) portalStorageMetrics.EntriesCount.Dec(count)
portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel)) portalStorageMetrics.ContentStorageUsage.Dec(int64(sizeDel))
} }