review

Author: trask

instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java

@@ -144,11 +144,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
                                     RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
                                 equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
                                 equalTo(RPC_METHOD, "$invoke"),
-                                satisfies(
-                                    PEER_SERVICE,
-                                    k ->
-                                        k.isEqualTo(
-                                            hasPeerService() ? "test-peer-service" : null)),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"),
                                 satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
                                 satisfies(
@@ -280,11 +276,7 @@ void testApacheDubboTest()
                                     RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
                                 equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
                                 equalTo(RPC_METHOD, "$invokeAsync"),
-                                satisfies(
-                                    PEER_SERVICE,
-                                    k ->
-                                        k.isEqualTo(
-                                            hasPeerService() ? "test-peer-service" : null)),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"),
                                 satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
                                 satisfies(

instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java

@@ -186,11 +186,7 @@ void testDubboChain() throws ReflectiveOperationException {
                                     RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
                                 equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
                                 equalTo(RPC_METHOD, "$invoke"),
-                                satisfies(
-                                    PEER_SERVICE,
-                                    k ->
-                                        k.isEqualTo(
-                                            hasPeerService() ? "test-peer-service" : null)),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"),
                                 satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
                                 satisfies(
@@ -225,11 +221,7 @@ void testDubboChain() throws ReflectiveOperationException {
                                     RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
                                 equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
                                 equalTo(RPC_METHOD, "$invoke"),
-                                satisfies(
-                                    PEER_SERVICE,
-                                    k ->
-                                        k.isEqualTo(
-                                            hasPeerService() ? "test-peer-service" : null)),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"),
                                 satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
                                 satisfies(
@@ -393,11 +385,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
                                     RpcIncubatingAttributes.RpcSystemIncubatingValues.APACHE_DUBBO),
                                 equalTo(RPC_SERVICE, "org.apache.dubbo.rpc.service.GenericService"),
                                 equalTo(RPC_METHOD, "$invoke"),
-                                satisfies(
-                                    PEER_SERVICE,
-                                    k ->
-                                        k.isEqualTo(
-                                            hasPeerService() ? "test-peer-service" : null)),
+                                equalTo(PEER_SERVICE, hasPeerService() ? "test-peer-service" : null),
                                 equalTo(SERVER_ADDRESS, "localhost"),
                                 satisfies(SERVER_PORT, k -> k.isInstanceOf(Long.class)),
                                 satisfies(