Merge branch 'main' into renovate/trace.version

sakthivelmanii · web-flow · commit 84616dec873d · 2025-05-16T14:13:59.000+05:30
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-bom</artifactId>
-      <version>1.46.0</version>
+      <version>1.50.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java b/google-cloud-spanner/src/test/java/com/google/cloud/spanner/it/ITUuidTest.java
@@ -399,7 +399,7 @@ public void uuidAsKeyParameter() {
               return null;
             });
 
-    verifyKeyContents(Arrays.asList(uuid1, uuid2));
+    verifyKeyContents(Arrays.asList(uuid2, uuid1));
   }
 
   private void verifyKeyContents(List<UUID> uuids) {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Configure the docker image for kokoro-trampoline.`
`4`	`4`	`env_vars: {`
`5`	`5`	`key: "TRAMPOLINE_IMAGE"`
`6`		`- value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.48.0" # {x-version-update:google-cloud-shared-dependencies:current}`
	`6`	`+ value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.47.0" # {x-version-update:google-cloud-shared-dependencies:current}`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`env_vars: {`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ public void uuidAsKeyParameter() {`
`399`	`399`	`return null;`
`400`	`400`	`});`
`401`	`401`
`402`		`- verifyKeyContents(Arrays.asList(uuid1, uuid2));`
	`402`	`+ verifyKeyContents(Arrays.asList(uuid2, uuid1));`
`403`	`403`	`}`
`404`	`404`
`405`	`405`	`private void verifyKeyContents(List<UUID> uuids) {`