From 375024f6ec17a8c838e7bd3ea2000908531ad914 Mon Sep 17 00:00:00 2001 From: Samuel Laferriere Date: Fri, 20 Sep 2024 09:10:43 -0700 Subject: [PATCH] Eigenda client subsystem logger (#136) * format: middleware function signatures for better readability * chore: wrap an error for easier debugging * chore: give eigenda-client its own logger with subsystem label --- server/load_store.go | 2 +- server/server.go | 12 ++++++++---- store/eigenda.go | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/server/load_store.go b/server/load_store.go index 3e8904c..1b1bf54 100644 --- a/server/load_store.go +++ b/server/load_store.go @@ -95,7 +95,7 @@ func LoadStoreRouter(ctx context.Context, cfg CLIConfig, log log.Logger) (store. } else { var client *clients.EigenDAClient log.Info("Using EigenDA backend") - client, err = clients.NewEigenDAClient(log, daCfg.ClientConfig) + client, err = clients.NewEigenDAClient(log.With("subsystem", "eigenda-client"), daCfg.ClientConfig) if err != nil { return nil, err } diff --git a/server/server.go b/server/server.go index 20852f9..0ba067f 100644 --- a/server/server.go +++ b/server/server.go @@ -58,8 +58,10 @@ func NewServer(host string, port int, router store.IRouter, log log.Logger, } // WithMetrics is a middleware that records metrics for the route path. -func WithMetrics(handleFn func(http.ResponseWriter, *http.Request) (commitments.CommitmentMeta, error), - m metrics.Metricer) func(http.ResponseWriter, *http.Request) error { +func WithMetrics( + handleFn func(http.ResponseWriter, *http.Request) (commitments.CommitmentMeta, error), + m metrics.Metricer, +) func(http.ResponseWriter, *http.Request) error { return func(w http.ResponseWriter, r *http.Request) error { recordDur := m.RecordRPCServerRequest(r.Method) @@ -71,8 +73,10 @@ func WithMetrics(handleFn func(http.ResponseWriter, *http.Request) (commitments. } // WithLogging is a middleware that logs the request method and URL. -func WithLogging(handleFn func(http.ResponseWriter, *http.Request) error, - log log.Logger) func(http.ResponseWriter, *http.Request) { +func WithLogging( + handleFn func(http.ResponseWriter, *http.Request) error, + log log.Logger, +) func(http.ResponseWriter, *http.Request) { return func(w http.ResponseWriter, r *http.Request) { log.Info("request", "method", r.Method, "url", r.URL) err := handleFn(w, r) diff --git a/store/eigenda.go b/store/eigenda.go index 52dced8..4387a48 100644 --- a/store/eigenda.go +++ b/store/eigenda.go @@ -143,7 +143,7 @@ func (e EigenDAStore) Verify(key []byte, value []byte) error { // verify kzg data commitment err = e.verifier.VerifyCommitment(cert.BlobHeader.Commitment, encodedBlob) if err != nil { - return err + return fmt.Errorf("failed to verify commitment: %w", err) } // verify DA certificate against on-chain