Merge branch 'main' into main

Author: ghareeb-falazi

dependencyManagement/build.gradle.kts

@@ -85,10 +85,10 @@ val DEPENDENCIES = listOf(
   "io.r2dbc:r2dbc-proxy:1.1.6.RELEASE",
   "ch.qos.logback:logback-classic:1.3.16", // 1.4+ requires Java 11+
   "uk.org.webcompere:system-stubs-jupiter:2.0.3",
-  "com.uber.nullaway:nullaway:0.12.11",
+  "com.uber.nullaway:nullaway:0.12.12",
   "commons-beanutils:commons-beanutils:1.11.0",
   "commons-cli:commons-cli:1.10.0",
-  "commons-codec:commons-codec:1.19.0",
+  "commons-codec:commons-codec:1.20.0",
   "commons-collections:commons-collections:3.2.2",
   "commons-digester:commons-digester:2.1",
   "commons-fileupload:commons-fileupload:1.6.0",

docs/instrumentation-list.yaml

@@ -18,6 +18,7 @@ libraries:
     minimum_java_version: 17
     scope:
       name: io.opentelemetry.activej-http-6.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.activej:activej-http:[6.0,)
@@ -130,6 +131,7 @@ libraries:
     source_path: instrumentation/akka/akka-http-10.0
     scope:
       name: io.opentelemetry.akka-http-10.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.typesafe.akka:akka-http_2.12:[10,)
@@ -536,6 +538,7 @@ libraries:
     source_path: instrumentation/apache-httpasyncclient-4.1
     scope:
       name: io.opentelemetry.apache-httpasyncclient-4.1
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.apache.httpcomponents:httpasyncclient:[4.1,)
@@ -617,6 +620,7 @@ libraries:
     source_path: instrumentation/apache-httpclient/apache-httpclient-2.0
     scope:
       name: io.opentelemetry.apache-httpclient-2.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - commons-httpclient:commons-httpclient:[2.0,4.0)
@@ -696,6 +700,7 @@ libraries:
     source_path: instrumentation/apache-httpclient/apache-httpclient-4.0
     scope:
       name: io.opentelemetry.apache-httpclient-4.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.dropwizard:dropwizard-client:(,3.0.0)
@@ -778,6 +783,7 @@ libraries:
     source_path: instrumentation/apache-httpclient/apache-httpclient-4.3
     scope:
       name: io.opentelemetry.apache-httpclient-4.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       library:
       - org.apache.httpcomponents:httpclient:[4.3,4.+)
@@ -831,6 +837,7 @@ libraries:
     source_path: instrumentation/apache-httpclient/apache-httpclient-5.0
     scope:
       name: io.opentelemetry.apache-httpclient-5.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.apache.httpcomponents.client5:httpclient5:[5.0,)
@@ -912,6 +919,7 @@ libraries:
     source_path: instrumentation/apache-httpclient/apache-httpclient-5.2
     scope:
       name: io.opentelemetry.apache-httpclient-5.2
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       library:
       - org.apache.httpcomponents.client5:httpclient5:5.2.1
@@ -987,6 +995,7 @@ libraries:
     source_path: instrumentation/armeria/armeria-1.3
     scope:
       name: io.opentelemetry.armeria-1.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.linecorp.armeria:armeria:[1.3.0,)
@@ -1171,6 +1180,7 @@ libraries:
     source_path: instrumentation/async-http-client/async-http-client-1.9
     scope:
       name: io.opentelemetry.async-http-client-1.9
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.ning:async-http-client:[1.9.0,)
@@ -1247,6 +1257,7 @@ libraries:
     source_path: instrumentation/async-http-client/async-http-client-2.0
     scope:
       name: io.opentelemetry.async-http-client-2.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.asynchttpclient:async-http-client:[2.0.0,)
@@ -3918,6 +3929,7 @@ libraries:
     source_path: instrumentation/google-http-client-1.19
     scope:
       name: io.opentelemetry.google-http-client-1.19
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.google.http-client:google-http-client:[1.19.0,)
@@ -4117,6 +4129,7 @@ libraries:
     source_path: instrumentation/grizzly-2.3
     scope:
       name: io.opentelemetry.grizzly-2.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.glassfish.grizzly:grizzly-http:[2.3,)
@@ -4585,6 +4598,7 @@ libraries:
     minimum_java_version: 21
     scope:
       name: io.opentelemetry.helidon-4.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.helidon.webserver:helidon-webserver:[4.3.0,)
@@ -4929,6 +4943,7 @@ libraries:
     source_path: instrumentation/http-url-connection
     scope:
       name: io.opentelemetry.http-url-connection
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - Java 8+
@@ -5110,6 +5125,7 @@ libraries:
     minimum_java_version: 11
     scope:
       name: io.opentelemetry.java-http-client
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - Java 11+
@@ -5190,6 +5206,7 @@ libraries:
     source_path: instrumentation/java-http-server
     scope:
       name: io.opentelemetry.java-http-server
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - Java 8+
@@ -6074,6 +6091,7 @@ libraries:
     minimum_java_version: 11
     scope:
       name: io.opentelemetry.jetty-11.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.eclipse.jetty:jetty-server:[11, 12)
@@ -6154,6 +6172,7 @@ libraries:
     minimum_java_version: 17
     scope:
       name: io.opentelemetry.jetty-12.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.eclipse.jetty:jetty-server:[12,)
@@ -6235,6 +6254,7 @@ libraries:
     source_path: instrumentation/jetty/jetty-8.0
     scope:
       name: io.opentelemetry.jetty-8.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.eclipse.jetty:jetty-server:[8.0.0.v20110901,11)
@@ -6315,6 +6335,7 @@ libraries:
     minimum_java_version: 17
     scope:
       name: io.opentelemetry.jetty-httpclient-12.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.eclipse.jetty:jetty-client:[12,)
@@ -6397,6 +6418,7 @@ libraries:
     source_path: instrumentation/jetty-httpclient/jetty-httpclient-9.2
     scope:
       name: io.opentelemetry.jetty-httpclient-9.2
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.eclipse.jetty:jetty-client:[9.2,10)
@@ -6585,6 +6607,7 @@ libraries:
     source_path: instrumentation/jodd-http-4.2
     scope:
       name: io.opentelemetry.jodd-http-4.2
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.jodd:jodd-http:[4.2.0,)
@@ -7104,6 +7127,7 @@ libraries:
     source_path: instrumentation/netty/netty-3.8
     scope:
       name: io.opentelemetry.netty-3.8
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.netty:netty:[3.8.0.Final,4)
@@ -7197,6 +7221,7 @@ libraries:
     source_path: instrumentation/netty/netty-4.0
     scope:
       name: io.opentelemetry.netty-4.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.netty:netty-all:[4.0.0.Final,4.1.0.Final)
@@ -7300,6 +7325,7 @@ libraries:
     source_path: instrumentation/netty/netty-4.1
     scope:
       name: io.opentelemetry.netty-4.1
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.netty:netty-codec-http:[4.1.0.Final,5.0.0)
@@ -7406,6 +7432,7 @@ libraries:
     source_path: instrumentation/okhttp/okhttp-2.2
     scope:
       name: io.opentelemetry.okhttp-2.2
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.squareup.okhttp:okhttp:[2.2,3)
@@ -7452,6 +7479,7 @@ libraries:
     source_path: instrumentation/okhttp/okhttp-3.0
     scope:
       name: io.opentelemetry.okhttp-3.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.squareup.okhttp3:okhttp:[3.0,)
@@ -7978,6 +8006,7 @@ libraries:
     source_path: instrumentation/pekko/pekko-http-1.0
     scope:
       name: io.opentelemetry.pekko-http-1.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.softwaremill.sttp.tapir:tapir-pekko-http-server_3:[1.7,)
@@ -8085,6 +8114,7 @@ libraries:
     source_path: instrumentation/play/play-ws/play-ws-1.0
     scope:
       name: io.opentelemetry.play-ws-1.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.typesafe.play:play-ahc-ws-standalone_2.12:[1.0.0,2.0.0)
@@ -8132,6 +8162,7 @@ libraries:
     source_path: instrumentation/play/play-ws/play-ws-2.0
     scope:
       name: io.opentelemetry.play-ws-2.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.typesafe.play:play-ahc-ws-standalone_2.12:[2.0.0,2.1.0)
@@ -8180,6 +8211,7 @@ libraries:
     source_path: instrumentation/play/play-ws/play-ws-2.1
     scope:
       name: io.opentelemetry.play-ws-2.1
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - com.typesafe.play:play-ahc-ws-standalone_2.13:[2.1.0,]
@@ -8325,6 +8357,7 @@ libraries:
     source_path: instrumentation/reactor/reactor-netty/reactor-netty-1.0
     scope:
       name: io.opentelemetry.reactor-netty-1.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.projectreactor.netty:reactor-netty-http:[1.0.0,)
@@ -9021,6 +9054,7 @@ libraries:
     source_path: instrumentation/spring/spring-web/spring-web-3.1
     scope:
       name: io.opentelemetry.spring-web-3.1
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - org.springframework:spring-web:[3.1.0.RELEASE,6)
@@ -9129,6 +9163,7 @@ libraries:
     source_path: instrumentation/spring/spring-webflux/spring-webflux-5.3
     scope:
       name: io.opentelemetry.spring-webflux-5.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       library:
       - org.springframework:spring-webflux:5.3.0
@@ -9254,6 +9289,7 @@ libraries:
     source_path: instrumentation/spring/spring-webmvc/spring-webmvc-5.3
     scope:
       name: io.opentelemetry.spring-webmvc-5.3
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     telemetry:
     - when: default
       metrics:
@@ -9525,6 +9561,7 @@ libraries:
     source_path: instrumentation/vertx/vertx-http-client/vertx-http-client-3.0
     scope:
       name: io.opentelemetry.vertx-http-client-3.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.vertx:vertx-core:[3.0.0,4.0.0)
@@ -9565,6 +9602,7 @@ libraries:
     source_path: instrumentation/vertx/vertx-http-client/vertx-http-client-4.0
     scope:
       name: io.opentelemetry.vertx-http-client-4.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.vertx:vertx-core:[4.0.0,5)
@@ -9616,6 +9654,7 @@ libraries:
     minimum_java_version: 11
     scope:
       name: io.opentelemetry.vertx-http-client-5.0
+      schema_url: https://opentelemetry.io/schemas/1.37.0
     target_versions:
       javaagent:
       - io.vertx:vertx-core:[5.0.0,)

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpClientInstrumenterBuilder.java

@@ -31,6 +31,7 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
+import io.opentelemetry.semconv.SchemaUrls;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -245,7 +246,8 @@ public Instrumenter<REQUEST, RESPONSE> build() {
                 statusExtractorTransformer.apply(HttpSpanStatusExtractor.create(attributesGetter)))
             .addAttributesExtractor(httpAttributesExtractorBuilder.build())
             .addAttributesExtractors(additionalExtractors)
-            .addOperationMetrics(HttpClientMetrics.get());
+            .addOperationMetrics(HttpClientMetrics.get())
+            .setSchemaUrl(SchemaUrls.V1_37_0);
     if (emitExperimentalHttpClientTelemetry) {
       builder
           .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))
@@ -263,7 +265,9 @@ public Instrumenter<REQUEST, RESPONSE> build() {
   public <BUILDERREQUEST, BUILDERRESPONSE>
       InstrumenterBuilder<BUILDERREQUEST, BUILDERRESPONSE> instrumenterBuilder(
           SpanNameExtractor<? super BUILDERREQUEST> spanNameExtractor) {
-    return Instrumenter.builder(openTelemetry, instrumentationName, spanNameExtractor);
+    return Instrumenter.<BUILDERREQUEST, BUILDERRESPONSE>builder(
+            openTelemetry, instrumentationName, spanNameExtractor)
+        .setSchemaUrl(SchemaUrls.V1_37_0);
   }
 
   @CanIgnoreReturnValue

instrumentation-api-incubator/src/main/java/io/opentelemetry/instrumentation/api/incubator/builder/internal/DefaultHttpServerInstrumenterBuilder.java

@@ -26,6 +26,7 @@
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractor;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanNameExtractorBuilder;
 import io.opentelemetry.instrumentation.api.semconv.http.HttpSpanStatusExtractor;
+import io.opentelemetry.semconv.SchemaUrls;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -207,7 +208,8 @@ public InstrumenterBuilder<REQUEST, RESPONSE> instrumenterBuilder() {
             .addAttributesExtractor(httpAttributesExtractorBuilder.build())
             .addAttributesExtractors(additionalExtractors)
             .addContextCustomizer(httpServerRouteBuilder.build())
-            .addOperationMetrics(HttpServerMetrics.get());
+            .addOperationMetrics(HttpServerMetrics.get())
+            .setSchemaUrl(SchemaUrls.V1_37_0);
     if (emitExperimentalHttpServerTelemetry) {
       builder
           .addAttributesExtractor(HttpExperimentalAttributesExtractor.create(attributesGetter))