Track API history for tagged requests

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

Author: mponomar

db/api_history.c

@@ -51,7 +51,7 @@ static char *toLower(char *str)
     return str;
 }
 
-static api_driver_t *create_entry(char *api_driver_name, char *api_driver_version)
+static api_driver_t *create_entry(const char *api_driver_name, const char *api_driver_version)
 {
     const char default_value[] = "unknown";
     api_driver_t *entry = malloc(sizeof(api_driver_t));
@@ -97,13 +97,12 @@ int get_num_api_history_entries(struct rawnodestats *stats)
     return num;
 }
 
-int update_api_history(struct sqlclntstate *clnt)
+int update_api_history(struct rawnodestats *stats, const char *api_driver_name, const char *api_driver_version)
 {
-    assert(clnt && clnt->rawnodestats);
-    struct rawnodestats *stats = clnt->rawnodestats;
+    assert(stats);
 
     Pthread_mutex_lock(&stats->lk);
-    api_driver_t *search_entry = create_entry(clnt->api_driver_name, clnt->api_driver_version);
+    api_driver_t *search_entry = create_entry(api_driver_name, api_driver_version);
     api_driver_t *found_entry = hash_find(stats->api_history, search_entry);
 
     if (found_entry) {

db/api_history.h

@@ -34,6 +34,6 @@ struct rawnodestats;
 api_history_t *init_api_history();
 void free_api_history(api_history_t *);
 int get_num_api_history_entries(struct rawnodestats *);
-int update_api_history(struct sqlclntstate *);
+int update_api_history(struct rawnodestats *stats, const char *api_driver_name, const char *api_driver_version);
 
 #endif

db/comdb2.h

@@ -1511,6 +1511,8 @@ struct ireq {
     int has_ssl;
     void *setup_data;
     char *identity;
+    char *api_driver_name;
+    char *api_driver_version;
     /* REVIEW COMMENTS AT BEGINING OF STRUCT BEFORE ADDING NEW VARIABLES */
 };
 

db/reqlog.c

@@ -2381,6 +2381,10 @@ void reqlog_end_request(struct reqlogger *logger, int rc, const char *callfunc,
         norm_reqs++;
     }
 
+    if (logger->iq && !logger->clnt) {
+        update_api_history(logger->iq->rawnodestats, logger->iq->api_driver_name, logger->iq->api_driver_version);
+    }
+
     if (logger->iq && logger->iq->sorese) {
         if (gbl_time_osql)
             osql_bplog_time_done(&logger->iq->timings);

db/sltdbt.c

@@ -595,7 +595,7 @@ int handle_ireq(struct ireq *iq)
         /* Free the sorese transaction buffer */
         free(iq->p_buf_out_start);
     } else {
-        release_node_stats(NULL, NULL, iq->frommach);
+        release_node_stats(iq->origin_argv0 ? iq->origin_argv0 : NULL, NULL, iq->frommach);
     }
     reqlog_end_request(iq->reqlogger, rc, __func__, __LINE__);
     if (gbl_print_deadlock_cycles)

db/sqlinterfaces.c

@@ -1347,7 +1347,7 @@ static void sql_statement_done(struct sql_thread *thd, struct reqlogger *logger,
         if (have_fingerprint)
             add_fingerprint_to_rawstats(clnt->rawnodestats, fingerprint, cost,
                                         rows, time);
-        update_api_history(clnt);
+        update_api_history(clnt->rawnodestats, clnt->api_driver_name, clnt->api_driver_version);
     }
 
     reset_sql_steps(thd);
@@ -5283,7 +5283,7 @@ void cleanup_clnt(struct sqlclntstate *clnt)
     }
     _free_set_commands(clnt);
     if (clnt->rawnodestats) {
-        release_node_stats(clnt->argv0, clnt->stack, clnt->origin);
+        release_node_stats(clnt->origin_argv0 ? clnt->origin_argv0 : clnt->argv0, clnt->stack, clnt->origin);
         clnt->rawnodestats = NULL;
     }
     close_sp(clnt);
@@ -5444,7 +5444,7 @@ void reset_clnt(struct sqlclntstate *clnt, int initial)
     clnt_try_enable_logdel(clnt);
 
     if (clnt->rawnodestats) {
-        release_node_stats(clnt->argv0, clnt->stack, clnt->origin);
+        release_node_stats(clnt->origin_argv0 ? clnt->origin_argv0 : clnt->argv0, clnt->stack, clnt->origin);
         clnt->rawnodestats = NULL;
     }
     clnt->recno = 1;

lua/sp.c

@@ -2040,7 +2040,7 @@ static void lua_end_step(struct sqlclntstate *clnt, SP sp,
             put_ref(&sql_ref);
             if (clnt->rawnodestats) {
                 add_fingerprint_to_rawstats(clnt->rawnodestats, fingerprint, cost, pVdbe->luaRows, timeMs);
-                update_api_history(clnt);
+                update_api_history(clnt->rawnodestats, clnt->api_driver_name, clnt->api_driver_version);
             }
 
             clnt->spcost.cost += cost;

plugins/newsql/newsql.c

@@ -2449,7 +2449,7 @@ newsql_loop_result newsql_loop(struct sqlclntstate *clnt, CDB2SQLQUERY *sql_quer
     }
     if (sql_query->client_info) {
         if (clnt->rawnodestats) {
-            release_node_stats(clnt->argv0, clnt->stack, clnt->origin);
+            release_node_stats(clnt->origin_argv0 ? clnt->origin_argv0 : clnt->argv0, clnt->stack, clnt->origin);
             clnt->rawnodestats = NULL;
         }
         if (clnt->conninfo.pid && clnt->conninfo.pid != sql_query->client_info->pid) {

plugins/newsql/newsql_evbuffer.c

@@ -467,6 +467,8 @@ static void legacy_iq_setup(struct ireq *iq, void *setup_data)
     iq->has_ssl = clnt->plugin.has_ssl(clnt);
     iq->identity = clnt->plugin.get_identity(clnt);
     iq->origin_argv0 = clnt->origin_argv0;
+    iq->api_driver_name = clnt->api_driver_name;
+    iq->api_driver_version = clnt->api_driver_version;
     get_client_origin(iq->corigin, sizeof(iq->corigin), clnt);
 }