Remove unnecessary semconv opt-ins (open-telemetry#17213)

jaydeluca · web-flow · commit 5e9a5d9fd884 · 2026-03-29T11:12:47.000-07:00
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -81,8 +81,8 @@ tasks {
     testClassesDirs = sourceSets.test.get().output.classesDirs
     classpath = sourceSets.test.get().runtimeClasspath
 
-    jvmArgs("-Dotel.semconv-stability.opt-in=database,code")
-    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,code")
+    jvmArgs("-Dotel.semconv-stability.opt-in=database")
+    systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")
   }
 
   val testExperimental by registering(Test::class) {
diff --git a/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts b/instrumentation/opensearch/opensearch-java-3.0/javaagent/build.gradle.kts
@@ -67,8 +67,8 @@ tasks {
     filter {
       excludeTestsMatching("OpenSearchDisabledCaptureSearchQueryTest")
     }
-    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
`@@ -81,8 +81,8 @@ tasks {`
`81`	`81`	`testClassesDirs = sourceSets.test.get().output.classesDirs`
`82`	`82`	`classpath = sourceSets.test.get().runtimeClasspath`
`83`	`83`
`84`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,code")`
`85`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,code")`
	`84`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`85`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`val testExperimental by registering(Test::class) {`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ tasks {`
`67`	`67`	`filter {`
`68`	`68`	`excludeTestsMatching("OpenSearchDisabledCaptureSearchQueryTest")`
`69`	`69`	`}`
`70`		`- jvmArgs("-Dotel.semconv-stability.opt-in=database,service.peer")`
`71`		`- systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database,service.peer")`
	`70`	`+ jvmArgs("-Dotel.semconv-stability.opt-in=database")`
	`71`	`+ systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database")`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`check {`