less diff

Author: trask

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcClientMetricsTest.java

@@ -43,18 +43,26 @@ void collectsMetrics() {
 
     OperationListener listener = RpcClientMetrics.get().create(meterProvider.get("test"));
 
-    Attributes requestAttributes2 =
+    Attributes requestAttributes1 =
         Attributes.builder()
+            .put(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null)
             .put(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null)
             .put(RPC_SERVICE, emitOldRpcSemconv() ? "myservice.EchoService" : null)
             .put(
                 RPC_METHOD,
                 emitStableRpcSemconv() ? "myservice.EchoService/exampleMethod" : "exampleMethod")
-            .put(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null)
+            .put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10)
             .build();
 
-    Attributes requestAttributes1 =
-        requestAttributes2.toBuilder().put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10).build();
+    Attributes requestAttributes2 =
+        Attributes.builder()
+            .put(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null)
+            .put(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null)
+            .put(RPC_SERVICE, emitOldRpcSemconv() ? "myservice.EchoService" : null)
+            .put(
+                RPC_METHOD,
+                emitStableRpcSemconv() ? "myservice.EchoService/exampleMethod" : "exampleMethod")
+            .build();
 
     Attributes responseAttributes1 =
         Attributes.builder()

instrumentation-api-incubator/src/test/java/io/opentelemetry/instrumentation/api/incubator/semconv/rpc/RpcServerMetricsTest.java

@@ -44,18 +44,26 @@ void collectsMetrics() {
 
     OperationListener listener = RpcServerMetrics.get().create(meterProvider.get("test"));
 
-    Attributes requestAttributes2 =
+    Attributes requestAttributes1 =
         Attributes.builder()
             .put(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null)
             .put(RPC_SERVICE, emitOldRpcSemconv() ? "myservice.EchoService" : null)
             .put(
                 RPC_METHOD,
                 emitStableRpcSemconv() ? "myservice.EchoService/exampleMethod" : "exampleMethod")
             .put(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null)
+            .put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10)
             .build();
 
-    Attributes requestAttributes1 =
-        requestAttributes2.toBuilder().put(RpcSizeAttributesExtractor.RPC_REQUEST_SIZE, 10).build();
+    Attributes requestAttributes2 =
+        Attributes.builder()
+            .put(RPC_SYSTEM, emitOldRpcSemconv() ? "grpc" : null)
+            .put(RPC_SERVICE, emitOldRpcSemconv() ? "myservice.EchoService" : null)
+            .put(
+                RPC_METHOD,
+                emitStableRpcSemconv() ? "myservice.EchoService/exampleMethod" : "exampleMethod")
+            .put(RPC_SYSTEM_NAME, emitStableRpcSemconv() ? "grpc" : null)
+            .build();
 
     Attributes responseAttributes1 =
         Attributes.builder()