OTel - Add span closure for statements

Change-Id: I3e0d6f36e2f4644466f0f32861420c74984f82b5

Author: Bogdan Degtyariov

jdbc/driver/mysql_statement.cpp

@@ -190,6 +190,7 @@ MySQL_Statement::cancel()
 /* {{{ MySQL_Statement::execute() -I- */
 bool
 MySQL_Statement::execute(const sql::SQLString& sql)
+try
 {
   CPP_ENTER("MySQL_Statement::execute");
   CPP_INFO_FMT("this=%p", this);
@@ -201,15 +202,31 @@ MySQL_Statement::execute(const sql::SQLString& sql)
     throw sql::InvalidInstanceException("Connection has been closed");
   }
   bool ret = proxy_p->field_count() > 0;
+  if (!ret)
+  {
+    // If no results the span can be ended.
+    telemetry.span_end(this);
+  }
   last_update_count = ret? UL64(~0):proxy_p->affected_rows();
   return ret;
 }
+catch (sql::SQLException &e)
+{
+  telemetry.set_error(this, e.what());
+  throw e;
+}
+catch (...)
+{
+  telemetry.set_error(this, "Unknown error in MySQL_Statement::execute");
+  throw;
+}
 /* }}} */
 
 
 /* {{{ MySQL_Statement::executeQuery() -I- */
 sql::ResultSet *
 MySQL_Statement::executeQuery(const sql::SQLString& sql)
+try
 {
   CPP_ENTER("MySQL_Statement::executeQuery");
   CPP_INFO_FMT("this=%p", this);
@@ -226,8 +243,23 @@ MySQL_Statement::executeQuery(const sql::SQLString& sql)
             logger
         );
   CPP_INFO_FMT("rset=%p", tmp);
+  if (tmp->isClosed() || tmp->rowsCount() == 0)
+  {
+    // Close span if the result set is closed or empty
+    telemetry.span_end(this);
+  }
   return tmp;
 }
+catch (sql::SQLException &e)
+{
+  telemetry.set_error(this, e.what());
+  throw e;
+}
+catch (...)
+{
+  telemetry.set_error(this, "Unknown error in MySQL_Statement::executeQuery");
+  throw;
+}
 /* }}} */
 
 
@@ -243,6 +275,7 @@ dirty_drop_rs(std::shared_ptr< NativeAPI::NativeConnectionWrapper > proxy)
 /* {{{ MySQL_Statement::executeUpdate() -I- */
 int
 MySQL_Statement::executeUpdate(const sql::SQLString& sql)
+try
 {
   CPP_ENTER("MySQL_Statement::executeUpdate");
   CPP_INFO_FMT("this=%p", this);
@@ -272,6 +305,7 @@ MySQL_Statement::executeUpdate(const sql::SQLString& sql)
       if (got_rs){
         throw sql::InvalidArgumentException("Statement returning result set");
       } else {
+        telemetry.span_end(this);
         return static_cast<int>(last_update_count);
       }
     }
@@ -289,8 +323,20 @@ MySQL_Statement::executeUpdate(const sql::SQLString& sql)
   } while (1);
 
   /* Should not actually get here*/
+  telemetry.span_end(this);
   return 0;
 }
+catch (sql::SQLException &e)
+{
+  telemetry.set_error(this, e.what());
+  throw e;
+}
+catch (...)
+{
+  telemetry.set_error(this, "Unknown error in MySQL_Statement::executeUpdate");
+  throw;
+}
+
 /* }}} */
 
 
@@ -322,6 +368,7 @@ MySQL_Statement::getFetchSize()
 /* {{{ MySQL_Statement::getResultSet() -I- */
 sql::ResultSet *
 MySQL_Statement::getResultSet()
+try
 {
   CPP_ENTER("MySQL_Statement::getResultSet");
   CPP_INFO_FMT("this=%p", this);
@@ -365,12 +412,15 @@ MySQL_Statement::getResultSet()
     }
     else
     {
+      // End span for NULL resultset
+      telemetry.span_end(this);
       return NULL;
     }
   }
 
   if (!result) {
     /* if there was an update then this method should return NULL and not throw */
+    telemetry.span_end(this);
     return NULL;
   }
 
@@ -379,6 +429,17 @@ MySQL_Statement::getResultSet()
   CPP_INFO_FMT("res=%p", ret);
   return ret;
 }
+catch (sql::SQLException &e)
+{
+  telemetry.set_error(this, e.what());
+  throw e;
+}
+catch (...)
+{
+  telemetry.set_error(this, "Unknown error in MySQL_Statement::getResultSet");
+  throw;
+}
+
 /* }}} */
 
 
@@ -460,6 +521,7 @@ MySQL_Statement::getMaxRows()
 /* {{{ MySQL_Statement::getMoreResults() -I- */
 bool
 MySQL_Statement::getMoreResults()
+try
 {
   CPP_ENTER("MySQL_Statement::getMoreResults");
   CPP_INFO_FMT("this=%p", this);
@@ -486,8 +548,21 @@ MySQL_Statement::getMoreResults()
       throw sql::SQLException("Impossible! more_results() said true, next_result says no more results");
     }
   }
+  // If no more results close the statement span
+  telemetry.span_end(this);
   return false;
 }
+catch (sql::SQLException &e)
+{
+  telemetry.set_error(this, e.what());
+  throw e;
+}
+catch (...)
+{
+  telemetry.set_error(this, "Unknown error in MySQL_Statement::getMoreResults");
+  throw;
+}
+
 /* }}} */
 
 

jdbc/driver/mysql_telemetry.cpp

@@ -117,6 +117,6 @@ namespace telemetry
     return span;
   }
 
-}
-}
-}
+} // telemetry
+} // mysql
+} // sql

jdbc/driver/mysql_telemetry.h

@@ -108,6 +108,7 @@ namespace mysql
 #ifndef TELEMETRY
 
       static void span_start(Obj*) {}
+      static void span_end(Obj*) {}
       static void set_error(Obj*, std::string) {}
 
 #else
@@ -122,6 +123,18 @@ namespace mysql
         span = Base::mk_span(obj);  
       }
 
+      
+      void span_end(Obj *obj)
+      {
+        if (!span)
+          return;
+        span->End();
+        // Destroy span just in case
+        Span_ptr sink;
+        span.swap(sink);
+      }
+
+
       void set_error(Obj *obj, std::string msg)
       {
         if (Base::disabled(obj))