Merge branch 'main' into zhaez/merge-releases

Author: ezhang6811

.github/patches/opentelemetry-java-instrumentation.patch

@@ -11,6 +11,20 @@ index 98def282f8..65fd6a8a13 100644
    "io.opentelemetry.contrib:opentelemetry-gcp-resources:${otelContribVersion}",
    "io.opentelemetry.contrib:opentelemetry-cloudfoundry-resources:${otelContribVersion}",
    "io.opentelemetry.contrib:opentelemetry-baggage-processor:${otelContribVersion}",
+diff --git a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
+index 1234567890..abcdef1234 100644
+--- a/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
++++ b/instrumentation/jmx-metrics/library/src/test/java/io/opentelemetry/instrumentation/jmx/rules/TomcatIntegrationTest.java
+@@ -20,8 +20,8 @@ public class TomcatIntegrationTest extends TargetSystemTest {
+ 
+   @ParameterizedTest
+   @CsvSource({
++    // TODO: Remove this patch after we no longer depend on 2.18.1 of opentelemetry-java-instrumentation.
+     "tomcat:10.0, https://tomcat.apache.org/tomcat-10.0-doc/appdev/sample/sample.war",
+-    "tomcat:9.0, https://tomcat.apache.org/tomcat-9.0-doc/appdev/sample/sample.war"
+   })
+   void testCollectedMetrics(String dockerImageName, String sampleWebApplicationUrl)
+       throws Exception {
 diff --git a/version.gradle.kts b/version.gradle.kts
 index 023d04703c..ec9690086c 100644
 --- a/version.gradle.kts
@@ -25,4 +39,3 @@ index 023d04703c..ec9690086c 100644
    if (findProperty("otel.stable") != "true") {
 -- 
 2.45.1
-