Add gRPC authority info to the observation context (#3510)

Add and populate the gRPC authority information in both server and client.
micrometer-metrics · Nov 3, 2022 · d2cd322 · d2cd322
1 parent bfab8fb
commit d2cd322
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 1 deletion.
diff --git a/...src/main/java/io/micrometer/core/instrument/binder/grpc/GrpcClientObservationContext.java b/...src/main/java/io/micrometer/core/instrument/binder/grpc/GrpcClientObservationContext.java
@@ -43,6 +43,8 @@ public class GrpcClientObservationContext extends RequestReplySenderContext<Meta
     @Nullable
     private Code statusCode;
 
+    private String authority;
+
     public GrpcClientObservationContext(Setter<Metadata> setter) {
         super(setter);
     }
@@ -88,4 +90,12 @@ public void setStatusCode(Code statusCode) {
         this.statusCode = statusCode;
     }
 
+    public String getAuthority() {
+        return this.authority;
+    }
+
+    public void setAuthority(String authority) {
+        this.authority = authority;
+    }
+
 }
diff --git a/...src/main/java/io/micrometer/core/instrument/binder/grpc/GrpcServerObservationContext.java b/...src/main/java/io/micrometer/core/instrument/binder/grpc/GrpcServerObservationContext.java
@@ -43,6 +43,9 @@ public class GrpcServerObservationContext extends RequestReplyReceiverContext<Me
     @Nullable
     private Code statusCode;
 
+    @Nullable
+    private String authority;
+
     public GrpcServerObservationContext(Getter<Metadata> getter) {
         super(getter);
     }
@@ -88,4 +91,13 @@ public void setStatusCode(Code statusCode) {
         this.statusCode = statusCode;
     }
 
+    @Nullable
+    public String getAuthority() {
+        return this.authority;
+    }
+
+    public void setAuthority(@Nullable String authority) {
+        this.authority = authority;
+    }
+
 }
diff --git a/...main/java/io/micrometer/core/instrument/binder/grpc/ObservationGrpcClientInterceptor.java b/...main/java/io/micrometer/core/instrument/binder/grpc/ObservationGrpcClientInterceptor.java
@@ -80,7 +80,7 @@ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(MethodDescriptor<ReqT
             }
             context.setFullMethodName(fullMethodName);
             context.setMethodType(methodType);
-
+            context.setAuthority(next.authority());
             return context;
         };
 

diff --git a/...main/java/io/micrometer/core/instrument/binder/grpc/ObservationGrpcServerInterceptor.java b/...main/java/io/micrometer/core/instrument/binder/grpc/ObservationGrpcServerInterceptor.java
@@ -83,6 +83,7 @@ public <ReqT, RespT> Listener<ReqT> interceptCall(ServerCall<ReqT, RespT> call,
             }
             context.setFullMethodName(fullMethodName);
             context.setMethodType(methodType);
+            context.setAuthority(call.getAuthority());
 
             return context;
         };

diff --git a/...ter-core/src/test/java/io/micrometer/core/instrument/binder/grpc/GrpcObservationTest.java b/...ter-core/src/test/java/io/micrometer/core/instrument/binder/grpc/GrpcObservationTest.java
@@ -400,6 +400,7 @@ void verifyServerContext(String serviceName, String methodName, String contextua
             assertThat(serverContext.getMethodName()).isEqualTo(methodName);
             assertThat(serverContext.getFullMethodName()).isEqualTo(contextualName);
             assertThat(serverContext.getMethodType()).isEqualTo(methodType);
+            assertThat(serverContext.getAuthority()).isEqualTo("localhost");
         });
     }
 
@@ -411,6 +412,7 @@ void verifyClientContext(String serviceName, String methodName, String contextua
             assertThat(clientContext.getMethodName()).isEqualTo(methodName);
             assertThat(clientContext.getFullMethodName()).isEqualTo(contextualName);
             assertThat(clientContext.getMethodType()).isEqualTo(methodType);
+            assertThat(clientContext.getAuthority()).isEqualTo("localhost");
         });
     }