Added QueryStats data to Activity #339 (#346)

DarkWanderer · Jul 30, 2023 · 715d28c · 715d28c
1 parent a1b0daa
commit 715d28c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/ClickHouse.Client/ADO/ClickHouseCommand.cs b/ClickHouse.Client/ADO/ClickHouseCommand.cs
@@ -187,6 +187,7 @@ private async Task<HttpResponseMessage> PostSqlQueryAsync(string sqlQuery, Cance
         var response = await connection.HttpClient.SendAsync(postMessage, HttpCompletionOption.ResponseHeadersRead, token).ConfigureAwait(false);
         QueryId = ExtractQueryId(response);
         QueryStats = ExtractQueryStats(response);
+        activity.SetQueryStats(QueryStats);
         return await ClickHouseConnection.HandleError(response, sqlQuery, activity).ConfigureAwait(false);
     }
 

diff --git a/ClickHouse.Client/Diagnostic/ActivitySourceHelper.cs b/ClickHouse.Client/Diagnostic/ActivitySourceHelper.cs
@@ -18,6 +18,10 @@ internal static class ActivitySourceHelper
     private const string TagUser = "db.user";
     private const string TagService = "peer.service";
     private const string TagThreadId = "thread.id";
+    private const string TagReadRows = "db.clickhouse.read_rows";
+    private const string TagReadBytes = "db.clickhouse.read_bytes";
+    private const string TagWrittenRows = "db.clickhouse.written_rows";
+    private const string TagWrittenBytes = "db.clickhouse.written_bytes";
 
     internal const int StatementMaxLen = 300;
 
@@ -56,6 +60,16 @@ internal static void SetQuery(this Activity activity, string sql)
         activity.SetTag(TagDbStatement, sql);
     }
 
+    internal static void SetQueryStats(this Activity activity, QueryStats stats)
+    {
+        if (activity is null || stats is null)
+            return;
+        activity.SetTag(TagReadRows, stats.ReadRows);
+        activity.SetTag(TagReadBytes, stats.ReadBytes);
+        activity.SetTag(TagWrittenRows, stats.WrittenRows);
+        activity.SetTag(TagWrittenBytes, stats.WrittenBytes);
+    }
+
     internal static void SetSuccess(this Activity activity)
     {
 #if NET6_0_OR_GREATER