chore: update API metrics bucket and endpoint names

vechain · Nov 25, 2024 · 140bf5c · 140bf5c
1 parent 221b69c
commit 140bf5c
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 18 deletions.
diff --git a/api/accounts/accounts.go b/api/accounts/accounts.go
@@ -358,27 +358,27 @@ func (a *Accounts) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("/*").
 		Methods(http.MethodPost).
-		Name("accounts_call_batch_code").
+		Name("POST /accounts/*").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleCallBatchCode))
 	sub.Path("/{address}").
 		Methods(http.MethodGet).
-		Name("accounts_get_account").
+		Name("GET /accounts/{address}").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleGetAccount))
 	sub.Path("/{address}/code").
 		Methods(http.MethodGet).
-		Name("accounts_get_code").
+		Name("GET /accounts/{address}/code").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleGetCode))
 	sub.Path("/{address}/storage/{key}").
 		Methods("GET").
-		Name("accounts_get_storage").
+		Name("GET /accounts/{address}/storage").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleGetStorage))
 	// These two methods are currently deprecated
 	sub.Path("").
 		Methods(http.MethodPost).
-		Name("accounts_call_contract").
+		Name("POST /accounts").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleCallContract))
 	sub.Path("/{address}").
 		Methods(http.MethodPost).
-		Name("accounts_call_contract_address").
+		Name("POST /accounts/{address}").
 		HandlerFunc(utils.WrapHandlerFunc(a.handleCallContract))
 }
diff --git a/api/blocks/blocks.go b/api/blocks/blocks.go
@@ -95,6 +95,6 @@ func (b *Blocks) Mount(root *mux.Router, pathPrefix string) {
 	sub := root.PathPrefix(pathPrefix).Subrouter()
 	sub.Path("/{revision}").
 		Methods(http.MethodGet).
-		Name("blocks_get_block").
+		Name("GET /blocks/{revision}").
 		HandlerFunc(utils.WrapHandlerFunc(b.handleGetBlock))
 }
diff --git a/api/debug/debug.go b/api/debug/debug.go
@@ -466,13 +466,13 @@ func (d *Debug) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("/tracers").
 		Methods(http.MethodPost).
-		Name("debug_trace_clause").
+		Name("POST /debug/tracers").
 		HandlerFunc(utils.WrapHandlerFunc(d.handleTraceClause))
 	sub.Path("/tracers/call").
 		Methods(http.MethodPost).
-		Name("debug_trace_call").
+		Name("POST /debug/tracers/call").
 		HandlerFunc(utils.WrapHandlerFunc(d.handleTraceCall))
-	sub.Path("/storage-range").
+	sub.Path("POST /debug/storage-range").
 		Methods(http.MethodPost).
 		Name("debug_trace_storage").
 		HandlerFunc(utils.WrapHandlerFunc(d.handleDebugStorage))

diff --git a/api/events/events.go b/api/events/events.go
@@ -84,6 +84,6 @@ func (e *Events) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("").
 		Methods(http.MethodPost).
-		Name("logs_filter_event").
+		Name("POST /logs/event").
 		HandlerFunc(utils.WrapHandlerFunc(e.handleFilter))
 }
diff --git a/api/metrics.go b/api/metrics.go
@@ -64,7 +64,7 @@ func metricsMiddleware(next http.Handler) http.Handler {
 			name         = ""
 			subscription = ""
 		)
-
+		
 		// all named route will be recorded
 		if rt != nil && rt.GetName() != "" {
 			enabled = true

diff --git a/api/node/node.go b/api/node/node.go
@@ -35,6 +35,6 @@ func (n *Node) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("/network/peers").
 		Methods(http.MethodGet).
-		Name("node_get_peers").
+		Name("GET /node/network/peers").
 		HandlerFunc(utils.WrapHandlerFunc(n.handleNetwork))
 }
diff --git a/api/transactions/transactions.go b/api/transactions/transactions.go
@@ -218,14 +218,14 @@ func (t *Transactions) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("").
 		Methods(http.MethodPost).
-		Name("transactions_send_tx").
+		Name("POST /transactions").
 		HandlerFunc(utils.WrapHandlerFunc(t.handleSendTransaction))
 	sub.Path("/{id}").
 		Methods(http.MethodGet).
-		Name("transactions_get_tx").
+		Name("GET /transactions/${id}").
 		HandlerFunc(utils.WrapHandlerFunc(t.handleGetTransactionByID))
 	sub.Path("/{id}/receipt").
 		Methods(http.MethodGet).
-		Name("transactions_get_receipt").
+		Name("GET /transactions/${id}/receipt").
 		HandlerFunc(utils.WrapHandlerFunc(t.handleGetTransactionReceiptByID))
 }
diff --git a/api/transfers/transfers.go b/api/transfers/transfers.go
@@ -90,6 +90,6 @@ func (t *Transfers) Mount(root *mux.Router, pathPrefix string) {
 
 	sub.Path("").
 		Methods(http.MethodPost).
-		Name("logs_filter_transfer").
+		Name("POST /logs/transfer").
 		HandlerFunc(utils.WrapHandlerFunc(t.handleFilterTransferLogs))
 }
diff --git a/metrics/telemetry.go b/metrics/telemetry.go
@@ -30,7 +30,11 @@ func HTTPHandler() http.Handler {
 // Define standard buckets for histograms
 var (
 	Bucket10s      = []int64{0, 500, 1000, 2000, 3000, 4000, 5000, 7500, 10_000}
-	BucketHTTPReqs = []int64{0, 150, 300, 450, 600, 900, 1200, 1500, 3000}
+	BucketHTTPReqs = []int64{
+		0, 1, 2, 5, 10, 20, 30, 50, 75, 100,
+		150, 200, 300, 400, 500, 750, 1000,
+		1500, 2000, 3000, 4000, 5000, 10000,
+	}
 )
 
 // HistogramMeter represents the type of metric that is calculated by aggregating