Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into indy-migration-3

Author: SylvainJuge

benchmark-overhead-jmh/build.gradle.kts

@@ -13,7 +13,7 @@ otelJava {
 }
 
 dependencies {
-  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.5")
+  jmhImplementation("org.springframework.boot:spring-boot-starter-web:3.4.6")
 }
 
 tasks {

docs/contributing/running-tests.md

@@ -2,7 +2,7 @@
 
 ## Java versions
 
-Open Telemetry Auto Instrumentation's minimal supported version is java 8.
+OpenTelemetry Auto Instrumentation's minimal supported version is java 8.
 All jar files that we produce, unless noted otherwise, have bytecode
 compatibility with the java 8 runtime. Our test suite is executed against
 java 8, all LTS versions and the latest non-LTS version.

instrumentation/apache-httpclient/apache-httpclient-5.2/library/README.md

@@ -47,12 +47,12 @@ public class ApacheHttpClientConfiguration {
     this.openTelemetry = openTelemetry;
   }
 
-  // creates a new http client builder for constructing http clients with open telemetry instrumentation
+  // creates a new http client builder for constructing http clients with opentelemetry instrumentation
   public HttpClientBuilder createBuilder() {
     return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClientBuilder();
   }
 
-  // creates a new http client with open telemetry instrumentation
+  // creates a new http client with opentelemetry instrumentation
   public HttpClient newHttpClient() {
     return ApacheHttpClientTelemetry.builder(openTelemetry).build().newHttpClient();
   }

instrumentation/jmx-metrics/README.md

@@ -6,7 +6,7 @@ local [MBeans](https://docs.oracle.com/javase/tutorial/jmx/mbeans/index.html)
 available within the instrumented application. The required MBeans and corresponding metrics can be described using a YAML configuration file. The individual metric configurations allow precise metric selection and identification.
 
 The selected JMX metrics are reported using the Java Agent internal SDK. This means that they share the configuration and metric exporter with other metrics collected by the agent and are controlled by the same properties, for example `otel.metric.export.interval` or `otel.metrics.exporter`.
-The Open Telemetry resource description for the metrics reported by JMX Metric Insight will be the same as for other metrics exported by the SDK, while the instrumentation scope will be `io.opentelemetry.jmx`.
+The OpenTelemetry resource description for the metrics reported by JMX Metric Insight will be the same as for other metrics exported by the SDK, while the instrumentation scope will be `io.opentelemetry.jmx`.
 
 To control the time interval between MBean detection attempts, one can use the `otel.jmx.discovery.delay` property, which defines the number of milliseconds to elapse between the first and the next detection cycle. JMX Metric Insight may dynamically adjust the time interval between further attempts, but it guarantees that the MBean discovery will run perpetually.
 

instrumentation/jmx-metrics/library/src/main/java/io/opentelemetry/instrumentation/jmx/engine/MetricDef.java

@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * A class providing a complete definition on how to create an Open Telemetry metric out of the JMX
+ * A class providing a complete definition on how to create an OpenTelemetry metric out of the JMX
  * system: how to extract values from MBeans and how to model, name and decorate them with
  * attributes using OpenTelemetry Metric API. Objects of this class are immutable.
  */

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/SpringWebInstrumentationAutoConfiguration.java

@@ -18,7 +18,7 @@
 /**
  * Configures {@link RestTemplate} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to RestTemplate beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to RestTemplate beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.

instrumentation/spring/spring-boot-autoconfigure/src/main/java/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/webflux/SpringWebfluxInstrumentationAutoConfiguration.java

@@ -18,7 +18,7 @@
 /**
  * Configures {@link WebClient} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to WebClient beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to WebClient beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.

instrumentation/spring/spring-boot-autoconfigure/src/main/javaSpring3/io/opentelemetry/instrumentation/spring/autoconfigure/internal/instrumentation/web/RestClientInstrumentationAutoConfiguration.java

@@ -20,7 +20,7 @@
 /**
  * Configures {@link RestClient} for tracing.
  *
- * <p>Adds Open Telemetry instrumentation to {@link RestClient} beans after initialization.
+ * <p>Adds OpenTelemetry instrumentation to {@link RestClient} beans after initialization.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.

instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts

@@ -20,45 +20,59 @@ dependencies {
   testInstrumentation(project(":instrumentation:jdbc:javaagent"))
 }
 
+val testLatestDeps = findProperty("testLatestDeps") as Boolean
+
 testing {
   suites {
     val version3Test by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
 
-        implementation("io.vertx:vertx-web:3.0.0")
-        implementation("io.vertx:vertx-jdbc-client:3.0.0")
-        implementation("io.vertx:vertx-codegen:3.0.0")
-        implementation("io.vertx:vertx-docgen:3.0.0")
+        val version = if (testLatestDeps) "3.+" else "3.0.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
+        implementation("io.vertx:vertx-docgen:$version")
       }
     }
 
-    val latestDepTest by registering(JvmTestSuite::class) {
+    val version41Test by registering(JvmTestSuite::class) {
       dependencies {
         implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
 
-        implementation("io.vertx:vertx-web:4.+")
-        implementation("io.vertx:vertx-jdbc-client:4.+")
-        implementation("io.vertx:vertx-codegen:4.+")
+        val version = if (testLatestDeps) "4.+" else "4.1.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
+      }
+    }
+
+    val version5Test by registering(JvmTestSuite::class) {
+      dependencies {
+        implementation(project(":instrumentation:vertx:vertx-web-3.0:testing"))
+
+        val version = if (testLatestDeps) "latest.release" else "5.0.0"
+        implementation("io.vertx:vertx-web:$version")
+        implementation("io.vertx:vertx-jdbc-client:$version")
+        implementation("io.vertx:vertx-codegen:$version")
       }
     }
   }
 }
 
-val testLatestDeps = findProperty("testLatestDeps") as Boolean
-
 tasks {
-  if (testLatestDeps) {
-    // disable regular test running and compiling tasks when latest dep test task is run
-    named("test") {
+  named("compileVersion5TestJava", JavaCompile::class).configure {
+    options.release.set(11)
+  }
+  val testJavaVersion =
+    gradle.startParameter.projectProperties.get("testJavaVersion")?.let(JavaVersion::toVersion)
+      ?: JavaVersion.current()
+  if (!testJavaVersion.isCompatibleWith(JavaVersion.VERSION_11)) {
+    named("version5Test", Test::class).configure {
       enabled = false
     }
   }
 
-  named("latestDepTest") {
-    enabled = testLatestDeps
-  }
-
   check {
     dependsOn(testing.suites)
   }