remove rpcCtx conditional

hashicorp · Jan 6, 2023 · 2afd240 · 2afd240
1 parent d96bcdd
commit 2afd240
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/nomad/rpc_rate_metrics.go b/nomad/rpc_rate_metrics.go
@@ -12,14 +12,12 @@ func (srv *Server) MeasureRPCRate(
 	endpoint, op string,
 	identity *structs.AuthenticatedIdentity, rpcCtx *RPCContext,
 ) {
-	if rpcCtx == nil {
-		return // we're the RPC caller and not the server
-	}
 	if !srv.config.ACLEnabled || identity == nil {
 		// If ACLs aren't enabled, we never have a sensible identity
 		metrics.IncrCounter([]string{"nomad", "rpc", endpoint, op}, 1)
+	} else {
+		metrics.IncrCounterWithLabels(
+			[]string{"nomad", "rpc", endpoint, op}, 1,
+			[]metrics.Label{{Name: "identity", Value: identity.String()}})
 	}
-	metrics.IncrCounterWithLabels(
-		[]string{"nomad", "rpc", endpoint, op}, 1,
-		[]metrics.Label{{Name: "identity", Value: identity.String()}})
 }