{184394744} Fix missing sockpool tag in cdb2_open span

Signed-off-by: Salil Chandra <schandra107@bloomberg.net>

Author: chands10

cdb2api/cdb2api.c

@@ -3236,8 +3236,8 @@ static int typestr_type_is_default(const char *typestr)
 /* Get the sbuf of a socket matching the given type string from
  * the pool.  Returns NULL if none is available or the sbuf on
  * success. */
-static COMDB2BUF *cdb2_socket_pool_get(cdb2_hndl_tp *hndl, const char *typestr, int dbnum, int *port,
-                                       int *was_from_local_cache)
+static COMDB2BUF *cdb2_socket_pool_get_int(cdb2_hndl_tp *hndl, const char *typestr, int dbnum, int *port,
+                                           int *was_from_local_cache)
 {
     COMDB2BUF *sb = NULL;
 
@@ -3295,6 +3295,31 @@ static COMDB2BUF *cdb2_socket_pool_get(cdb2_hndl_tp *hndl, const char *typestr,
     return sb;
 }
 
+static COMDB2BUF *cdb2_socket_pool_get(cdb2_hndl_tp *hndl, const char *typestr, int dbnum, int *port,
+                                       int *was_from_local_cache)
+{
+    void *callbackrc;
+    int overwrite_rc = 0;
+    cdb2_event *e = NULL;
+    COMDB2BUF *sb = NULL;
+
+    while ((e = cdb2_next_callback(hndl, CDB2_BEFORE_SOCKPOOL, e)) != NULL) {
+        callbackrc = cdb2_invoke_callback(hndl, e, 0);
+        PROCESS_EVENT_CTRL_BEFORE(hndl, e, overwrite_rc, callbackrc, overwrite_rc);
+    }
+    if (overwrite_rc)
+        goto after_callback;
+
+    sb = cdb2_socket_pool_get_int(hndl, typestr, dbnum, port, was_from_local_cache);
+
+after_callback:
+    while ((e = cdb2_next_callback(hndl, CDB2_AFTER_SOCKPOOL, e)) != NULL) {
+        callbackrc = cdb2_invoke_callback(hndl, e, 1, CDB2_RETURN_VALUE, (intptr_t)sb);
+        PROCESS_EVENT_CTRL_AFTER(hndl, e, overwrite_rc, callbackrc);
+    }
+    return sb;
+}
+
 #ifndef CDB2API_SERVER
 static
 #endif

cdb2api/cdb2api.h

@@ -276,14 +276,16 @@ typedef enum cdb2_event_type {
     CDB2_BEFORE_TCP_CONNECT = 1 << 10,
     CDB2_AFTER_TCP_CONNECT = 1 << 11,
     CDB2_AT_RECEIVE_HEARTBEAT = 1 << 12,
+    CDB2_BEFORE_SOCKPOOL = 1 << 13,
+    CDB2_AFTER_SOCKPOOL = 1 << 14,
 
     /* Logical operation events.
        A logicial operation event typically
        consists of multiple network events. */
-    CDB2_AT_ENTER_RUN_STATEMENT = 1 << 13,
-    CDB2_AT_EXIT_RUN_STATEMENT = 1 << 14,
-    CDB2_AT_ENTER_NEXT_RECORD = 1 << 15,
-    CDB2_AT_EXIT_NEXT_RECORD = 1 << 16,
+    CDB2_AT_ENTER_RUN_STATEMENT = 1 << 20,
+    CDB2_AT_EXIT_RUN_STATEMENT = 1 << 21,
+    CDB2_AT_ENTER_NEXT_RECORD = 1 << 22,
+    CDB2_AT_EXIT_NEXT_RECORD = 1 << 23,
 
     /* Lifecycle events */
     CDB2_AFTER_HNDL_ALLOC = 1 << 26,