Merge remote-tracking branch 'upstream/release/v2.13.x' into release-option

Author: trask

.github/workflows/build-common.yml

@@ -191,6 +191,8 @@ jobs:
         run: ./gradlew check spdxSbom -x javadoc -x spotlessCheck -PskipTests=true ${{ inputs.no-build-cache && '--no-build-cache' || '' }}
 
       - name: Check for jApiCmp diffs
+        # The jApiCmp diff compares current to latest, which isn't appropriate for release branches
+        if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') }}
         run: |
           # need to "git add" in case any generated files did not already exist
           git add docs/apidiffs

smoke-tests-otel-starter/spring-boot-3/src/test/java/io/opentelemetry/spring/smoketest/OtelSpringStarterSmokeTest.java

@@ -26,8 +26,7 @@ class OtelSpringStarterSmokeTest extends AbstractOtelSpringStarterSmokeTest {
 
   @Override
   protected void assertAdditionalMetrics() {
-    if (System.getProperty("org.graalvm.nativeimage.imagecode") != null) {
-      // GraalVM native image does not support JFR
+    if (!isFlightRecorderAvailable()) {
       return;
     }
 
@@ -50,4 +49,13 @@ protected void assertAdditionalMetrics() {
           "io.opentelemetry.runtime-telemetry-java17", metric, AbstractIterableAssert::isNotEmpty);
     }
   }
+
+  private static boolean isFlightRecorderAvailable() {
+    try {
+      return (boolean)
+          Class.forName("jdk.jfr.FlightRecorder").getMethod("isAvailable").invoke(null);
+    } catch (ReflectiveOperationException exception) {
+      return false;
+    }
+  }
 }