Skip to content

refactor: add registry support for secure channels #18

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 7, 2021
Merged

refactor: add registry support for secure channels #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab63a91
refactor: add registry support for secure channels
aaron-steinfeld Jul 7, 2021
f9add1b
docs: finish writing javadoc comment
aaron-steinfeld Jul 7, 2021
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
36 changes: 29 additions & 7 deletions ...-client-utils/src/main/java/org/hypertrace/core/grpcutils/client/GrpcChannelRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,41 @@ public class GrpcChannelRegistry {
private final Map<String, ManagedChannel> channelMap = new ConcurrentHashMap<>();
private volatile boolean isShutdown = false;

/**
* Use either {@link #forSecureAddress(String, int)} or {@link #forPlaintextAddress(String, int)}
*/
@Deprecated
public ManagedChannel forAddress(String host, int port) {
return this.forPlaintextAddress(host, port);
}

public ManagedChannel forSecureAddress(String host, int port) {
assert !this.isShutdown;
String channelId = this.getChannelId(host, port, false);
return this.channelMap.computeIfAbsent(
channelId, unused -> this.buildNewChannel(host, port, false));
}

public ManagedChannel forPlaintextAddress(String host, int port) {
assert !this.isShutdown;
String channelId = this.getChannelId(host, port);
return this.channelMap.computeIfAbsent(channelId, unused -> this.buildNewChannel(host, port));
String channelId = this.getChannelId(host, port, true);
return this.channelMap.computeIfAbsent(
channelId, unused -> this.buildNewChannel(host, port, true));
}

private ManagedChannel buildNewChannel(String host, int port) {
LOG.info("Creating new channel for {}:{}", host, port);
return ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
private ManagedChannel buildNewChannel(String host, int port, boolean isPlaintext) {
LOG.info("Creating new channel {}", this.getChannelId(host, port, isPlaintext));

ManagedChannelBuilder<?> builder = ManagedChannelBuilder.forAddress(host, port);
if (isPlaintext) {
builder.usePlaintext();
}
return builder.build();
}

private String getChannelId(String host, int port) {
return host + ":" + port;
private String getChannelId(String host, int port, boolean isPlaintext) {
String securePrefix = isPlaintext ? "plaintext" : "secure";
return securePrefix + ":" + host + ":" + port;
}

public void shutdown() {
Expand Down
22 changes: 14 additions & 8 deletions ...ent-utils/src/test/java/org/hypertrace/core/grpcutils/client/GrpcChannelRegistryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,26 @@ void beforeEach() {

@Test
void createsNewChannelsAsRequested() {
assertNotNull(this.channelRegistry.forAddress("foo", 1000));
assertNotNull(this.channelRegistry.forPlaintextAddress("foo", 1000));
}

@Test
void reusesChannelsForDuplicateRequests() {
Channel firstChannel = this.channelRegistry.forAddress("foo", 1000);
assertSame(firstChannel, this.channelRegistry.forAddress("foo", 1000));
assertNotSame(firstChannel, this.channelRegistry.forAddress("foo", 1001));
assertNotSame(firstChannel, this.channelRegistry.forAddress("bar", 1000));
Channel firstChannel = this.channelRegistry.forPlaintextAddress("foo", 1000);
assertSame(firstChannel, this.channelRegistry.forPlaintextAddress("foo", 1000));
Channel firstChannelSecure = this.channelRegistry.forSecureAddress("foo", 1000);
assertSame(firstChannelSecure, this.channelRegistry.forSecureAddress("foo", 1000));
assertNotSame(firstChannel, firstChannelSecure);
assertNotSame(firstChannel, this.channelRegistry.forPlaintextAddress("foo", 1001));
assertNotSame(firstChannel, this.channelRegistry.forPlaintextAddress("foo", 1001));
assertNotSame(firstChannelSecure, this.channelRegistry.forSecureAddress("bar", 1000));
assertNotSame(firstChannelSecure, this.channelRegistry.forSecureAddress("bar", 1000));
}

@Test
void shutdownAllChannelsOnShutdown() {
ManagedChannel firstChannel = this.channelRegistry.forAddress("foo", 1000);
ManagedChannel secondChannel = this.channelRegistry.forAddress("foo", 1002);
ManagedChannel firstChannel = this.channelRegistry.forPlaintextAddress("foo", 1000);
ManagedChannel secondChannel = this.channelRegistry.forSecureAddress("foo", 1002);
assertFalse(firstChannel.isShutdown());
assertFalse(secondChannel.isShutdown());
this.channelRegistry.shutdown();
Expand All @@ -48,6 +53,7 @@ void shutdownAllChannelsOnShutdown() {
@Test
void throwsIfNewChannelRequestedAfterShutdown() {
this.channelRegistry.shutdown();
assertThrows(AssertionError.class, () -> this.channelRegistry.forAddress("foo", 1000));
assertThrows(AssertionError.class, () -> this.channelRegistry.forPlaintextAddress("foo", 1000));
assertThrows(AssertionError.class, () -> this.channelRegistry.forSecureAddress("foo", 1000));
}
}