fix

Author: zeitlinger

instrumentation/apache-dubbo-2.7/library-autoconfigure/build.gradle.kts

@@ -13,7 +13,7 @@ dependencies {
   testLibrary("org.apache.dubbo:dubbo-config-api:2.7.0")
 }
 
-tasks.withType<Test>().configureEach {
+fun Test.configureTestTask() {
   systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
   jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
   // to suppress non-fatal errors on jdk17
@@ -22,11 +22,16 @@ tasks.withType<Test>().configureEach {
   jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
 }
 
+tasks.withType<Test>().configureEach {
+  configureTestTask()
+}
+
 tasks {
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
+    configureTestTask()
     jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
   }
 

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

@@ -27,6 +27,7 @@
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.api.MiddleService;
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.HelloServiceImpl;
 import io.opentelemetry.instrumentation.apachedubbo.v2_7.impl.MiddleServiceImpl;
+import io.opentelemetry.instrumentation.api.internal.SemconvStability;
 import io.opentelemetry.instrumentation.test.utils.PortUtils;
 import io.opentelemetry.instrumentation.testing.internal.AutoCleanupExtension;
 import io.opentelemetry.instrumentation.testing.junit.InstrumentationExtension;
@@ -313,10 +314,12 @@ void testDubboChain() throws ReflectiveOperationException {
                                           attrs.add(
                                               satisfies(
                                                   SERVER_PORT, k -> k.isInstanceOf(Long.class)));
-                                          attrs.add(
-                                              satisfies(
-                                                  NETWORK_TYPE,
-                                                  AbstractDubboTest::assertNetworkType));
+                                          if (SemconvStability.emitOldRpcSemconv()) {
+                                            attrs.add(
+                                                satisfies(
+                                                    NETWORK_TYPE,
+                                                    AbstractDubboTest::assertNetworkType));
+                                          }
                                           point.hasAttributesSatisfyingExactly(attrs);
                                         },
                                         point -> {
@@ -330,10 +333,12 @@ void testDubboChain() throws ReflectiveOperationException {
                                           attrs.add(
                                               satisfies(
                                                   SERVER_PORT, k -> k.isInstanceOf(Long.class)));
-                                          attrs.add(
-                                              satisfies(
-                                                  NETWORK_TYPE,
-                                                  AbstractDubboTest::assertNetworkType));
+                                          if (SemconvStability.emitOldRpcSemconv()) {
+                                            attrs.add(
+                                                satisfies(
+                                                    NETWORK_TYPE,
+                                                    AbstractDubboTest::assertNetworkType));
+                                          }
                                           point.hasAttributesSatisfyingExactly(attrs);
                                         }))));
   }
@@ -472,10 +477,12 @@ void testDubboChainInJvm() throws ReflectiveOperationException {
                                           attrs.add(
                                               satisfies(
                                                   SERVER_PORT, k -> k.isInstanceOf(Long.class)));
-                                          attrs.add(
-                                              satisfies(
-                                                  NETWORK_TYPE,
-                                                  AbstractDubboTest::assertNetworkType));
+                                          if (SemconvStability.emitOldRpcSemconv()) {
+                                            attrs.add(
+                                                satisfies(
+                                                    NETWORK_TYPE,
+                                                    AbstractDubboTest::assertNetworkType));
+                                          }
                                           point.hasAttributesSatisfyingExactly(attrs);
                                         }))));
   }