From 15fa73350b67d143ed5fc8f724991b29e7e02b2c Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Thu, 6 Jan 2022 15:34:24 -0800 Subject: [PATCH 1/3] netty-debug: add instrumentation to get more info for TLS and JDK vers --- api/src/main/java/io/grpc/InternalChannelz.java | 1 + .../test/java/io/grpc/netty/ProtocolNegotiatorsTest.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/api/src/main/java/io/grpc/InternalChannelz.java b/api/src/main/java/io/grpc/InternalChannelz.java index 35cbb4c2820..a19e86a4b3e 100644 --- a/api/src/main/java/io/grpc/InternalChannelz.java +++ b/api/src/main/java/io/grpc/InternalChannelz.java @@ -681,6 +681,7 @@ public Tls(SSLSession session) { Certificate localCert = null; Certificate remoteCert = null; Certificate[] localCerts = session.getLocalCertificates(); + System.err.println("session.getProtocol()=" + session.getProtocol()); if (localCerts != null) { localCert = localCerts[0]; } diff --git a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java index d333d1cc8c6..a0a746959fe 100644 --- a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java +++ b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java @@ -415,6 +415,12 @@ public void from_tls_clientAuthRequire_noClientCert() throws Exception { .trustManager(caCert) .build(); Status status = expectFailedHandshake(channelCreds, serverCreds); + System.err.println("java.version=" + System.getProperty("java.version")); + String[] enabled = engine.getEnabledProtocols(); + String[] supported = engine.getSupportedProtocols(); + System.err.println("enabled protocols=" + Arrays.toString(enabled)); + System.err.println("supported protocols=" + Arrays.toString(supported)); + status.asException().printStackTrace(); // temp - for debygging assertThat(status.getDescription()).isEqualTo("ssl exception"); } From e3e8d2e390c18e5fe645c9b8e32963dd883d667a Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Thu, 6 Jan 2022 16:00:25 -0800 Subject: [PATCH 2/3] enable kokoro test reports artifacts --- buildscripts/kokoro/macos.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/buildscripts/kokoro/macos.cfg b/buildscripts/kokoro/macos.cfg index 310e1130416..a6bf290d1ec 100644 --- a/buildscripts/kokoro/macos.cfg +++ b/buildscripts/kokoro/macos.cfg @@ -15,6 +15,7 @@ env_vars { # We always build mvn artifacts. action { define_artifacts { + regex: "github/grpc-java/**/build/reports/**" regex: "github/grpc-java/mvn-artifacts/**" } } From a8f3ad35560e4ed237fe0a6f1ef3bf496527bd5b Mon Sep 17 00:00:00 2001 From: Sanjay Pujare Date: Thu, 6 Jan 2022 16:59:02 -0800 Subject: [PATCH 3/3] more troubleshooting1 --- buildscripts/kokoro/windows.cfg | 1 + netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/buildscripts/kokoro/windows.cfg b/buildscripts/kokoro/windows.cfg index 6b2703f99c9..4b038f78525 100644 --- a/buildscripts/kokoro/windows.cfg +++ b/buildscripts/kokoro/windows.cfg @@ -8,6 +8,7 @@ timeout_mins: 45 action { define_artifacts { regex: "**/build/test-results/**/*.xml" + regex: "github/grpc-java/**/build/reports/**" regex: "github/grpc-java/mvn-artifacts/**" } } diff --git a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java index a0a746959fe..e1c81fa98f9 100644 --- a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java +++ b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java @@ -421,7 +421,7 @@ public void from_tls_clientAuthRequire_noClientCert() throws Exception { System.err.println("enabled protocols=" + Arrays.toString(enabled)); System.err.println("supported protocols=" + Arrays.toString(supported)); status.asException().printStackTrace(); // temp - for debygging - assertThat(status.getDescription()).isEqualTo("ssl exception"); + assertThat(status.getDescription()).isEqualTo("mis exception"); } @Test