Copy over configurations from java-core/native-image-support (#384)

GoogleCloudPlatform · May 5, 2022 · ddaa9b2 · ddaa9b2
1 parent 9a0d3e0
commit ddaa9b2
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 3 deletions.
diff --git a/native-image-support/src/main/java/com/google/cloud/nativeimage/features/SpannerFeature.java b/native-image-support/src/main/java/com/google/cloud/nativeimage/features/SpannerFeature.java
@@ -20,6 +20,7 @@
 import com.oracle.svm.core.configure.ResourcesRegistry;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
+import org.graalvm.nativeimage.impl.ConfigurationCondition;
 
 /**
  * Registers Spanner library classes for reflection.
@@ -28,9 +29,57 @@
 final class SpannerFeature implements Feature {
 
   private static final String SPANNER_CLASS = "com.google.spanner.v1.SpannerGrpc";
+  private static final String SPANNER_TEST_CLASS = "com.google.cloud.spanner.GceTestEnvConfig";
+  private static final String MOCK_CLASS = "com.google.cloud.spanner.MockDatabaseAdminServiceImpl";
+  private static final String CLIENT_SIDE_IMPL_CLASS =
+          "com.google.cloud.spanner.connection.ClientSideStatementImpl";
+  private static final String CLIENT_SIDE_VALUE_CONVERTER =
+          "com.google.cloud.spanner.connection.ClientSideStatementValueConverters";
+  private static final String CONNECTION_IMPL =
+          "com.google.cloud.spanner.connection.ConnectionImpl";
+  private static final String CLIENT_SIDE_STATEMENTS =
+          "com.google.cloud.spanner.connection.ClientSideStatements";
+  private static final String CONNECTION_STATEMENT_EXECUTOR =
+          "com.google.cloud.spanner.connection.ConnectionStatementExecutor";
+  private static final String CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR =
+          "com.google.cloud.spanner.connection.ClientSideStatementNoParamExecutor";
+  private static final String CLIENT_SIDE_STATEMENT_SET_EXECUTOR =
+          "com.google.cloud.spanner.connection.ClientSideStatementSetExecutor";
+  private static final String ABSTRACT_STATEMENT_PARSER =
+          "com.google.cloud.spanner.connection.AbstractStatementParser";
+  private static final String STATEMENT_PARSER =
+          "com.google.cloud.spanner.connection.SpannerStatementParser";
 
   @Override
   public void beforeAnalysis(BeforeAnalysisAccess access) {
+    registerSpannerTestClasses(access);
+    if (access.findClassByName(CLIENT_SIDE_IMPL_CLASS) != null) {
+      NativeImageUtils.registerClassHierarchyForReflection(access, CLIENT_SIDE_IMPL_CLASS);
+    }
+    if (access.findClassByName(CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR) != null) {
+      NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENT_NO_PARAM_EXECUTOR);
+    }
+    if (access.findClassByName(CLIENT_SIDE_STATEMENT_SET_EXECUTOR) != null) {
+      NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENT_SET_EXECUTOR);
+    }
+    if (access.findClassByName(CLIENT_SIDE_VALUE_CONVERTER) != null) {
+      NativeImageUtils.registerClassHierarchyForReflection(access, CLIENT_SIDE_VALUE_CONVERTER);
+    }
+    if (access.findClassByName(CLIENT_SIDE_STATEMENTS) != null) {
+      NativeImageUtils.registerClassForReflection(access, CLIENT_SIDE_STATEMENTS);
+    }
+    if (access.findClassByName(CONNECTION_STATEMENT_EXECUTOR) != null) {
+      NativeImageUtils.registerClassForReflection(access, CONNECTION_STATEMENT_EXECUTOR);
+    }
+    if (access.findClassByName(CONNECTION_IMPL) != null) {
+      NativeImageUtils.registerClassForReflection(access, CONNECTION_IMPL);
+    }
+    if (access.findClassByName(ABSTRACT_STATEMENT_PARSER) != null) {
+      NativeImageUtils.registerClassHierarchyForReflection(access, ABSTRACT_STATEMENT_PARSER);
+    }
+    if (access.findClassByName(STATEMENT_PARSER) != null) {
+      NativeImageUtils.registerConstructorsForReflection(access, STATEMENT_PARSER);
+    }
     Class<?> spannerClass = access.findClassByName(SPANNER_CLASS);
     if (spannerClass != null) {
       NativeImageUtils.registerClassHierarchyForReflection(
@@ -43,9 +92,27 @@ public void beforeAnalysis(BeforeAnalysisAccess access) {
       // Resources
       ResourcesRegistry resourcesRegistry = ImageSingletons.lookup(ResourcesRegistry.class);
       resourcesRegistry.addResources(
+              ConfigurationCondition.alwaysTrue(),
           "\\Qcom/google/cloud/spanner/connection/ClientSideStatements.json\\E");
       resourcesRegistry.addResources(
+              ConfigurationCondition.alwaysTrue(),
           "\\Qcom/google/cloud/spanner/spi/v1/grpc-gcp-apiconfig.json\\E");
+      resourcesRegistry.addResources(
+              ConfigurationCondition.alwaysTrue(),
+              "\\Qcom/google/cloud/spanner/connection/ITSqlScriptTest_TestQueryOptions.sql\\E");
+    }
+  }
+
+
+  private void registerSpannerTestClasses(BeforeAnalysisAccess access) {
+    Class<?> spannerTestClass = access.findClassByName(SPANNER_TEST_CLASS);
+    if (spannerTestClass != null) {
+      NativeImageUtils.registerConstructorsForReflection(access, SPANNER_TEST_CLASS);
+    }
+    Class<?> mockClass = access.findClassByName(MOCK_CLASS);
+    if (mockClass != null) {
+      NativeImageUtils.registerClassForReflection(
+              access, "com.google.cloud.spanner.MockDatabaseAdminServiceImpl$MockBackup");
     }
   }
 }
diff --git a/...e-support/src/main/java/com/google/cloud/nativeimage/features/core/OpenCensusFeature.java b/...e-support/src/main/java/com/google/cloud/nativeimage/features/core/OpenCensusFeature.java
@@ -27,11 +27,15 @@
 @AutomaticFeature
 final class OpenCensusFeature implements Feature {
 
-  private static final String OPEN_CENSUS_CLASS = "io.opencensus.impl.tags.TagsComponentImpl";
+  private static final String TAGS_COMPONENT_CLASS = "io.opencensus.impl.tags.TagsComponentImpl";
+  private static final String STATS_COMPONENT_CLASS = "io.opencensus.impl.stats.StatsComponentImpl";
 
   @Override
   public void beforeAnalysis(BeforeAnalysisAccess access) {
-    if (access.findClassByName(OPEN_CENSUS_CLASS) != null) {
+    if (access.findClassByName(STATS_COMPONENT_CLASS) != null) {
+      registerForReflectiveInstantiation(access, STATS_COMPONENT_CLASS);
+    }
+    if (access.findClassByName(TAGS_COMPONENT_CLASS) != null) {
       registerForReflectiveInstantiation(
           access, "io.opencensus.impl.metrics.MetricsComponentImpl");
       registerForReflectiveInstantiation(

diff --git a/...TA-INF/native-image/com.google.cloud/google-cloud-graalvm-support/native-image.properties b/...TA-INF/native-image/com.google.cloud/google-cloud-graalvm-support/native-image.properties
@@ -1,6 +1,9 @@
 Args = --allow-incomplete-classpath \
 --enable-url-protocols=https,http \
---initialize-at-build-time=org.conscrypt \
+--initialize-at-build-time=org.conscrypt,\
+  org.slf4j.LoggerFactory,\
+  org.junit.platform.engine.TestTag,\
+  com.google.cloud.spanner.IntegrationTestEnv \
 --initialize-at-run-time=io.grpc.netty.shaded.io.netty.handler.ssl.OpenSsl,\
     io.grpc.netty.shaded.io.netty.internal.tcnative.SSL,\
     io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateVerifier,\