Skip to content

Improve dubbo network type assertion #14717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 24, 2025
Merged

Improve dubbo network type assertion #14717

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e212a7c
Improve dubbo network type assertion
laurit Sep 19, 2025
ce191ea
Merge branch 'main' into dubbo-network-type
steverao Sep 23, 2025
309ff0a
fix failing assertion
laurit Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions instrumentation/apache-dubbo-2.7/javaagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ testing {
}

tasks.withType<Test>().configureEach {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
// to suppress non-fatal errors on jdk17
jvmArgs("--add-opens=java.base/java.math=ALL-UNNAMED")
Expand Down
36 changes: 13 additions & 23 deletions ...ng/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.apache.dubbo.config.bootstrap.DubboBootstrap;
import org.apache.dubbo.rpc.service.GenericService;
import org.assertj.core.api.AbstractAssert;
import org.assertj.core.api.AbstractStringAssert;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -153,13 +154,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
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")))),
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
span ->
span.hasName(
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService/hello")
Expand Down Expand Up @@ -227,14 +222,7 @@ void testApacheDubboBase() throws ReflectiveOperationException {
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val ->
assertThat(val).isEqualTo("ipv4"),
val ->
assertThat(val)
.isEqualTo("ipv6"))))))));
AbstractDubboTest::assertNetworkType))))));
}

@Test
Expand Down Expand Up @@ -384,13 +372,15 @@ void testApacheDubboTest()
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val ->
assertThat(val).isEqualTo("ipv4"),
val ->
assertThat(val)
.isEqualTo("ipv6"))))))));
AbstractDubboTest::assertNetworkType))))));
}

static void assertNetworkType(AbstractStringAssert<?> stringAssert) {
if (Boolean.getBoolean("testLatestDeps")) {
stringAssert.satisfiesAnyOf(
val -> assertThat(val).isEqualTo("ipv4"), val -> assertThat(val).isEqualTo("ipv6"));
} else {
stringAssert.isNull();
}
}
}
77 changes: 9 additions & 68 deletions ...n/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,7 @@ void testDubboChain() throws ReflectiveOperationException {
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")))),
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
span ->
span.hasName(
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService/hello")
Expand All @@ -217,14 +211,7 @@ void testDubboChain() throws ReflectiveOperationException {
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService"),
equalTo(RPC_METHOD, "hello"),
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val -> assertThat(val).isEqualTo("ipv4"),
val -> assertThat(val).isEqualTo("ipv6")))),
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class))),
span ->
span.hasName("org.apache.dubbo.rpc.service.GenericService/$invoke")
.hasKind(SpanKind.CLIENT)
Expand All @@ -249,13 +236,7 @@ void testDubboChain() throws ReflectiveOperationException {
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")))),
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
span ->
span.hasName(
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService/hello")
Expand All @@ -270,14 +251,7 @@ void testDubboChain() throws ReflectiveOperationException {
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.HelloService"),
equalTo(RPC_METHOD, "hello"),
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val -> assertThat(val).isEqualTo("ipv4"),
val -> assertThat(val).isEqualTo("ipv6"))))));
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)))));

testing()
.waitAndAssertMetrics(
Expand Down Expand Up @@ -339,14 +313,7 @@ void testDubboChain() throws ReflectiveOperationException {
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val ->
assertThat(val).isEqualTo("ipv4"),
val ->
assertThat(val)
.isEqualTo("ipv6")))),
AbstractDubboTest::assertNetworkType)),
point ->
point.hasAttributesSatisfyingExactly(
equalTo(
Expand All @@ -362,14 +329,7 @@ void testDubboChain() throws ReflectiveOperationException {
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val ->
assertThat(val).isEqualTo("ipv4"),
val ->
assertThat(val)
.isEqualTo("ipv6"))))))));
AbstractDubboTest::assertNetworkType))))));
}

@Test
Expand Down Expand Up @@ -445,13 +405,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
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")))),
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType)),
span ->
span.hasName(
"io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService/hello")
Expand All @@ -467,13 +421,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
equalTo(RPC_METHOD, "hello"),
satisfies(NETWORK_PEER_ADDRESS, k -> k.isInstanceOf(String.class)),
satisfies(NETWORK_PEER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val -> assertThat(val).isEqualTo("ipv4"),
val -> assertThat(val).isEqualTo("ipv6"))))));
satisfies(NETWORK_TYPE, AbstractDubboTest::assertNetworkType))));

testing()
.waitAndAssertMetrics(
Expand Down Expand Up @@ -525,13 +473,6 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
SERVER_PORT, k -> k.isInstanceOf(Long.class)),
satisfies(
NETWORK_TYPE,
k ->
k.satisfiesAnyOf(
val -> assertThat(val).isNull(),
val ->
assertThat(val).isEqualTo("ipv4"),
val ->
assertThat(val)
.isEqualTo("ipv6"))))))));
AbstractDubboTest::assertNetworkType))))));
}
}
Loading