Remove more unused stability opt-in flags in tests (#16125)

jaydeluca · web-flow · commit c8d37f592c2b · 2026-02-09T18:53:00.000-08:00
diff --git a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts
@@ -85,8 +85,8 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-5.0/javaagent/build.gradle.kts
@@ -47,8 +47,8 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-6.4/javaagent/build.gradle.kts
@@ -45,8 +45,8 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-rest-7.0/javaagent/build.gradle.kts
@@ -50,8 +50,8 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts
@@ -42,8 +42,8 @@ tasks {
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-1.0/javaagent/build.gradle.kts
@@ -48,8 +48,8 @@ tasks {
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {
diff --git a/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-rest-3.0/javaagent/build.gradle.kts
@@ -41,8 +41,8 @@ tasks {
   val testStableSemconv by registering(Test::class) {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   check {

Original file line number	Diff line number	Diff line change
`@@ -85,8 +85,8 @@ tasks {`
`85`	`85`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`86`	`86`	`classpath = sourceSets.test.get().runtimeClasspath`
`87`	`87`
`88`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")`
`89`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")`
	`88`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`89`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ tasks {`
`47`	`47`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`48`	`48`	`classpath = sourceSets.test.get().runtimeClasspath`
`49`	`49`
`50`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")`
`51`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")`
	`50`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`51`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ tasks {`
`45`	`45`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`46`	`46`	`classpath = sourceSets.test.get().runtimeClasspath`
`47`	`47`
`48`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")`
`49`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")`
	`48`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`49`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`check {`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ tasks {`
`50`	`50`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`51`	`51`	`classpath = sourceSets.test.get().runtimeClasspath`
`52`	`52`
`53`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")`
`54`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")`
	`53`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`54`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`check {`