Initialize using Dependency Set Configuration

op-e2e/interop/supersystem.go

@@ -419,7 +419,7 @@ func (s *interopE2ESystem) newL2(id string, l2Out *interopgen.L2Output) l2Set {
 func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 	// Be verbose with op-supervisor, it's in early test phase
 	logger := testlog.Logger(s.t, log.LevelDebug).New("role", "supervisor")
-	cfg := supervisorConfig.Config{
+	cfg := &supervisorConfig.Config{
 		MetricsConfig: metrics.CLIConfig{
 			Enabled: false,
 		},
@@ -441,17 +441,17 @@ func (s *interopE2ESystem) prepareSupervisor() *supervisor.SupervisorService {
 	depSet := &depset.StaticConfigDependencySet{
 		Dependencies: make(map[supervisortypes.ChainID]*depset.StaticConfigDependency),
 	}
-	for id := range s.l2s {
-		cfg.L2RPCs = append(cfg.L2RPCs, s.l2s[id].l2Geth.UserRPC().RPC())
-		chainID := supervisortypes.ChainIDFromBig(s.l2s[id].chainID)
+	// Iterate over the L2 chain configs. The L2 nodes don't exist yet.
+	for _, l2Out := range s.worldOutput.L2s {
+		chainID := supervisortypes.ChainIDFromBig(l2Out.Genesis.Config.ChainID)
 		depSet.Dependencies[chainID] = &depset.StaticConfigDependency{
 			ActivationTime: 0,
 			HistoryMinTime: 0,
 		}
 	}
 	cfg.DependencySetSource = depSet
 	// Create the supervisor with the configuration
-	super, err := supervisor.SupervisorFromConfig(context.Background(), &cfg, logger)
+	super, err := supervisor.SupervisorFromConfig(context.Background(), cfg, logger)
 	require.NoError(s.t, err)
 	// Start the supervisor
 	err = super.Start(context.Background())
@@ -495,7 +495,7 @@ func (s *interopE2ESystem) prepare(t *testing.T, w worldResourcePaths) {
 	ctx := context.Background()
 	for _, l2 := range s.l2s {
 		err := s.SupervisorClient().AddL2RPC(ctx, l2.l2Geth.UserRPC().RPC())
-		require.NoError(s.t, err, "failed to add L2 RPC to supervisor", "error", err)
+		require.NoError(s.t, err, "failed to add L2 RPC to supervisor")
 	}
 }
 

op-supervisor/config/config.go

@@ -29,6 +29,10 @@ type Config struct {
 	// MockRun runs the service with a mock backend
 	MockRun bool
 
+	// SynchronousProcessors disables background-workers,
+	// requiring manual triggers for the backend to process anything.
+	SynchronousProcessors bool
+
 	L2RPCs  []string
 	Datadir string
 }

op-supervisor/metrics/metrics.go

@@ -1,10 +1,10 @@
 package metrics
 
 import (
-	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 	"github.com/prometheus/client_golang/prometheus"
 
 	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
+	"github.com/ethereum-optimism/optimism/op-supervisor/supervisor/types"
 )
 
 const Namespace = "op_supervisor"
@@ -18,7 +18,7 @@ type Metricer interface {
 	CacheAdd(chainID types.ChainID, label string, cacheSize int, evicted bool)
 	CacheGet(chainID types.ChainID, label string, hit bool)
 
-	RecordDBEntryCount(chainID types.ChainID, count int64)
+	RecordDBEntryCount(chainID types.ChainID, kind string, count int64)
 	RecordDBSearchEntriesRead(chainID types.ChainID, count int64)
 
 	Document() []opmetrics.DocumentedMetric
@@ -106,9 +106,10 @@ func NewMetrics(procName string) *Metrics {
 		DBEntryCountVec: factory.NewGaugeVec(prometheus.GaugeOpts{
 			Namespace: ns,
 			Name:      "logdb_entries_current",
-			Help:      "Current number of entries in the log database by chain ID",
+			Help:      "Current number of entries in the database of specified kind and chain ID",
 		}, []string{
 			"chain",
+			"kind",
 		}),
 		DBSearchEntriesReadVec: factory.NewHistogramVec(prometheus.HistogramOpts{
 			Namespace: ns,
@@ -159,8 +160,8 @@ func (m *Metrics) CacheGet(chainID types.ChainID, label string, hit bool) {
 	}
 }
 
-func (m *Metrics) RecordDBEntryCount(chainID types.ChainID, count int64) {
-	m.DBEntryCountVec.WithLabelValues(chainIDLabel(chainID)).Set(float64(count))
+func (m *Metrics) RecordDBEntryCount(chainID types.ChainID, kind string, count int64) {
+	m.DBEntryCountVec.WithLabelValues(chainIDLabel(chainID), kind).Set(float64(count))
 }
 
 func (m *Metrics) RecordDBSearchEntriesRead(chainID types.ChainID, count int64) {

op-supervisor/metrics/noop.go

@@ -19,5 +19,5 @@ func (*noopMetrics) RecordUp()                 {}
 func (m *noopMetrics) CacheAdd(_ types.ChainID, _ string, _ int, _ bool) {}
 func (m *noopMetrics) CacheGet(_ types.ChainID, _ string, _ bool)        {}
 
-func (m *noopMetrics) RecordDBEntryCount(_ types.ChainID, _ int64)        {}
-func (m *noopMetrics) RecordDBSearchEntriesRead(_ types.ChainID, _ int64) {}
+func (m *noopMetrics) RecordDBEntryCount(_ types.ChainID, _ string, _ int64) {}
+func (m *noopMetrics) RecordDBSearchEntriesRead(_ types.ChainID, _ int64)    {}