More frontend changes

Author: tobidae-cb

.gitignore

@@ -12,3 +12,10 @@ contracts/abi/
 benchmark/benchmark
 
 .env
+
+# Node
+coverage/
+!**/__fixtures__/coverage
+node_modules
+yarn-debug.log*
+yarn-error.log*

Makefile

@@ -58,6 +58,10 @@ build-binaries: build-reth build-geth build-rbuilder
 build-backend:
 	cd report/backend && env GO111MODULE=on GOOS=$(TARGETOS) GOARCH=$(TARGETARCH) CGO_ENABLED=0 go build -v $(LDFLAGS) -o ../../bin/base-bench-api cmd/main.go
 
+.PHONY: build-frontend
+build-frontend:
+	cd report && yarn build
+
 .PHONY: run-backend
 run-backend:
 	./bin/base-bench-api --s3-bucket ${BASE_BENCH_API_S3_BUCKET}

benchmark/flags/flags.go

@@ -23,6 +23,10 @@ const (
 	TxFuzzBinFlagName      = "tx-fuzz-bin"
 	ProxyPortFlagName      = "proxy-port"
 	BenchmarkRunIDFlagName = "benchmark-run-id"
+	MachineTypeFlagName     = "machine-type"
+	MachineProviderFlagName = "machine-provider"
+	MachineRegionFlagName   = "machine-region"
+	FileSystemFlagName      = "file-system"
 )
 
 // TxFuzz defaults

configs/examples/snapshot.yml

@@ -19,10 +19,12 @@ benchmarks:
       - node_type: reth
         # Download an initial reth snapshot that can be copied for each test
         command: ./scripts/setup-initial-snapshot.sh --network=sepolia --node-type=reth --destination=/data/snapshots/reth/initial
+        destination: /data/snapshots/reth/initial
         superchain_chain_id: 84532
       - node_type: geth  
         # Download an initial geth snapshot that can be copied for each test
         command: ./scripts/setup-initial-snapshot.sh --network=sepolia --node-type=geth --destination=/data/snapshots/geth/initial
+        destination: /data/snapshots/geth/initial
         superchain_chain_id: 84532
     variables:
       - type: payload

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/ethereum/go-ethereum v1.16.0
 	github.com/holiman/uint256 v1.3.2
 	github.com/pkg/errors v0.9.1
+	github.com/prometheus/client_model v0.6.2
 	github.com/prometheus/common v0.62.0
 	github.com/stretchr/testify v1.10.0
 	github.com/urfave/cli/v2 v2.27.6
@@ -121,7 +122,6 @@ require (
 	github.com/pion/transport/v3 v3.0.7 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_golang v1.22.0 // indirect
-	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect

report/.gitignore

@@ -3,3 +3,20 @@ node_modules
 dist
 .vite
 .vercel
+
+# Node
+coverage/
+!**/__fixtures__/coverage
+node_modules
+yarn-debug.log*
+yarn-error.log*
+
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/releases
+!.yarn/plugins
+!.yarn/sdks
+!.yarn/versions
+.pnp.*

report/.yarn/releases/yarn-4.9.4.cjs

@@ -0,0 +1,5 @@
+enableTelemetry: false
+
+nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-4.9.4.cjs

report/.yarnrc.yml

@@ -4,7 +4,9 @@ import (
 	"context"
 	"net/http"
 	"os"
+	"os/signal"
 	"sync/atomic"
+	"syscall"
 	"time"
 
 	"benchmark-report-api/internal/config"
@@ -100,7 +102,57 @@ type ServerService struct {
 
 func (s *ServerService) Start(ctx context.Context) error {
 	s.logger.Info("Server starting", "addr", s.server.Addr)
-	return s.server.ListenAndServe()
+
+	// Create a channel to listen for OS signals (Ctrl+C, SIGTERM)
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
+	defer signal.Stop(sigChan) // Clean up signal notification
+
+	// Start server in a goroutine
+	serverErr := make(chan error, 1)
+	go func() {
+		if err := s.server.ListenAndServe(); err != nil && err != http.ErrServerClosed {
+			serverErr <- err
+		}
+	}()
+
+	// Wait for either a signal or server error
+	select {
+	case err := <-serverErr:
+		s.logger.Error("Server failed to start", "error", err)
+		return err
+	case sig := <-sigChan:
+		s.logger.Info("Received shutdown signal", "signal", sig)
+
+		// Create a context with timeout for graceful shutdown
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+
+		s.logger.Info("Shutting down server gracefully...")
+		if err := s.server.Shutdown(shutdownCtx); err != nil {
+			s.logger.Error("Server forced to shutdown", "error", err)
+			return err
+		}
+
+		s.logger.Info("Server shutdown complete")
+		s.stopped.Store(true)
+		return nil
+	case <-ctx.Done():
+		s.logger.Info("Context cancelled, shutting down server")
+
+		// Create a context with timeout for graceful shutdown
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+		defer cancel()
+
+		if err := s.server.Shutdown(shutdownCtx); err != nil {
+			s.logger.Error("Server forced to shutdown", "error", err)
+			return err
+		}
+
+		s.logger.Info("Server shutdown complete")
+		s.stopped.Store(true)
+		return ctx.Err()
+	}
 }
 
 func (s *ServerService) Stop(ctx context.Context) error {

report/backend/cmd/main.go

@@ -21,7 +21,7 @@ func MetadataHandler(s3Service *services.S3Service, l log.Logger) gin.HandlerFun
 			return
 		}
 
-		c.Header("Cache-Control", "public, max-age=86400") // 1 day
+		c.Header("Cache-Control", "public, max-age=43200") // 12 hours
 		c.JSON(http.StatusOK, metadata)
 	}
 }