closes #174

Author: Alexander Furer

README.adoc

@@ -248,8 +248,9 @@ Please continue to https://docs.spring.io/spring-cloud-sleuth/docs/current/refer
 By including `org.springframework.boot:spring-boot-starter-actuator` dependency,
 the starter will collect gRPC server metrics , broken down by
 
-. gRPC service method FQN (Fully Qualified Name)
-. https://grpc.github.io/grpc-java/javadoc/io/grpc/Status.Code.html[Response status code]
+. `method` - gRPC service method FQN (Fully Qualified Name)
+. `result` - https://grpc.github.io/grpc-java/javadoc/io/grpc/Status.Code.html[Response status code]
+. `address` - server local address (if you exposed additional  listen addresses, with `grpc.netty-server.additional-listen-addresses` property)
 
 After configuring the exporter of your https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html#production-ready-metrics[choice],
 you should see the `timer` named `grpc.server.calls`.

grpc-spring-boot-starter-demo/src/test/java/org/lognet/springboot/grpc/GrpcMeterTest.java

@@ -1,11 +1,13 @@
 package org.lognet.springboot.grpc;
 
+import io.grpc.examples.GreeterGrpc;
 import io.micrometer.core.instrument.MeterRegistry;
 import io.micrometer.core.instrument.Timer;
 import io.micrometer.core.instrument.simple.SimpleConfig;
 import org.awaitility.Awaitility;
 import org.junit.Before;
 import org.junit.runner.RunWith;
+import org.lognet.springboot.grpc.context.LocalRunningGrpcPort;
 import org.lognet.springboot.grpc.demo.DemoApp;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,7 +18,9 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
 
@@ -27,6 +31,9 @@ public class GrpcMeterTest extends GrpcServerTestBase {
     @Autowired
     private MeterRegistry registry;
 
+    @LocalRunningGrpcPort
+    private int port;
+
     @Autowired
     private SimpleConfig registryConfig;
 
@@ -49,5 +56,14 @@ protected void afterGreeting()  {
         assertThat(timer.max(TimeUnit.MILLISECONDS),greaterThan(0d));
         assertThat(timer.mean(TimeUnit.MILLISECONDS),greaterThan(0d));
         assertThat(timer.totalTime(TimeUnit.MILLISECONDS),greaterThan(0d));
+
+
+        final String addressTag = timer.getId().getTag("address");
+        assertThat(addressTag,notNullValue());
+        assertThat(addressTag,containsString(String.valueOf(port)));
+
+        final String methodTag = timer.getId().getTag("method");
+        assertThat(methodTag,notNullValue());
+        assertThat(methodTag,is(GreeterGrpc.getSayHelloMethod().getFullMethodName()));
     }
 }

grpc-spring-boot-starter-demo/src/test/resources/application-measure.yml

@@ -3,4 +3,10 @@ management:
     export:
       simple:
         step: 10s
-        enabled: true
+        enabled: true
+
+grpc:
+  netty-server:
+    primary-listen-address: localhost:0
+    additional-listen-addresses:
+      - localhost:0

grpc-spring-boot-starter/src/main/java/org/lognet/springboot/grpc/autoconfigure/metrics/GRpcMetricsAutoConfiguration.java

@@ -1,6 +1,7 @@
 package org.lognet.springboot.grpc.autoconfigure.metrics;
 
 import io.grpc.ForwardingServerCall;
+import io.grpc.Grpc;
 import io.grpc.Metadata;
 import io.grpc.ServerCall;
 import io.grpc.ServerCallHandler;
@@ -10,6 +11,7 @@
 import io.micrometer.core.instrument.Timer;
 import org.lognet.springboot.grpc.GRpcGlobalInterceptor;
 import org.lognet.springboot.grpc.GRpcService;
+import org.lognet.springboot.grpc.autoconfigure.GRpcServerProperties;
 import org.springframework.boot.actuate.autoconfigure.metrics.CompositeMeterRegistryAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
@@ -21,6 +23,9 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 
+import java.net.SocketAddress;
+import java.util.Optional;
+
 @Configuration
 @AutoConfigureAfter({MetricsAutoConfiguration.class, CompositeMeterRegistryAutoConfiguration.class})
 @ConditionalOnClass({MeterRegistry.class})
@@ -45,21 +50,28 @@ static class GrpcServiceCondition {
 
     static class MonitoringServerCall<ReqT, RespT> extends  ForwardingServerCall.SimpleForwardingServerCall<ReqT, RespT> {
 
+        private final boolean addAddressTag;
         private MeterRegistry registry;
         final Timer.Sample start;
-        protected MonitoringServerCall(ServerCall<ReqT, RespT> delegate, MeterRegistry registry) {
+        protected MonitoringServerCall(ServerCall<ReqT, RespT> delegate, MeterRegistry registry, boolean addAddressTag) {
             super(delegate);
             this.start = Timer.start(registry);
             this.registry = registry;
+            this.addAddressTag = addAddressTag;
 
 
         }
         @Override
         public void close(Status status, Metadata trailers) {
-            start.stop(Timer.builder("grpc.server.calls")
-                    .tag("method",getMethodDescriptor().getFullMethodName())
-                    .tag("result",status.getCode().name())
-                    .register(registry));
+            final Timer.Builder timerBuilder = Timer.builder("grpc.server.calls")
+                    .tag("method", getMethodDescriptor().getFullMethodName())
+                    .tag("result", status.getCode().name());
+            if (addAddressTag){
+                Optional.ofNullable(delegate().getAttributes().get(Grpc.TRANSPORT_ATTR_LOCAL_ADDR))
+                        .map(SocketAddress::toString)
+                        .ifPresent(a->timerBuilder.tag("address",a));
+            }
+            start.stop(timerBuilder.register(registry));
 
             super.close(status, trailers);
         }
@@ -69,14 +81,17 @@ static class MonitoringServerInterceptor implements ServerInterceptor, Ordered {
 
 
         private MeterRegistry registry;
+        private boolean addAddressTag;
+
 
-        public MonitoringServerInterceptor(MeterRegistry registry) {
+        public MonitoringServerInterceptor(MeterRegistry registry,boolean addAddressTag) {
             this.registry = registry;
+            this.addAddressTag = addAddressTag;
         }
 
         @Override
         public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call, Metadata headers, ServerCallHandler<ReqT, RespT> next) {
-            return next.startCall(new MonitoringServerCall<>(call,registry), headers);
+            return next.startCall(new MonitoringServerCall<>(call,registry,addAddressTag), headers);
 
         }
 
@@ -88,7 +103,11 @@ public int getOrder() {
 
     @Bean
     @GRpcGlobalInterceptor
-    public ServerInterceptor measure(MeterRegistry registry){
-        return  new MonitoringServerInterceptor(registry);
+    public ServerInterceptor measure(MeterRegistry registry, GRpcServerProperties properties){
+        final Boolean hasMultipleAddresses = Optional.ofNullable(properties.getNettyServer())
+                .map(GRpcServerProperties.NettyServerProperties::getAdditionalListenAddresses)
+                .map(l -> !l.isEmpty())
+                .orElse(false);
+        return  new MonitoringServerInterceptor(registry,hasMultipleAddresses);
     }
 }