remove e3 metrics from e2 (#11374)

erigontech · Jul 29, 2024 · 217b5a1 · 217b5a1
1 parent 4d45aa9
commit 217b5a1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 28 deletions.
diff --git a/erigon-lib/state/aggregator_files.go b/erigon-lib/state/aggregator_files.go
@@ -22,36 +22,12 @@ import (
 	"github.com/holiman/uint256"
 	"github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/common/length"
-	"github.com/ledgerwatch/erigon-lib/metrics"
 )
 
 // StepsInBiggestFile - files of this size are completely frozen/immutable.
 // files of smaller size are also immutable, but can be removed after merge to bigger files.
 const StepsInBiggestFile = 32
 
-var (
-	mxCurrentTx                = metrics.GetOrCreateGauge("domain_tx_processed")                 //nolint
-	mxCurrentBlock             = metrics.GetOrCreateGauge("domain_block_current")                //nolint
-	mxRunningMerges            = metrics.GetOrCreateGauge("domain_running_merges")               //nolint
-	mxRunningCollations        = metrics.GetOrCreateGauge("domain_running_collations")           //nolint
-	mxCollateTook              = metrics.GetOrCreateHistogram("domain_collate_took")             //nolint
-	mxPruneTook                = metrics.GetOrCreateHistogram("domain_prune_took")               //nolint
-	mxPruneHistTook            = metrics.GetOrCreateHistogram("domain_prune_hist_took")          //nolint
-	mxPruningProgress          = metrics.GetOrCreateGauge("domain_pruning_progress")             //nolint
-	mxCollationSize            = metrics.GetOrCreateGauge("domain_collation_size")               //nolint
-	mxCollationSizeHist        = metrics.GetOrCreateGauge("domain_collation_hist_size")          //nolint
-	mxPruneSize                = metrics.GetOrCreateCounter("domain_prune_size")                 //nolint
-	mxBuildTook                = metrics.GetOrCreateSummary("domain_build_files_took")           //nolint
-	mxStepCurrent              = metrics.GetOrCreateGauge("domain_step_current")                 //nolint
-	mxStepTook                 = metrics.GetOrCreateHistogram("domain_step_took")                //nolint
-	mxCommitmentKeys           = metrics.GetOrCreateCounter("domain_commitment_keys")            //nolint
-	mxCommitmentRunning        = metrics.GetOrCreateGauge("domain_running_commitment")           //nolint
-	mxCommitmentTook           = metrics.GetOrCreateSummary("domain_commitment_took")            //nolint
-	mxCommitmentWriteTook      = metrics.GetOrCreateHistogram("domain_commitment_write_took")    //nolint
-	mxCommitmentUpdates        = metrics.GetOrCreateCounter("domain_commitment_updates")         //nolint
-	mxCommitmentUpdatesApplied = metrics.GetOrCreateCounter("domain_commitment_updates_applied") //nolint
-)
-
 type SelectedStaticFiles struct {
 	accounts       []*filesItem
 	accountsIdx    []*filesItem

diff --git a/erigon-lib/state/domain.go b/erigon-lib/state/domain.go
@@ -900,8 +900,6 @@ func (d *Domain) integrateFiles(sf StaticFiles, txNumFrom, txNumTo uint64) {
 // [txFrom; txTo)
 func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uint64, logEvery *time.Ticker) error {
 	defer func(t time.Time) { d.stats.LastPruneTook = time.Since(t) }(time.Now())
-	mxPruningProgress.Inc()
-	defer mxPruningProgress.Dec()
 
 	var (
 		_state    = "scan steps"
@@ -948,7 +946,6 @@ func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uin
 					if err := keysCursor.DeleteCurrent(); err != nil {
 						return fmt.Errorf("prune key %x: %w", k, err)
 					}
-					mxPruneSize.Inc()
 					keyMaxSteps[string(k)] = s
 				}
 			}
@@ -992,7 +989,6 @@ func (d *Domain) prune(ctx context.Context, step uint64, txFrom, txTo, limit uin
 			if err := valsCursor.DeleteCurrent(); err != nil {
 				return fmt.Errorf("prune val %x: %w", k, err)
 			}
-			mxPruneSize.Inc()
 		}
 		pos.Add(1)
 		//_prog = 100 * (float64(pos) / float64(totalKeys))