From 39baf174e513be4c99e08ca7ebce8d56da875db1 Mon Sep 17 00:00:00 2001 From: Steve Rao Date: Fri, 19 Sep 2025 13:57:48 +0800 Subject: [PATCH] Remove unimplemented attributes --- .../apachedubbo/v2_7/AbstractDubboTest.java | 58 +------------ .../v2_7/AbstractDubboTraceChainTest.java | 86 ++----------------- 2 files changed, 9 insertions(+), 135 deletions(-) diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java index 7b130b93c2..b4172671f9 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java @@ -224,33 +224,8 @@ public abstract class AbstractDubboTest { equalTo(RPC_METHOD, "$invoke"), equalTo(SERVER_ADDRESS, "localhost"), satisfies( - SERVER_PORT, k -> k.isInstanceOf(Long.class)), - satisfies( - NETWORK_PEER_ADDRESS, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(String.class))), - satisfies( - NETWORK_PEER_PORT, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(Long.class))), - satisfies( - NETWORK_TYPE, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val).isEqualTo("ipv4"), - val -> - assertThat(val) - .isEqualTo("ipv6")))))))); + SERVER_PORT, + k -> k.isInstanceOf(Long.class))))))); } @Test @@ -397,32 +372,7 @@ public abstract class AbstractDubboTest { equalTo(RPC_METHOD, "$invokeAsync"), equalTo(SERVER_ADDRESS, "localhost"), satisfies( - SERVER_PORT, k -> k.isInstanceOf(Long.class)), - satisfies( - NETWORK_PEER_ADDRESS, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(String.class))), - satisfies( - NETWORK_PEER_PORT, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(Long.class))), - satisfies( - NETWORK_TYPE, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val).isEqualTo("ipv4"), - val -> - assertThat(val) - .isEqualTo("ipv6")))))))); + SERVER_PORT, + k -> k.isInstanceOf(Long.class))))))); } } diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java index c4acd311b9..4e16bae195 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java @@ -336,33 +336,7 @@ public abstract class AbstractDubboTraceChainTest { equalTo(RPC_METHOD, "$invoke"), equalTo(SERVER_ADDRESS, "localhost"), satisfies( - SERVER_PORT, k -> k.isInstanceOf(Long.class)), - satisfies( - NETWORK_PEER_ADDRESS, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(String.class))), - satisfies( - NETWORK_PEER_PORT, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(Long.class))), - satisfies( - NETWORK_TYPE, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val).isEqualTo("ipv4"), - val -> - assertThat(val) - .isEqualTo("ipv6")))), + SERVER_PORT, k -> k.isInstanceOf(Long.class))), point -> point.hasAttributesSatisfyingExactly( equalTo( @@ -375,33 +349,8 @@ public abstract class AbstractDubboTraceChainTest { equalTo(RPC_METHOD, "$invoke"), equalTo(SERVER_ADDRESS, "localhost"), satisfies( - SERVER_PORT, k -> k.isInstanceOf(Long.class)), - satisfies( - NETWORK_PEER_ADDRESS, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(String.class))), - satisfies( - NETWORK_PEER_PORT, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(Long.class))), - satisfies( - NETWORK_TYPE, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val).isEqualTo("ipv4"), - val -> - assertThat(val) - .isEqualTo("ipv6")))))))); + SERVER_PORT, + k -> k.isInstanceOf(Long.class))))))); } @Test @@ -564,32 +513,7 @@ public abstract class AbstractDubboTraceChainTest { equalTo(RPC_METHOD, "$invoke"), equalTo(SERVER_ADDRESS, "localhost"), satisfies( - SERVER_PORT, k -> k.isInstanceOf(Long.class)), - satisfies( - NETWORK_PEER_ADDRESS, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(String.class))), - satisfies( - NETWORK_PEER_PORT, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val) - .isInstanceOf(Long.class))), - satisfies( - NETWORK_TYPE, - k -> - k.satisfiesAnyOf( - val -> assertThat(val).isNull(), - val -> - assertThat(val).isEqualTo("ipv4"), - val -> - assertThat(val) - .isEqualTo("ipv6")))))))); + SERVER_PORT, + k -> k.isInstanceOf(Long.class))))))); } }