Merge branch 'main' into generate-libraries-main

Author: rahul2393

.github/workflows/unmanaged_dependency_check.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0
         with:
           bom-path: google-cloud-spanner-bom/pom.xml

.kokoro/presubmit/graalvm-native-17.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.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0"
 }
 
 env_vars: {

.kokoro/presubmit/graalvm-native.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.42.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0"
 }
 
 env_vars: {

google-cloud-spanner-bom/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.43.0</version>
   </parent>
 
   <name>Google Cloud Spanner BOM</name>

google-cloud-spanner-executor/pom.xml

@@ -46,6 +46,16 @@
       <groupId>com.google.cloud.opentelemetry</groupId>
       <artifactId>exporter-trace</artifactId>
       <version>0.33.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>io.opentelemetry.semconv</groupId>
+          <artifactId>opentelemetry-semconv</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>io.opentelemetry.semconv</groupId>
+      <artifactId>opentelemetry-semconv</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.cloud</groupId>
@@ -266,7 +276,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
-            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4 </ignoredDependencies>
+            <ignoredDependencies> com.google.api:gax,org.apache.maven.surefire:surefire-junit4,io.opentelemetry.semconv:opentelemetry-semconv </ignoredDependencies>
           </configuration>
         </plugin>
       </plugins>

google-cloud-spanner/src/main/resources/META-INF/native-image/native-image.properties

@@ -1,4 +1,5 @@
 Args = --initialize-at-build-time=com.google.cloud.spanner.IntegrationTestEnv,\
   org.junit.experimental.categories.CategoryValidator,\
-  org.junit.validator.AnnotationValidator \
+  org.junit.validator.AnnotationValidator,\
+  java.lang.annotation.Annotation \
   --features=com.google.cloud.spanner.nativeimage.SpannerFeature

google-cloud-spanner/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner/native-image.properties

@@ -0,0 +1,3 @@
+Args=--initialize-at-build-time=org.junit.runner.RunWith \
+ --initialize-at-build-time=org.junit.experimental.categories.Category \
+ --initialize-at-build-time=org.junit.runners.model.FrameworkField

pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>sdk-platform-java-config</artifactId>
-    <version>3.42.0</version>
+    <version>3.43.0</version>
   </parent>
 
   <developers>