Skip to content

Expose InternalServer as a transport attribute in ServerImpl #12668

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

Open
vlcekmilan wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Expose InternalServer as a transport attribute in ServerImpl #12668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions core/src/main/java/io/grpc/internal/ServerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@
public final class ServerImpl extends io.grpc.Server implements InternalInstrumented<ServerStats> {
private static final Logger log = Logger.getLogger(ServerImpl.class.getName());
private static final ServerStreamListener NOOP_LISTENER = new NoopListener();
static final Attributes.Key<InternalServer> TRANSPORT_SERVER_ATTR =
Attributes.Key.create("io.grpc.Grpc.TRANSPORT_ATTR_SERVER_TRANSPORT");

private final InternalLogId logId;
private final ObjectPool<? extends Executor> executorPool;
Expand Down Expand Up @@ -438,6 +440,10 @@ public Attributes transportReady(Attributes attributes) {
handshakeTimeoutFuture.cancel(false);
handshakeTimeoutFuture = null;

final Attributes.Builder builder = attributes.toBuilder();
builder.set(TRANSPORT_SERVER_ATTR, transportServer);
attributes = builder.build();

for (ServerTransportFilter filter : transportFilters) {
attributes = Preconditions.checkNotNull(filter.transportReady(attributes),
"Filter %s returned null", filter);
Expand Down
32 changes: 15 additions & 17 deletions core/src/test/java/io/grpc/internal/ServerImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,8 @@ public void transportFilters() throws Exception {
final Attributes.Key<String> key1 = Attributes.Key.create("test-key1");
final Attributes.Key<String> key2 = Attributes.Key.create("test-key2");
final Attributes.Key<String> key3 = Attributes.Key.create("test-key3");
final Attributes.Key<InternalServer> transportServerKey =
ServerImpl.TRANSPORT_SERVER_ATTR;
final AtomicReference<Attributes> filter1TerminationCallbackArgument =
new AtomicReference<>();
final AtomicReference<Attributes> filter2TerminationCallbackArgument =
Expand All @@ -732,9 +734,8 @@ public void transportFilters() throws Exception {
builder.addTransportFilter(new ServerTransportFilter() {
@Override
public Attributes transportReady(Attributes attrs) {
assertEquals(Attributes.newBuilder()
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
.build(), attrs);
assertEquals(remoteAddr, attrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
assertNotNull(attrs.get(transportServerKey));
readyCallbackCalled.incrementAndGet();
return attrs.toBuilder()
.set(key1, "yalayala")
Expand All @@ -751,11 +752,10 @@ public void transportTerminated(Attributes attrs) {
builder.addTransportFilter(new ServerTransportFilter() {
@Override
public Attributes transportReady(Attributes attrs) {
assertEquals(Attributes.newBuilder()
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
.set(key1, "yalayala")
.set(key2, "blabla")
.build(), attrs);
assertEquals(remoteAddr, attrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
assertNotNull(attrs.get(transportServerKey));
assertEquals("yalayala", attrs.get(key1));
assertEquals("blabla", attrs.get(key2));
readyCallbackCalled.incrementAndGet();
return attrs.toBuilder()
.set(key1, "ouch")
Expand All @@ -769,26 +769,24 @@ public void transportTerminated(Attributes attrs) {
filter2TerminationCallbackArgument.set(attrs);
}
});
Attributes expectedTransportAttrs = Attributes.newBuilder()
.set(key1, "ouch")
.set(key2, "blabla")
.set(key3, "puff")
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr)
.build();

createAndStartServer();
ServerTransportListener transportListener
= transportServer.registerNewServerTransport(new SimpleServerTransport());
Attributes transportAttrs = transportListener.transportReady(Attributes.newBuilder()
.set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, remoteAddr).build());

assertEquals(expectedTransportAttrs, transportAttrs);
assertEquals(remoteAddr, transportAttrs.get(Grpc.TRANSPORT_ATTR_REMOTE_ADDR));
assertNotNull(transportAttrs.get(transportServerKey));
assertEquals("ouch", transportAttrs.get(key1));
assertEquals("blabla", transportAttrs.get(key2));
assertEquals("puff", transportAttrs.get(key3));

server.shutdown();
server.awaitTermination();

assertEquals(expectedTransportAttrs, filter1TerminationCallbackArgument.get());
assertEquals(expectedTransportAttrs, filter2TerminationCallbackArgument.get());
assertEquals(transportAttrs, filter1TerminationCallbackArgument.get());
assertEquals(transportAttrs, filter2TerminationCallbackArgument.get());
assertEquals(2, readyCallbackCalled.get());
assertEquals(2, terminationCallbackCalled.get());
}
Expand Down