From e62298e199867975bf694455d6ac2963588463bd Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 31 Jul 2024 15:38:26 +0100
Subject: [PATCH 1/3] Record SQS queries in DataDog.

---
 packages/server/src/sdk/app/rows/search/sqs.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts
index 5da2a7bcfb..5b743d18c6 100644
--- a/packages/server/src/sdk/app/rows/search/sqs.ts
+++ b/packages/server/src/sdk/app/rows/search/sqs.ts
@@ -43,6 +43,7 @@ import {
 } from "./filters"
 import { dataFilters, PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core"
 import { isSearchingByRowID } from "./utils"
+import tracer from "dd-trace"
 
 const builder = new sql.Sql(SqlClient.SQL_LITE)
 const MISSING_COLUMN_REGEX = new RegExp(`no such column: .+`)
@@ -225,7 +226,11 @@ async function runSqlQuery(
     }
 
     const db = context.getAppDB()
-    return await db.sql<Row>(sql, bindings)
+
+    return await tracer.trace(
+      "sqs.runSqlQuery",
+      async () => await db.sql<Row>(sql, bindings)
+    )
   }
   const response = await alias.queryWithAliasing(json, processSQLQuery)
   if (opts?.countTotalRows) {

From f0dbaa5eae0867cd8c1f109b7b24a9588b33d021 Mon Sep 17 00:00:00 2001
From: Sam Rose <hello@samwho.dev>
Date: Wed, 31 Jul 2024 15:40:54 +0100
Subject: [PATCH 2/3] Add query to span as a tag.

---
 packages/server/src/sdk/app/rows/search/sqs.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/server/src/sdk/app/rows/search/sqs.ts b/packages/server/src/sdk/app/rows/search/sqs.ts
index 5b743d18c6..8a61684020 100644
--- a/packages/server/src/sdk/app/rows/search/sqs.ts
+++ b/packages/server/src/sdk/app/rows/search/sqs.ts
@@ -227,10 +227,10 @@ async function runSqlQuery(
 
     const db = context.getAppDB()
 
-    return await tracer.trace(
-      "sqs.runSqlQuery",
-      async () => await db.sql<Row>(sql, bindings)
-    )
+    return await tracer.trace("sqs.runSqlQuery", async span => {
+      span?.addTags({ sql })
+      return await db.sql<Row>(sql, bindings)
+    })
   }
   const response = await alias.queryWithAliasing(json, processSQLQuery)
   if (opts?.countTotalRows) {

From 973f93061f7f79e71a504ea5287cf38bce40190c Mon Sep 17 00:00:00 2001
From: Budibase Staging Release Bot <>
Date: Wed, 31 Jul 2024 15:41:00 +0000
Subject: [PATCH 3/3] Bump version to 2.29.27

---
 lerna.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lerna.json b/lerna.json
index 1728208df0..e016e50225 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "2.29.26",
+  "version": "2.29.27",
   "npmClient": "yarn",
   "packages": [
     "packages/*",