Merge pull request #67 from avast/grpc_call_count

Add metric for amount of calls per method to GrpcServerMonitoringInterceptor

Author: Tasssadar

grpc/src/main/java/com/avast/metrics/grpc/GrpcServerMonitoringInterceptor.java

@@ -24,8 +24,10 @@ public GrpcServerMonitoringInterceptor(final Monitor monitor) {
     @Override
     public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(final ServerCall<ReqT, RespT> call, final Metadata headers, final ServerCallHandler<ReqT, RespT> next) {
         MethodDescriptor<ReqT, RespT> method = call.getMethodDescriptor();
-        final AtomicInteger currentCalls = cache.getGaugedValue(method, "Current");
 
+        cache.getMeter(method, "Calls", "count").mark();
+
+        final AtomicInteger currentCalls = cache.getGaugedValue(method, "Current");
         final Instant start = clock.instant();
         currentCalls.incrementAndGet();
 

grpc/src/main/java/com/avast/metrics/grpc/MetricsCache.java

@@ -5,6 +5,7 @@
 import com.avast.metrics.api.Timer;
 import io.grpc.MethodDescriptor;
 
+import java.util.Arrays;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -28,6 +29,11 @@ public <ReqT, RespT> Meter getMeter(MethodDescriptor<ReqT, RespT> methodDescript
         return meters.computeIfAbsent(methodMonitorName + name, (s) -> monitor.named(methodMonitorName).newMeter(name));
     }
 
+    public <ReqT, RespT> Meter getMeter(MethodDescriptor<ReqT, RespT> methodDescriptor, String name1, String name2) {
+        String methodMonitorName = MetricNaming.getMethodMonitorName(methodDescriptor);
+        return meters.computeIfAbsent(methodMonitorName + name1 + name2, (s) -> monitor.named(methodMonitorName, name1).newMeter(name2));
+    }
+
     public <ReqT, RespT> AtomicInteger getGaugedValue(MethodDescriptor<ReqT, RespT> methodDescriptor, String name) {
         String methodMonitorName = MetricNaming.getMethodMonitorName(methodDescriptor);
         return gaugedValues.computeIfAbsent(methodMonitorName + name, n -> {

grpc/src/test/java/com/avast/metrics/grpc/GrpcServerMonitoringInterceptorTest.java

@@ -1,5 +1,6 @@
 package com.avast.metrics.grpc;
 
+import com.avast.metrics.api.Meter;
 import com.avast.metrics.api.Monitor;
 import com.avast.metrics.api.Timer;
 import io.grpc.ManagedChannel;
@@ -44,6 +45,12 @@ public void testOk() throws IOException {
             return null;
         });
 
+        final Monitor callsMonitor = mock(Monitor.class);
+        when(monitor.named("TestApiService_Get", "Calls")).thenReturn(callsMonitor);
+
+        final Meter callsMeter = mock(Meter.class);
+        when(callsMonitor.newMeter(eq("count"))).thenReturn(callsMeter);
+
         final Clock clock = mock(Clock.class);
         when(clock.instant()).thenReturn(
                 Instant.ofEpochMilli(0),
@@ -73,6 +80,7 @@ public void get(final TestApiOuterClass.TestApi.GetRequest request, final Stream
 
         verify(timer, times(1)).update(Matchers.eq(Duration.ofMillis(42)));
         assertEquals(0, currentCallsSupplier.get().get().longValue());
+        verify(callsMeter, times(1)).mark();
     }
 
     @Test
@@ -93,6 +101,12 @@ public void testFailure() throws IOException {
             return null;
         });
 
+        final Monitor callsMonitor = mock(Monitor.class);
+        when(monitor.named("TestApiService_Get", "Calls")).thenReturn(callsMonitor);
+
+        final Meter callsMeter = mock(Meter.class);
+        when(callsMonitor.newMeter(eq("count"))).thenReturn(callsMeter);
+
         final Clock clock = mock(Clock.class);
         when(clock.instant()).thenReturn(
                 Instant.ofEpochMilli(0),
@@ -124,6 +138,7 @@ public void get(final TestApiOuterClass.TestApi.GetRequest request, final Stream
 
         verify(timer, times(1)).update(Matchers.eq(Duration.ofMillis(42)));
         assertEquals(0, currentCallsSupplier.get().get().longValue());
+        verify(callsMeter, times(1)).mark();
     }
 }