Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add native image reflect-config.json to gax-grpc #1251

Merged
merged 12 commits into from
Jan 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .kokoro/presubmit/common.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ env_vars: {
# builds.
env_vars: {
key: "MODULES_UNDER_TEST"
value: "java-os-login,java-asset" # OS login's ITSystemTest exercises gax-java's native image
# reflect-config.json.
# Asset not required - added only as a sanity check.
value: "java-kms,java-os-login" # KMS's ITKmsTest exercises gax-java's native image
# reflect-config.json. OS Login has a similar issue.
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,13 @@ private static void loadGrpcNettyClasses(BeforeAnalysisAccess access) {
registerClassForReflection(access, "io.grpc.netty.shaded.io.netty.util.ReferenceCountUtil");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.buffer.AbstractByteBufAllocator");
registerForUnsafeFieldAccess(
access, "io.grpc.netty.shaded.io.netty.buffer.AbstractReferenceCountedByteBuf", "refCnt");
registerForUnsafeFieldAccess(
access, "io.grpc.netty.shaded.io.netty.util.AbstractReferenceCounted", "refCnt");
registerClassForReflection(access, "io.grpc.netty.shaded.io.netty.channel.DefaultFileRegion");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.channel.unix.PeerCredentials");

// Epoll Libraries
registerClassForReflection(access, "io.grpc.netty.shaded.io.netty.channel.epoll.Epoll");
Expand All @@ -89,6 +96,24 @@ private static void loadGrpcNettyClasses(BeforeAnalysisAccess access) {
access, "io.grpc.netty.shaded.io.netty.channel.epoll.EpollServerSocketChannel");
registerForReflectiveInstantiation(
access, "io.grpc.netty.shaded.io.netty.channel.epoll.EpollSocketChannel");
registerClassForReflection(
access,
"io.grpc.netty.shaded.io.netty.channel.epoll.NativeDatagramPacketArray$NativeDatagramPacket");

// tcnative
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateCallback");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.CertificateCallbackTask");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.SSLContext");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethodDecryptTask");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethodSignTask");
registerClassForReflection(
access, "io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethodTask");
registerClassForReflection(access, "io.grpc.netty.shaded.io.netty.internal.tcnative.SSLTask");

// Unsafe field accesses
registerForUnsafeFieldAccess(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Args = --initialize-at-run-time=io.grpc.netty.shaded.io.netty.handler.ssl.OpenSsl,\
Args=--add-opens=java.base/java.time=ALL-UNNAMED \
--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,\
io.grpc.netty.shaded.io.netty.internal.tcnative.SSLPrivateKeyMethod,\
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,287 @@
[
{
"name": "[B"
},
{
"name": "com.google.auth.Credentials",
"allDeclaredFields": true
},
{
"name": "com.google.auth.appengine.AppEngineCredentials"
},
{
"name": "com.google.auth.oauth2.AccessToken",
"allDeclaredFields": true
},
{
"name": "com.google.auth.oauth2.GoogleCredentials",
"allDeclaredFields": true,
"methods": [
{
"name": "getQuotaProjectId",
"parameterTypes": []
}
]
},
{
"name": "com.google.auth.oauth2.OAuth2Credentials",
"allDeclaredFields": true
},
{
"name": "com.google.auth.oauth2.OAuth2Credentials$OAuthValue",
"allDeclaredFields": true
},
{
"name": "com.google.auth.oauth2.UserCredentials",
"allDeclaredFields": true
},
{
"name": "com.google.protobuf.ExtensionRegistry",
"methods": [
{
"name": "getEmptyRegistry",
"parameterTypes": []
}
]
},
{
"name": "com.sun.crypto.provider.TlsMasterSecretGenerator",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "com.sun.jndi.dns.DnsContextFactory"
},
{
"name": "io.grpc.internal.DnsNameResolverProvider"
},
{
"name": "io.grpc.internal.JndiResourceResolverFactory",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "io.grpc.internal.PickFirstLoadBalancerProvider"
},
{
"name": "io.grpc.util.SecretRoundRobinLoadBalancerProvider$Provider",
"methods": [
{
"name": "<init>",
"parameterTypes": []
}
]
},
{
"name": "java.io.FileDescriptor"
},
{
"name": "java.lang.Exception"
},
{
"name": "java.lang.IllegalArgumentException"
},
{
"name": "java.lang.NullPointerException"
},
{
"name": "java.lang.Object",
"allDeclaredFields": true,
"queryAllDeclaredMethods": true
},
{
"name": "java.lang.OutOfMemoryError"
},
{
"name": "java.lang.String"
},
{
"name": "java.lang.Throwable",
"methods": [
{
"name": "addSuppressed",
"parameterTypes": [
"java.lang.Throwable"
]
}
]
},
{
"name": "java.nio.Bits",
"fields": [
{
"name": "UNALIGNED"
}
]
},
{
"name": "java.nio.Buffer",
"fields": [
{
"name": "address"
}
]
},
{
"name": "java.nio.ByteBuffer",
"methods": [
{
"name": "alignedSlice",
"parameterTypes": [
"int"
]
}
]
},
{
"name": "java.nio.DirectByteBuffer",
"methods": [
{
"name": "<init>",
"parameterTypes": [
"long",
"int"
]
}
]
},
{
"name": "java.nio.channels.FileChannel"
},
{
"name": "java.security.AlgorithmParametersSpi"
},
{
"name": "java.security.KeyStoreSpi"
},
{
"name": "java.security.MessageDigestSpi"
},
{
"name": "java.security.SecureRandomParameters"
},
{
"name": "java.sql.Date"
},
{
"name": "java.time.Duration",
"allDeclaredFields": true
},
{
"name": "java.util.AbstractMap",
"allDeclaredFields": true
},
{
"name": "java.util.concurrent.atomic.LongAdder",
"queryAllPublicConstructors": true,
"methods": [
{
"name": "<init>",
"parameterTypes": []
},
{
"name": "add",
"parameterTypes": [
"long"
]
},
{
"name": "sum",
"parameterTypes": []
}
]
},
{
"name": "javax.naming.directory.InitialDirContext"
},
{
"name": "javax.security.auth.x500.X500Principal",
"fields": [
{
"name": "thisX500Name"
}
],
"methods": [
{
"name": "<init>",
"parameterTypes": [
"sun.security.x509.X500Name"
]
}
]
},
{
"name": "jdk.internal.misc.Unsafe",
"methods": [
{
"name": "getUnsafe",
"parameterTypes": []
}
]
},
{
"name": "sun.misc.Unsafe",
"fields": [
{
"name": "theUnsafe"
}
],
"methods": [
{
"name": "copyMemory",
"parameterTypes": [
"java.lang.Object",
"long",
"java.lang.Object",
"long",
"long"
]
},
{
"name": "getAndAddLong",
"parameterTypes": [
"java.lang.Object",
"long",
"long"
]
},
{
"name": "getAndSetObject",
"parameterTypes": [
"java.lang.Object",
"long",
"java.lang.Object"
]
},
{
"name": "invokeCleaner",
"parameterTypes": [
"java.nio.ByteBuffer"
]
},
{
"name": "storeFence",
"parameterTypes": []
}
]
},
{
"name": "sun.nio.ch.SelectorImpl",
"fields": [
{
"name": "publicSelectedKeys"
},
{
"name": "selectedKeys"
}
]
}
]