diff --git a/instrumentation-docs/readme.md b/instrumentation-docs/readme.md index a2ad5e537a..0bb6ba9dfe 100644 --- a/instrumentation-docs/readme.md +++ b/instrumentation-docs/readme.md @@ -24,7 +24,7 @@ tasks { ``` Sometimes instrumentation will behave differently based on configuration options, and we can -differentiate between these configurations by using the `metaDataConfig` system property. When the +differentiate between these configurations by using the `metadataConfig` system property. When the telemetry is written to a file, the value of this property will be included, or it will default to a `default` attribution. @@ -39,7 +39,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts b/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts index 5f3b242fb7..f0f6141eb0 100644 --- a/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts +++ b/instrumentation/alibaba-druid-1.0/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts b/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts index e7c30b98ce..708d2b7b1a 100644 --- a/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts +++ b/instrumentation/apache-dbcp-2.0/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts b/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts index dfed18678b..c458754170 100644 --- a/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts +++ b/instrumentation/apache-shenyu-2.4/javaagent/build.gradle.kts @@ -44,7 +44,7 @@ if (latestDepTest) { tasks.withType().configureEach { jvmArgs("-Dotel.instrumentation.apache-shenyu.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.apache-shenyu.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.apache-shenyu.experimental-span-attributes=true") systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") // required on jdk17 diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts index 1dff107ed8..31e40dd3c8 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts @@ -148,7 +148,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts index 0e73aa306f..79258da0e4 100644 --- a/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts +++ b/instrumentation/aws-sdk/aws-sdk-2.2/javaagent/build.gradle.kts @@ -222,7 +222,7 @@ tasks { systemProperty("otel.instrumentation.messaging.experimental.receive-telemetry.enabled", "true") jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts b/instrumentation/c3p0-0.9/javaagent/build.gradle.kts index c90aaa3e5c..509cd19804 100644 --- a/instrumentation/c3p0-0.9/javaagent/build.gradle.kts +++ b/instrumentation/c3p0-0.9/javaagent/build.gradle.kts @@ -28,7 +28,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts index 48326cdb97..7abc06528d 100644 --- a/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-3.0/javaagent/build.gradle.kts @@ -48,7 +48,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts index 5f015929bf..b49f63d13f 100644 --- a/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.0/javaagent/build.gradle.kts @@ -31,7 +31,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts index 0369f56772..1c9ec282a5 100644 --- a/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts +++ b/instrumentation/cassandra/cassandra-4.4/javaagent/build.gradle.kts @@ -34,7 +34,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts index cdc3663fd1..cf36f4d1d2 100644 --- a/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts +++ b/instrumentation/clickhouse-client-0.5/javaagent/build.gradle.kts @@ -33,7 +33,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) } 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 index 05506bdf79..231579a5c1 100644 --- a/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-api-client-7.16/javaagent/build.gradle.kts @@ -83,7 +83,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts index 80840ac03c..df0e3a7d4f 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.0/javaagent/build.gradle.kts @@ -59,12 +59,12 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } val testExperimental by registering(Test::class) { jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") } check { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts index 35b559b1f3..33473220b6 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts @@ -78,12 +78,12 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database,code") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } val testExperimental by registering(Test::class) { jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") } check { diff --git a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts index 3f5323c918..aa1aea8fd4 100644 --- a/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts +++ b/instrumentation/elasticsearch/elasticsearch-transport-6.0/javaagent/build.gradle.kts @@ -109,7 +109,7 @@ tasks { classpath = suite.sources.runtimeClasspath jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } } @@ -119,7 +119,7 @@ tasks { classpath = suite.sources.runtimeClasspath jvmArgs("-Dotel.instrumentation.elasticsearch.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.elasticsearch.experimental-span-attributes=true") } } diff --git a/instrumentation/finagle-http-23.11/javaagent/build.gradle.kts b/instrumentation/finagle-http-23.11/javaagent/build.gradle.kts index e399d76783..6e0b0a8e5d 100644 --- a/instrumentation/finagle-http-23.11/javaagent/build.gradle.kts +++ b/instrumentation/finagle-http-23.11/javaagent/build.gradle.kts @@ -46,6 +46,6 @@ tasks { jvmArgs("-Dotel.instrumentation.http.server.emit-experimental-telemetry=true") systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - systemProperty("metaDataConfig", "otel.instrumentation.http.client.emit-experimental-telemetry=true,otel.instrumentation.http.server.emit-experimental-telemetry=true") + systemProperty("metadataConfig", "otel.instrumentation.http.client.emit-experimental-telemetry=true,otel.instrumentation.http.server.emit-experimental-telemetry=true") } } diff --git a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts index d5262fe7f5..2ed1ce77f1 100644 --- a/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts +++ b/instrumentation/hikaricp-3.0/javaagent/build.gradle.kts @@ -29,7 +29,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts b/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts index 65d60d416e..9af1f2963c 100644 --- a/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts +++ b/instrumentation/oracle-ucp-11.2/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/oshi/javaagent/build.gradle.kts b/instrumentation/oshi/javaagent/build.gradle.kts index e8293171a9..b8bf11ee38 100644 --- a/instrumentation/oshi/javaagent/build.gradle.kts +++ b/instrumentation/oshi/javaagent/build.gradle.kts @@ -30,7 +30,7 @@ tasks { val testExperimental by registering(Test::class) { jvmArgs("-Dotel.instrumentation.oshi.experimental-metrics.enabled=true") systemProperty("testExperimental", "true") - systemProperty("metaDataConfig", "otel.instrumentation.oshi.experimental-metrics.enabled=true") + systemProperty("metadataConfig", "otel.instrumentation.oshi.experimental-metrics.enabled=true") } check { diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts index 7a937b8fc7..521afc2338 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-batch-3.0/javaagent/build.gradle.kts @@ -50,7 +50,7 @@ tasks { } systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") - systemProperty("metaDataConfig", "otel.instrumentation.spring-batch.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-batch.experimental-span-attributes=true") } check { diff --git a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts index 7fc08fb717..c6b29a6758 100644 --- a/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-data/spring-data-1.8/javaagent/build.gradle.kts @@ -57,7 +57,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts index 264aa29051..a08a119ae6 100644 --- a/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-integration-4.1/javaagent/build.gradle.kts @@ -48,7 +48,7 @@ tasks { include("**/SpringIntegrationAndRabbitTest.*") jvmArgs("-Dotel.instrumentation.rabbitmq.enabled=true") jvmArgs("-Dotel.instrumentation.spring-rabbit.enabled=true") - systemProperty("metaDataConfig", "otel.instrumentation.spring-rabbit.enabled=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-rabbit.enabled=true") } val testWithProducerInstrumentation by registering(Test::class) { @@ -59,7 +59,7 @@ tasks { jvmArgs("-Dotel.instrumentation.rabbitmq.enabled=false") jvmArgs("-Dotel.instrumentation.spring-rabbit.enabled=false") jvmArgs("-Dotel.instrumentation.spring-integration.producer.enabled=true") - systemProperty("metaDataConfig", "otel.instrumentation.spring-integration.producer.enabled=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-integration.producer.enabled=true") } test { diff --git a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts index 01bb775b4d..4ef8391b04 100644 --- a/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/javaagent/build.gradle.kts @@ -72,7 +72,7 @@ tasks { jvmArgs("-Dotel.instrumentation.kafka.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.messaging.experimental.receive-telemetry.enabled=true") - systemProperty("metaDataConfig", "otel.instrumentation.kafka.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.kafka.experimental-span-attributes=true") systemProperty("collectMetadata", collectMetadata) } diff --git a/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts index df6fb8f3ff..c120df8856 100644 --- a/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-scheduling-3.1/javaagent/build.gradle.kts @@ -31,7 +31,7 @@ tasks { val testExperimental by registering(Test::class) { jvmArgs("-Dotel.instrumentation.spring-scheduling.experimental-span-attributes=true") - systemProperty("metaDataConfig", "otel.instrumentation.spring-scheduling.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-scheduling.experimental-span-attributes=true") } } diff --git a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts index a1497b5db7..60bf1e859f 100644 --- a/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts +++ b/instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts @@ -20,6 +20,6 @@ otelJava { } tasks.test { - systemProperty("metaDataConfig", "otel.instrumentation.common.enduser.id.enabled=true,otel.instrumentation.common.enduser.role.enabled=true,otel.instrumentation.common.enduser.scope.enabled=true") + systemProperty("metadataConfig", "otel.instrumentation.common.enduser.id.enabled=true,otel.instrumentation.common.enduser.role.enabled=true,otel.instrumentation.common.enduser.scope.enabled=true") systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts index 8e0ced6f58..a1c07695dc 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/build.gradle.kts @@ -69,7 +69,7 @@ tasks.withType().configureEach { jvmArgs("-XX:+IgnoreUnrecognizedVMOptions") jvmArgs("-Dotel.instrumentation.common.experimental.controller-telemetry.enabled=true") - systemProperty("metaDataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled") + systemProperty("metadataConfig", "otel.instrumentation.common.experimental.controller-telemetry.enabled") systemProperty("testLatestDeps", latestDepTest) systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts index 21b53289f9..0c6ae9682e 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/javaagent/build.gradle.kts @@ -57,7 +57,7 @@ tasks { } val testExperimental by registering(Test::class) { - systemProperty("metaDataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") } diff --git a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts index 420a42f1eb..640dc885e1 100644 --- a/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts +++ b/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/javaagent/build.gradle.kts @@ -57,7 +57,7 @@ tasks { } val testExperimental by registering(Test::class) { - systemProperty("metaDataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") + systemProperty("metadataConfig", "otel.instrumentation.spring-webmvc.experimental-span-attributes=true") jvmArgs("-Dotel.instrumentation.spring-webmvc.experimental-span-attributes=true") } diff --git a/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts index e712e958f8..0bc199140c 100644 --- a/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts +++ b/instrumentation/tomcat/tomcat-jdbc/javaagent/build.gradle.kts @@ -23,7 +23,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts index 14b2eb7e32..64fe65fce1 100644 --- a/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-redis-client-4.0/javaagent/build.gradle.kts @@ -32,7 +32,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts index 17ec2393ae..082cd49cad 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-4.0/javaagent/build.gradle.kts @@ -39,7 +39,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts index dda436b0a7..4fa02754e0 100644 --- a/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-sql-client/vertx-sql-client-5.0/javaagent/build.gradle.kts @@ -39,7 +39,7 @@ tasks { val testStableSemconv by registering(Test::class) { jvmArgs("-Dotel.semconv-stability.opt-in=database") - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } check { diff --git a/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts b/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts index 5fd9a33e6b..f2011616fb 100644 --- a/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts +++ b/instrumentation/vibur-dbcp-11.0/javaagent/build.gradle.kts @@ -26,7 +26,7 @@ tasks { jvmArgs("-Dotel.semconv-stability.opt-in=database") systemProperty("collectMetadata", collectMetadata) - systemProperty("metaDataConfig", "otel.semconv-stability.opt-in=database") + systemProperty("metadataConfig", "otel.semconv-stability.opt-in=database") } test { diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/MetaDataCollector.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/MetaDataCollector.java index 84849d2e72..69ac56869a 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/MetaDataCollector.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/MetaDataCollector.java @@ -83,7 +83,7 @@ public final class MetaDataCollector { Paths.get(instrumentationPath, TMP_DIR, "spans-" + UUID.randomUUID() + ".yaml"); try (BufferedWriter writer = Files.newBufferedWriter(spansPath.toFile().toPath(), UTF_8)) { - String config = System.getProperty("metaDataConfig"); + String config = System.getProperty("metadataConfig"); String when = "default"; if (config != null && !config.isEmpty()) { when = config; @@ -138,7 +138,7 @@ public final class MetaDataCollector { Paths.get(instrumentationPath, TMP_DIR, "metrics-" + UUID.randomUUID() + ".yaml"); try (BufferedWriter writer = Files.newBufferedWriter(metricsPath.toFile().toPath(), UTF_8)) { - String config = System.getProperty("metaDataConfig"); + String config = System.getProperty("metadataConfig"); String when = "default"; if (config != null && !config.isEmpty()) { when = config;