PR feedback

asweet-confluent · asweet-confluent · commit cac3159599ae · 2025-08-29T16:58:45.000-07:00
diff --git a/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesGetter.java b/instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcAttributesGetter.java
@@ -25,10 +25,12 @@ public interface RpcAttributesGetter<REQUEST> {
   @Nullable
   String getMethod(REQUEST request);
 
+  @Nullable
   default Long getRequestSize(REQUEST request) {
     return null;
   }
 
+  @Nullable
   default Long getResponseSize(REQUEST request) {
     return null;
   }
diff --git a/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java b/instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java
@@ -90,7 +90,7 @@ void collectsMetrics() {
                                 point ->
                                     point
                                         .hasSum(20 /* bytes */)
-                                        .hasAttributesSatisfying(
+                                        .hasAttributesSatisfyingExactly(
                                             equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
                                             equalTo(
                                                 RpcIncubatingAttributes.RPC_SERVICE,
@@ -118,7 +118,7 @@ void collectsMetrics() {
                                 point ->
                                     point
                                         .hasSum(10 /* bytes */)
-                                        .hasAttributesSatisfying(
+                                        .hasAttributesSatisfyingExactly(
                                             equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
                                             equalTo(
                                                 RpcIncubatingAttributes.RPC_SERVICE,
@@ -145,7 +145,7 @@ void collectsMetrics() {
                                 point ->
                                     point
                                         .hasSum(150 /* millis */)
-                                        .hasAttributesSatisfying(
+                                        .hasAttributesSatisfyingExactly(
                                             equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
                                             equalTo(
                                                 RpcIncubatingAttributes.RPC_SERVICE,
@@ -177,7 +177,7 @@ void collectsMetrics() {
                                 point ->
                                     point
                                         .hasSum(150 /* millis */)
-                                        .hasAttributesSatisfying(
+                                        .hasAttributesSatisfyingExactly(
                                             equalTo(RpcIncubatingAttributes.RPC_SYSTEM, "grpc"),
                                             equalTo(
                                                 RpcIncubatingAttributes.RPC_SERVICE,
diff --git a/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java b/instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcRpcAttributesGetter.java
@@ -44,11 +44,13 @@ public String getMethod(GrpcRequest request) {
   }
 
   @Override
+  @Nullable
   public Long getRequestSize(GrpcRequest request) {
     return request.getRequestSize();
   }
 
   @Override
+  @Nullable
   public Long getResponseSize(GrpcRequest request) {
     return request.getResponseSize();
   }

Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,12 @@ public interface RpcAttributesGetter<REQUEST> {`
`25`	`25`	`@Nullable`
`26`	`26`	`String getMethod(REQUEST request);`
`27`	`27`
	`28`	`+ @Nullable`
`28`	`29`	`default Long getRequestSize(REQUEST request) {`
`29`	`30`	`return null;`
`30`	`31`	`}`
`31`	`32`
	`33`	`+ @Nullable`
`32`	`34`	`default Long getResponseSize(REQUEST request) {`
`33`	`35`	`return null;`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,11 +44,13 @@ public String getMethod(GrpcRequest request) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
	`47`	`+ @Nullable`
`47`	`48`	`public Long getRequestSize(GrpcRequest request) {`
`48`	`49`	`return request.getRequestSize();`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Override`
	`53`	`+ @Nullable`
`52`	`54`	`public Long getResponseSize(GrpcRequest request) {`
`53`	`55`	`return request.getResponseSize();`
`54`	`56`	`}`