more

trask · trask · commit 13f379a9b80e · 2025-10-16T11:22:06.000-07:00
diff --git a/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts b/instrumentation/akka/akka-http-10.0/javaagent/build.gradle.kts
@@ -66,6 +66,7 @@ tasks {
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
   }
 
   check {
diff --git a/instrumentation/armeria/armeria-1.3/javaagent/build.gradle.kts b/instrumentation/armeria/armeria-1.3/javaagent/build.gradle.kts
@@ -28,5 +28,6 @@ tasks {
   withType<Test>().configureEach {
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
   }
 }
diff --git a/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts b/instrumentation/ktor/ktor-2.0/javaagent/build.gradle.kts
@@ -59,3 +59,9 @@ kotlin {
     javaParameters = true
   }
 }
+
+tasks {
+  withType<Test>().configureEach {
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
+  }
+}
diff --git a/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts b/instrumentation/ktor/ktor-3.0/javaagent/build.gradle.kts
@@ -54,3 +54,9 @@ kotlin {
     javaParameters = true
   }
 }
+
+tasks {
+  withType<Test>().configureEach {
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
+  }
+}
diff --git a/instrumentation/kubernetes-client-7.0/javaagent/build.gradle.kts b/instrumentation/kubernetes-client-7.0/javaagent/build.gradle.kts
@@ -42,5 +42,4 @@ tasks {
 tasks.withType<Test>().configureEach {
   // TODO run tests both with and without experimental span attributes
   jvmArgs("-Dotel.instrumentation.kubernetes-client.experimental-span-attributes=true")
-  systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
 }
diff --git a/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts b/instrumentation/pekko/pekko-http-1.0/javaagent/build.gradle.kts
@@ -93,6 +93,7 @@ tasks {
 
     systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
+    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
   }
 
   check {
diff --git a/instrumentation/play/play-ws/play-ws-1.0/javaagent/build.gradle.kts b/instrumentation/play/play-ws/play-ws-1.0/javaagent/build.gradle.kts
@@ -43,6 +43,5 @@ dependencies {
 tasks {
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
   }
 }
diff --git a/instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts b/instrumentation/play/play-ws/play-ws-2.1/javaagent/build.gradle.kts
@@ -69,7 +69,6 @@ tasks {
 
   test {
     systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")
-    systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")
   }
 
   check {

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ tasks {`
`66`	`66`
`67`	`67`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`68`	`68`	`systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")`
	`69`	`+ systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,6 @@ tasks {`
`28`	`28`	`withType<Test>().configureEach {`
`29`	`29`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`30`	`30`	`systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")`
	`31`	`+ systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`31`	`32`	`}`
`32`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,3 +59,9 @@ kotlin {`
`59`	`59`	`javaParameters = true`
`60`	`60`	`}`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+tasks {`
	`64`	`+ withType<Test>().configureEach {`
	`65`	`+ systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
	`66`	`+ }`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -54,3 +54,9 @@ kotlin {`
`54`	`54`	`javaParameters = true`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+`
	`58`	`+tasks {`
	`59`	`+ withType<Test>().configureEach {`
	`60`	`+ systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
	`61`	`+ }`
	`62`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,4 @@ tasks {`
`42`	`42`	`tasks.withType<Test>().configureEach {`
`43`	`43`	`// TODO run tests both with and without experimental span attributes`
`44`	`44`	`jvmArgs("-Dotel.instrumentation.kubernetes-client.experimental-span-attributes=true")`
`45`		`- systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ tasks {`
`93`	`93`
`94`	`94`	`systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)`
`95`	`95`	`systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")`
	`96`	`+ systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`96`	`97`	`}`
`97`	`98`
`98`	`99`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,5 @@ dependencies {`
`43`	`43`	`tasks {`
`44`	`44`	`test {`
`45`	`45`	`systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")`
`46`		`- systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`47`	`46`	`}`
`48`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ tasks {`
`69`	`69`
`70`	`70`	`test {`
`71`	`71`	`systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false")`
`72`		`- systemProperty("otel.instrumentation.common.peer-service-mapping", "127.0.0.1=test-peer-service,localhost=test-peer-service,192.0.2.1=test-peer-service")`
`73`	`72`	`}`
`74`	`73`
`75`	`74`	`check {`