refactor: use consolidated admin api from op-service/rpc for op-batcher

op-batcher/batcher/batch_submitter.go

@@ -13,6 +13,7 @@ import (
 	"github.com/ethereum-optimism/optimism/op-batcher/rpc"
 	opservice "github.com/ethereum-optimism/optimism/op-service"
 	oplog "github.com/ethereum-optimism/optimism/op-service/log"
+	opmetrics "github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/opio"
 	oppprof "github.com/ethereum-optimism/optimism/op-service/pprof"
 	oprpc "github.com/ethereum-optimism/optimism/op-service/rpc"
@@ -31,7 +32,8 @@ func Main(version string, cliCtx *cli.Context) error {
 	l := oplog.NewLogger(oplog.AppOut(cliCtx), cfg.LogConfig)
 	oplog.SetGlobalLogHandler(l.GetHandler())
 	opservice.ValidateEnvVars(flags.EnvVarPrefix, flags.Flags, l)
-	m := metrics.NewMetrics("default")
+	procName := "default"
+	m := metrics.NewMetrics(procName)
 	l.Info("Initializing Batch Submitter")
 
 	batchSubmitter, err := NewBatchSubmitterFromCLIConfig(cfg, l, m)
@@ -79,9 +81,10 @@ func Main(version string, cliCtx *cli.Context) error {
 		oprpc.WithLogger(l),
 	)
 	if cfg.RPCFlag.EnableAdmin {
+		rpcMetrics := opmetrics.NewRPCMetrics(procName, metrics.Namespace)
 		server.AddAPI(gethrpc.API{
 			Namespace: "admin",
-			Service:   rpc.NewAdminAPI(batchSubmitter),
+			Service:   rpc.NewAdminAPI(batchSubmitter, rpcMetrics, l),
 		})
 		l.Info("Admin RPC enabled")
 	}

op-batcher/rpc/api.go

@@ -3,6 +3,9 @@ package rpc
 import (
 	"context"
 
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-service/metrics"
 	"github.com/ethereum-optimism/optimism/op-service/rpc"
 )
 
@@ -16,9 +19,10 @@ type adminAPI struct {
 	b batcherClient
 }
 
-func NewAdminAPI(dr batcherClient) *adminAPI {
+func NewAdminAPI(dr batcherClient, m metrics.RPCMetricer, log log.Logger) *adminAPI {
 	return &adminAPI{
-		b: dr,
+		CommonAdminAPI: rpc.NewCommonAdminAPI(m, log),
+		b:              dr,
 	}
 }
 

op-node/metrics/metrics.go

@@ -80,7 +80,7 @@ type Metrics struct {
 	Info *prometheus.GaugeVec
 	Up   prometheus.Gauge
 
-	metrics.RPCMetrics
+	*metrics.RPCMetrics
 
 	L1SourceCache *CacheMetrics
 	L2SourceCache *CacheMetrics
@@ -175,7 +175,7 @@ func NewMetrics(procName string) *Metrics {
 			Help:      "1 if the op node has finished starting up",
 		}),
 
-		RPCMetrics: *metrics.NewRPCMetrics(procName, Namespace),
+		RPCMetrics: metrics.NewRPCMetrics(procName, Namespace),
 
 		L1SourceCache: NewCacheMetrics(factory, ns, "l1_source_cache", "L1 Source cache"),
 		L2SourceCache: NewCacheMetrics(factory, ns, "l2_source_cache", "L2 Source cache"),

op-node/node/api.go

@@ -39,8 +39,8 @@ type adminAPI struct {
 
 func NewAdminAPI(dr driverClient, m metrics.RPCMetricer, log log.Logger) *adminAPI {
 	return &adminAPI{
-		dr:             dr,
 		CommonAdminAPI: rpc.NewCommonAdminAPI(m, log),
+		dr:             dr,
 	}
 }