cleanup

Author: zeitlinger

instrumentation/grpc-1.6/javaagent/build.gradle.kts

@@ -30,46 +30,37 @@ dependencies {
 
 val collectMetadata = findProperty("collectMetadata")?.toString() ?: "false"
 
+fun Test.configureTestTask() {
+  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+  // The agent context debug mechanism isn't compatible with the bridge approach which may add a
+  // gRPC context to the root.
+  jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
+  jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.client.request=some-client-key")
+  jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.server.request=some-server-key")
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
+  // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
+  jvmArgs("-Djava.net.preferIPv4Stack=true")
+
+  // exclude our grpc library instrumentation, the ContextStorageOverride contained within it
+  // breaks the tests
+  classpath = classpath.filter {
+    !it.absolutePath.contains("opentelemetry-grpc-1.6")
+  }
+
+  systemProperty("collectMetadata", collectMetadata)
+}
+
 tasks {
   test {
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-    // The agent context debug mechanism isn't compatible with the bridge approach which may add a
-    // gRPC context to the root.
-    jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.client.request=some-client-key")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.server.request=some-server-key")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-    // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
-    // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
-    jvmArgs("-Djava.net.preferIPv4Stack=true")
-
-    // exclude our grpc library instrumentation, the ContextStorageOverride contained within it
-    // breaks the tests
-    classpath = classpath.filter {
-      !it.absolutePath.contains("opentelemetry-grpc-1.6")
-    }
-
-    systemProperty("collectMetadata", collectMetadata)
+    configureTestTask()
   }
 
   val testExperimental by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    // replicated base config from standard test task
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-    jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.client.request=some-client-key")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.server.request=some-server-key")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-
-    // exclude our grpc library instrumentation, the ContextStorageOverride contained within it
-    // breaks the tests
-    classpath = classpath.filter {
-      !it.absolutePath.contains("opentelemetry-grpc-1.6")
-    }
-
-    systemProperty("collectMetadata", collectMetadata)
+    configureTestTask()
     systemProperty("metadataConfig", "otel.instrumentation.grpc.experimental-span-attributes=true")
     jvmArgs("-Dotel.instrumentation.grpc.experimental-span-attributes=true")
   }
@@ -78,25 +69,7 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    // replicated base config from standard test task
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-    // The agent context debug mechanism isn't compatible with the bridge approach which may add a
-    // gRPC context to the root.
-    jvmArgs("-Dotel.javaagent.experimental.thread-propagation-debugger.enabled=false")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.client.request=some-client-key")
-    jvmArgs("-Dotel.instrumentation.grpc.capture-metadata.server.request=some-server-key")
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-    // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
-    // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
-    jvmArgs("-Djava.net.preferIPv4Stack=true")
-
-    // exclude our grpc library instrumentation, the ContextStorageOverride contained within it
-    // breaks the tests
-    classpath = classpath.filter {
-      !it.absolutePath.contains("opentelemetry-grpc-1.6")
-    }
-
-    systemProperty("collectMetadata", collectMetadata)
+    configureTestTask()
     jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
   }
 

instrumentation/grpc-1.6/library/build.gradle.kts

@@ -16,25 +16,24 @@ dependencies {
   testImplementation(project(":instrumentation:grpc-1.6:testing"))
 }
 
+fun Test.configureTestTask() {
+  systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+  jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
+  // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
+  // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
+  jvmArgs("-Djava.net.preferIPv4Stack=true")
+}
+
 tasks {
   test {
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-    // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
-    // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
-    jvmArgs("-Djava.net.preferIPv4Stack=true")
+    configureTestTask()
   }
 
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
-    jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true")
-    // latest dep test occasionally fails because network type is ipv6 instead of the expected ipv4
-    // and peer address is 0:0:0:0:0:0:0:1 instead of 127.0.0.1
-    jvmArgs("-Djava.net.preferIPv4Stack=true")
-
+    configureTestTask()
     jvmArgs("-Dotel.semconv-stability.opt-in=rpc")
   }