From 08f2838b7826827b668abcd5a4450a555078b31d Mon Sep 17 00:00:00 2001
From: FFMMM <FFMMM@users.noreply.github.com>
Date: Mon, 21 Mar 2022 17:26:32 -0700
Subject: [PATCH] pre register new rpc metric, rename metric (#12582)

---
 agent/metrics_test.go                |  2 +-
 agent/rpc/middleware/interceptors.go | 10 +++++++++-
 agent/setup.go                       |  2 ++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/agent/metrics_test.go b/agent/metrics_test.go
index f544f79e2..9b5e84500 100644
--- a/agent/metrics_test.go
+++ b/agent/metrics_test.go
@@ -92,7 +92,7 @@ func TestAgent_NewRPCMetrics(t *testing.T) {
 		respRec := httptest.NewRecorder()
 		recordPromMetrics(t, a, respRec)
 
-		assertMetricExists(t, respRec, metricsPrefix+"_rpc_server_request")
+		assertMetricExists(t, respRec, metricsPrefix+"_rpc_server_call")
 	})
 }
 
diff --git a/agent/rpc/middleware/interceptors.go b/agent/rpc/middleware/interceptors.go
index 0ae715967..bdf5b333f 100644
--- a/agent/rpc/middleware/interceptors.go
+++ b/agent/rpc/middleware/interceptors.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
+	"github.com/armon/go-metrics/prometheus"
 	"github.com/hashicorp/consul-net-rpc/net/rpc"
 	"github.com/hashicorp/go-hclog"
 )
@@ -19,9 +20,16 @@ import (
 // used for this historically is "RPC", so we continue to use that here.
 const RPCTypeInternal = "internal"
 
-var metricRPCRequest = []string{"rpc", "server", "request"}
+var metricRPCRequest = []string{"rpc", "server", "call"}
 var requestLogName = "rpc.server.request"
 
+var NewRPCCounters = []prometheus.CounterDefinition{
+	{
+		Name: metricRPCRequest,
+		Help: "Increments when a server makes an RPC service call. The labels on the metric have more information",
+	},
+}
+
 type RequestRecorder struct {
 	Logger hclog.Logger
 }
diff --git a/agent/setup.go b/agent/setup.go
index 1ce7f40d1..4b8452fc5 100644
--- a/agent/setup.go
+++ b/agent/setup.go
@@ -25,6 +25,7 @@ import (
 	"github.com/hashicorp/consul/agent/local"
 	"github.com/hashicorp/consul/agent/pool"
 	"github.com/hashicorp/consul/agent/router"
+	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/agent/submatview"
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/agent/xds"
@@ -264,6 +265,7 @@ func getPrometheusDefs(cfg lib.TelemetryConfig, isServer bool) ([]prometheus.Gau
 		grpc.StatsCounters,
 		local.StateCounters,
 		raftCounters,
+		middleware.NewRPCCounters,
 	}
 	// Flatten definitions
 	// NOTE(kit): Do we actually want to create a set here so we can ensure definition names are unique?