Allow optional comdb2_legacy parameter to track tag origin.

Signed-off-by: Mike Ponomarenko <mponomarenko@bloomberg.net>

Author: mponomar

db/comdb2.h

@@ -1505,6 +1505,7 @@ struct ireq {
     // in an inline call to handle_buf
     void *authdata;
     char *argv0;
+    char *origin_argv0;
     int has_ssl;
     void *setup_data;
     char *identity;

db/sltdbt.c

@@ -428,8 +428,8 @@ int handle_ireq(struct ireq *iq)
                        req2a(iq->opcode));
 
     if (!iq->sorese) /* don't count osql */
-        iq->rawnodestats =
-            get_raw_node_stats(NULL, NULL, iq->frommach, cdb2buf_fileno(iq->sb), 0 /* tag does not support ssl */);
+        iq->rawnodestats = get_raw_node_stats(iq->origin_argv0 ? iq->origin_argv0 : NULL, NULL, iq->frommach,
+                                              cdb2buf_fileno(iq->sb), 0 /* tag does not support ssl */);
     if (iq->rawnodestats && iq->opcode >= 0 && iq->opcode < MAXTYPCNT)
         iq->rawnodestats->opcode_counts[iq->opcode]++;
     if (gbl_print_deadlock_cycles && IQ_HAS_SNAPINFO(iq))

db/sql.h

@@ -1085,6 +1085,7 @@ struct sqlclntstate {
 
     // this is not an SQL request, distpatch it elsewhere
     int is_tagged;
+    char *origin_argv0;
 
     unsigned blocking_tranlog : 1;
 };

db/sqlinterfaces.c

@@ -5348,6 +5348,8 @@ void cleanup_clnt(struct sqlclntstate *clnt)
     if (clnt->modsnap_in_progress) {
         clear_modsnap_state(clnt);
     }
+    free(clnt->origin_argv0);
+    clnt->origin_argv0 = NULL;
 
     reset_authz_hash(clnt, 1);
 }

plugins/newsql/newsql_evbuffer.c

@@ -455,6 +455,7 @@ static void legacy_iq_setup(struct ireq *iq, void *setup_data)
     iq->setup_data = setup_data;
     iq->has_ssl = clnt->plugin.has_ssl(clnt);
     iq->identity = clnt->plugin.get_identity(clnt);
+    iq->origin_argv0 = clnt->origin_argv0;
     get_client_origin(iq->corigin, sizeof(iq->corigin), clnt);
 }
 
@@ -468,6 +469,12 @@ static int dispatch_tagged(struct sqlclntstate *clnt)
     p_slock = pool_getablk(p_slocks);
     Pthread_mutex_unlock(&buf_lock);
 
+    if (appdata->sqlquery == NULL || appdata->sqlquery->n_bindvars < 3 || appdata->sqlquery->bindvars[0] == NULL ||
+        appdata->sqlquery->bindvars[1] == NULL || appdata->sqlquery->bindvars[1]->value.len != sizeof(int) ||
+        appdata->sqlquery->bindvars[2] == NULL || appdata->sqlquery->bindvars[2]->value.len != sizeof(int)) {
+        return 1;
+    }
+
     void *buf = appdata->sqlquery->bindvars[0]->value.data;
     int sz = appdata->sqlquery->bindvars[0]->value.len;
 
@@ -479,10 +486,18 @@ static int dispatch_tagged(struct sqlclntstate *clnt)
     p_slock->reply_state = REPLY_STATE_NA;
 
     clnt->authdata = get_authdata(clnt);
-    if (appdata->sqlquery == NULL || appdata->sqlquery->n_bindvars < 3 || appdata->sqlquery->bindvars[0] == NULL ||
-        appdata->sqlquery->bindvars[1] == NULL || appdata->sqlquery->bindvars[1]->value.len != sizeof(int) ||
-        appdata->sqlquery->bindvars[2] == NULL || appdata->sqlquery->bindvars[2]->value.len != sizeof(int)) {
-        return 1;
+
+    if (appdata->sqlquery->n_bindvars > 3 && appdata->sqlquery->bindvars[3] &&
+        appdata->sqlquery->bindvars[3]->value.data) {
+        // note - we specifically don't override clnt->argv0 here - we want
+        // the original sender (typically the proxy) there, and we save on whose behalf we're
+        // proxying elsewhere.
+        if (clnt->origin_argv0) {
+            free(clnt->origin_argv0);
+            clnt->origin_argv0 = NULL;
+        }
+        clnt->origin_argv0 =
+            strndup((char *)appdata->sqlquery->bindvars[3]->value.data, appdata->sqlquery->bindvars[3]->value.len);
     }
 
     int luxref;