Rename to in flight grpc requests.

EURODEO · Nov 5, 2024 · e989c33 · e989c33 · github-actions · Nov 5, 2024
1 parent b33c150
commit e989c33
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/datastore/datastore/main/main.go b/datastore/datastore/main/main.go
@@ -68,7 +68,7 @@ func main() {
 	reg := prometheus.NewRegistry()
 	reg.MustRegister(
 		grpcMetrics,
-		promservermetrics.ActiveConnections,
+		promservermetrics.InFlightRequests,
 		promservermetrics.UptimeCounter,
 		promservermetrics.ResponseSizeSummary,
 		collectors.NewGoCollector(),
@@ -81,7 +81,7 @@ func main() {
 	server := grpc.NewServer(
 		grpc.ChainUnaryInterceptor(
 			reqTimeLogger,
-			promservermetrics.ConnectionUnaryInterceptor,
+			promservermetrics.InFlightRequestInterceptor,
 			promservermetrics.ResponseSizeUnaryInterceptor,
 			grpcMetrics.UnaryServerInterceptor(),
 		),

diff --git a/datastore/datastore/metrics/promservermetrics.go b/datastore/datastore/metrics/promservermetrics.go
@@ -14,9 +14,9 @@ var (
 		Help: "Total uptime of the gRPC server in seconds",
 	})
 
-	ActiveConnections = prometheus.NewGauge(prometheus.GaugeOpts{
-		Name: "grpc_active_connections",
-		Help: "Current number of active gRPC connections",
+	InFlightRequests = prometheus.NewGauge(prometheus.GaugeOpts{
+		Name: "grpc_in_flight_requests",
+		Help: "Current number of in-flight gRPC requests",
 	})
 
 	ResponseSizeSummary = prometheus.NewSummaryVec(
@@ -41,9 +41,9 @@ func TrackUptime() {
 	}
 }
 
-func ConnectionUnaryInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
-	ActiveConnections.Inc()       // Increment when a new unary request (connection) is opened
-	defer ActiveConnections.Dec() // Decrement when the unary request (connection) is completed
+func InFlightRequestInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	InFlightRequests.Inc()       // Increment at the start of the request
+	defer InFlightRequests.Dec() // Decrement at the end of the request
 	return handler(ctx, req)
 }
 

diff --git a/grafana/dashboards/grpc-server.json b/grafana/dashboards/grpc-server.json
@@ -1146,14 +1146,14 @@
                         "uid": "PBFA97CFB590B2093"
                     },
                     "editorMode": "code",
-                    "expr": "grpc_active_connections",
+                    "expr": "grpc_in_flight_requests",
                     "instant": false,
-                    "legendFormat": "Active gRPC connections",
+                    "legendFormat": "In flight requests",
                     "range": true,
                     "refId": "A"
                 }
             ],
-            "title": "Active gRPC connections",
+            "title": "In flight requests",
             "type": "timeseries"
         },
         {
File	Stmts	Miss	Cover	Missing
\_\_init\_\_.py	0	0	100%
datastore_pb2.py	61	48	21%	34–81
datastore_pb2_grpc.py	54	27	50%	15–16, 19, 65–80, 121–123, 128–130, 135–137, 142–144, 148–173, 219, 246, 273, 300
export_metrics.py	10	0	100%
grpc_getter.py	20	11	45%	15–19, 23–26, 30–32, 36–38
locustfile.py	15	15	0%	1–31
main.py	43	7	84%	45, 50, 60, 70–71, 81–82
metadata_endpoints.py	65	31	52%	45–54, 58, 85, 100–219, 223
response_classes.py	5	0	100%
utilities.py	174	46	74%	20, 38, 45, 67–70, 78–89, 94–101, 121, 125, 127, 155, 161, 179, 193–194, 198, 214–218, 222–228, 232–234, 264, 268, 290, 295
custom_geo_json
edr_feature_collection.py	6	0	100%
formatters
\_\_init\_\_.py	11	0	100%
covjson.py	59	1	98%	91
geojson.py	21	2	90%	27, 52
openapi
custom_dimension_examples.py	4	0	100%
edr_query_parameter_descriptions.py	11	0	100%
openapi_examples.py	13	0	100%
routers
\_\_init\_\_.py	0	0	100%
edr.py	101	4	96%	348–349, 438–439
feature.py	47	19	60%	99–132, 148–153, 159–181
TOTAL	720	211	71%