JCBC-2165 no channel id in EndpointConnectedEvent

Change-Id: I13a10a81b8c19d5a2576e8163fe6d6d7454d0b4b
Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/231352
Reviewed-by: David Nault <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: CosmicSaaurabh

core-io/src/main/java/com/couchbase/client/core/endpoint/BaseEndpoint.java

@@ -79,6 +79,7 @@
 import java.net.SocketAddress;
 import java.time.Duration;
 import java.util.Optional;
+import java.util.Random;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -274,6 +275,32 @@ protected SocketAddress remoteAddress() {
     return InetSocketAddress.createUnresolved(ctx.remoteSocket().host(), ctx.remoteSocket().port());
   }
 
+  /**
+   * Pad the long input into a string encoded hex value.
+   *
+   * @param input the number to format.
+   * @return the padded long hex value.
+   */
+  private static String paddedHex(long input) {
+    return String.format("%016X", input);
+  }
+
+  private static String getChannelId(Channel channel, EndpointContext endpointContext) {
+    String channelId = "0x" + channel.id().asShortText();
+
+    long convertedChannelId;
+    try {
+      convertedChannelId = channelId.equals("0xembedded") ? 1L : Long.decode(channelId);
+    } catch (NumberFormatException ex) {
+      // This is just a safeguard in place should the netty channel ID
+      // format ever change and trigger a failure of decoding the channel ID into a long
+      convertedChannelId = new Random().nextInt();
+    }
+
+    String paddedChannelId = paddedHex(convertedChannelId);
+    return paddedHex(endpointContext.id()) + "/" + paddedChannelId;
+  }
+
   /**
    * This method performs the actual connecting logic.
    *
@@ -319,6 +346,7 @@ private void reconnect() {
             @Override
             protected void initChannel(final Channel ch) {
               ChannelPipeline pipeline = ch.pipeline();
+              ch.attr(ChannelAttributes.CHANNEL_ID_KEY).set(getChannelId(ch, endpointContext));
 
               SecurityConfig config = env.securityConfig();
               if (config.tlsEnabled()) {

core-io/src/main/java/com/couchbase/client/core/io/netty/kv/FeatureNegotiatingHandler.java

@@ -37,7 +37,6 @@
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
-import java.util.Random;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
@@ -301,35 +300,11 @@ private ByteBuf buildHelloKey(final ChannelHandlerContext ctx) {
       agent = agent.substring(0, 200);
     }
     result.put("a", agent);
-
-    String channelId = "0x" + ctx.channel().id().asShortText();
-    long convertedChannelId;
-    try {
-      convertedChannelId = channelId.equals("0xembedded") ? 1L : Long.decode(channelId);
-    } catch (NumberFormatException ex) {
-      // This is just a safeguard in place should the netty channel ID
-      // format ever change and trigger a failure of decoding the channel ID into a long
-      convertedChannelId = new Random().nextInt();
-    }
-    String paddedChannelId = paddedHex(convertedChannelId);
-    String fullId = paddedHex(endpointContext.id()) + "/" + paddedChannelId;
-    result.put("i", fullId);
-
-    ctx.channel().attr(ChannelAttributes.CHANNEL_ID_KEY).set(fullId);
+    result.put("i", ctx.channel().attr(ChannelAttributes.CHANNEL_ID_KEY).get());
 
     return ctx.alloc().buffer().writeBytes(Mapper.encodeAsBytes(result));
   }
 
-  /**
-   * Pad the long input into a string encoded hex value.
-   *
-   * @param input the number to format.
-   * @return the padded long hex value.
-   */
-  private static String paddedHex(long input) {
-    return String.format("%016X", input);
-  }
-
   /**
    * If there is an exception raised while we are waiting for our connect phase to complete, the error
    * should be propagated as a cause up the pipeline.

core-io/src/test/java/com/couchbase/client/core/io/netty/kv/FeatureNegotiatingHandlerTest.java

@@ -182,7 +182,7 @@ void encodeAndSendHelloRequest(Set<ServerFeature> enabledFeatures) {
 
     assertEquals(handler, channel.pipeline().get(FeatureNegotiatingHandler.class));
     channel.connect(new InetSocketAddress("1.2.3.4", 1234));
-
+    channel.attr(ChannelAttributes.CHANNEL_ID_KEY).set("0000000000000001/0000000000000001");
     channel.pipeline().fireChannelActive();
     channel.runPendingTasks();
     ByteBuf writtenRequest = channel.readOutbound();