@teamkeel/functions-runtime 0.318.0 → 0.318.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.318.0",
+  "version": "0.318.2",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "src/index.js",
   "scripts": {
@@ -15,12 +15,15 @@
     "access": "public"
   },
   "devDependencies": {
-    "@opentelemetry/sdk-trace-node": "^1.12.0",
     "prettier": "2.7.1",
     "vitest": "^0.27.1"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.4.1",
+    "@opentelemetry/exporter-trace-otlp-proto": "^0.38.0",
+    "@opentelemetry/resources": "^1.12.0",
+    "@opentelemetry/sdk-trace-base": "^1.12.0",
+    "@opentelemetry/sdk-trace-node": "^1.12.0",
     "change-case": "^4.1.2",
     "json-rpc-2.0": "^1.4.1",
     "ksuid": "^3.0.0",

package/pnpm-lock.yaml

@@ -2,6 +2,9 @@ lockfileVersion: 5.4
 
 specifiers:
   '@opentelemetry/api': ^1.4.1
+  '@opentelemetry/exporter-trace-otlp-proto': ^0.38.0
+  '@opentelemetry/resources': ^1.12.0
+  '@opentelemetry/sdk-trace-base': ^1.12.0
   '@opentelemetry/sdk-trace-node': ^1.12.0
   change-case: ^4.1.2
   json-rpc-2.0: ^1.4.1
@@ -13,6 +16,10 @@ specifiers:
 
 dependencies:
   '@opentelemetry/api': 1.4.1
+  '@opentelemetry/exporter-trace-otlp-proto': 0.38.0_@opentelemetry+api@1.4.1
+  '@opentelemetry/resources': 1.12.0_@opentelemetry+api@1.4.1
+  '@opentelemetry/sdk-trace-base': 1.12.0_@opentelemetry+api@1.4.1
+  '@opentelemetry/sdk-trace-node': 1.12.0_@opentelemetry+api@1.4.1
   change-case: 4.1.2
   json-rpc-2.0: 1.4.2
   ksuid: 3.0.0
@@ -20,7 +27,6 @@ dependencies:
   pg: 8.8.0
 
 devDependencies:
-  '@opentelemetry/sdk-trace-node': 1.12.0_@opentelemetry+api@1.4.1
   prettier: 2.7.1
   vitest: 0.27.1
 
@@ -227,6 +233,7 @@ packages:
   /@opentelemetry/api/1.4.1:
     resolution: {integrity: sha512-O2yRJce1GOc6PAy3QxFM4NzFiWzvScDC1/5ihYBL6BUEVdq0XMWN01sppE+H6bBXbaFYipjwFLEWLg5PaSOThA==}
     engines: {node: '>=8.0.0'}
+    dev: false
 
   /@opentelemetry/context-async-hooks/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-PmwAanPNWCyS9JYFzhzVzHgviLhc0UHjOwdth+hp3HgQQ9XZZNE635P8JhAUHZmbghW9/qQFafRWOS4VN9VVnQ==}
@@ -235,7 +242,7 @@ packages:
       '@opentelemetry/api': '>=1.0.0 <1.5.0'
     dependencies:
       '@opentelemetry/api': 1.4.1
-    dev: true
+    dev: false
 
   /@opentelemetry/core/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-4DWYNb3dLs2mSCGl65jY3aEgbvPWSHVQV/dmDWiYeWUrMakZQFcymqZOSUNZO0uDrEJoxMu8O5tZktX6UKFwag==}
@@ -245,7 +252,57 @@ packages:
     dependencies:
       '@opentelemetry/api': 1.4.1
       '@opentelemetry/semantic-conventions': 1.12.0
-    dev: true
+    dev: false
+
+  /@opentelemetry/exporter-trace-otlp-proto/0.38.0_@opentelemetry+api@1.4.1:
+    resolution: {integrity: sha512-M1YctP+T6485noDAJPsnpsx85xsfqyCr06CadTQBJHIgjStgsKTDA86iVpv7XEqW5lwdIThn/boDou2vyi0bQA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+    dependencies:
+      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/otlp-exporter-base': 0.38.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/otlp-proto-exporter-base': 0.38.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/otlp-transformer': 0.38.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/resources': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/sdk-trace-base': 1.12.0_@opentelemetry+api@1.4.1
+    dev: false
+
+  /@opentelemetry/otlp-exporter-base/0.38.0_@opentelemetry+api@1.4.1:
+    resolution: {integrity: sha512-VWQo7vUDyW/7/FT8RErAtM/29i/fllCc9xMtnK7kDuheAjJU68zrZ88bQOsLamHvOCU3KVpozjfTZVxZKQRYXw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+    dependencies:
+      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
+    dev: false
+
+  /@opentelemetry/otlp-proto-exporter-base/0.38.0_@opentelemetry+api@1.4.1:
+    resolution: {integrity: sha512-/Z68pIgFv+IwQQfJOJQ9ga7KZ5ET2cFAnpWO9JsxrHjW9glmX+T9RgcF7rfSAFl2JSM9A+kQ11WYRjE2tNKxqg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.0.0
+    dependencies:
+      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/otlp-exporter-base': 0.38.0_@opentelemetry+api@1.4.1
+      protobufjs: 7.2.3
+    dev: false
+
+  /@opentelemetry/otlp-transformer/0.38.0_@opentelemetry+api@1.4.1:
+    resolution: {integrity: sha512-ykQEipby0NVSi2ih5E8J2GNJ6y9zYDPSef0nD8j33XPKxfyVG5184rUrCsh6TIk1d/GlYl8gB9Wy4TdRvwl6kA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.5.0'
+    dependencies:
+      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/resources': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/sdk-metrics': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/sdk-trace-base': 1.12.0_@opentelemetry+api@1.4.1
+    dev: false
 
   /@opentelemetry/propagator-b3/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-WFcn98075QPc2zE1obhKydJHUehI5/HuLoelPEVwATj+487hjCwjHj9r2fgmQkWpvuNSB7CJaA0ys6qqq1N6lg==}
@@ -255,7 +312,7 @@ packages:
     dependencies:
       '@opentelemetry/api': 1.4.1
       '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
-    dev: true
+    dev: false
 
   /@opentelemetry/propagator-jaeger/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-ugtWF7GC6X5RIJ0+iMwW2iVAGNs206CAeq8XQ8OkJRg+v0lp4H0/i+gJ4hubTT8NIL5a3IxtIrAENPLIGdLucQ==}
@@ -265,7 +322,7 @@ packages:
     dependencies:
       '@opentelemetry/api': 1.4.1
       '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
-    dev: true
+    dev: false
 
   /@opentelemetry/resources/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-gunMKXG0hJrR0LXrqh7BVbziA/+iJBL3ZbXCXO64uY+SrExkwoyJkpiq9l5ismkGF/A20mDEV7tGwh+KyPw00Q==}
@@ -276,7 +333,19 @@ packages:
       '@opentelemetry/api': 1.4.1
       '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
       '@opentelemetry/semantic-conventions': 1.12.0
-    dev: true
+    dev: false
+
+  /@opentelemetry/sdk-metrics/1.12.0_@opentelemetry+api@1.4.1:
+    resolution: {integrity: sha512-zOy88Jfk88eTxqu+9ypHLs184dGydJocSWtvWMY10QKVVaxhC3SLKa0uxI/zBtD9S+x0LP65wxrTSfSoUNtCOA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.3.0 <1.5.0'
+    dependencies:
+      '@opentelemetry/api': 1.4.1
+      '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
+      '@opentelemetry/resources': 1.12.0_@opentelemetry+api@1.4.1
+      lodash.merge: 4.6.2
+    dev: false
 
   /@opentelemetry/sdk-trace-base/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-pfCOB3tNDlYVoWuz4D7Ji+Jmy9MHnATWHVpkERdCEiwUGEZ+4IvNPXUcPc37wJVmMpjGLeaWgPPrie0KIpWf1A==}
@@ -288,7 +357,7 @@ packages:
       '@opentelemetry/core': 1.12.0_@opentelemetry+api@1.4.1
       '@opentelemetry/resources': 1.12.0_@opentelemetry+api@1.4.1
       '@opentelemetry/semantic-conventions': 1.12.0
-    dev: true
+    dev: false
 
   /@opentelemetry/sdk-trace-node/1.12.0_@opentelemetry+api@1.4.1:
     resolution: {integrity: sha512-PxpDemnNZLLeFNLAu95/K3QubjlaScXVjVQPlwPui65VRxIvxGVysnN7DFfsref+qoh1hI6nlrYSij43vxdm2w==}
@@ -303,12 +372,55 @@ packages:
       '@opentelemetry/propagator-jaeger': 1.12.0_@opentelemetry+api@1.4.1
       '@opentelemetry/sdk-trace-base': 1.12.0_@opentelemetry+api@1.4.1
       semver: 7.5.0
-    dev: true
+    dev: false
 
   /@opentelemetry/semantic-conventions/1.12.0:
     resolution: {integrity: sha512-hO+bdeGOlJwqowUBoZF5LyP3ORUFOP1G0GRv8N45W/cztXbT2ZEXaAzfokRS9Xc9FWmYrDj32mF6SzH6wuoIyA==}
     engines: {node: '>=14'}
-    dev: true
+    dev: false
+
+  /@protobufjs/aspromise/1.1.2:
+    resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
+    dev: false
+
+  /@protobufjs/base64/1.1.2:
+    resolution: {integrity: sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==}
+    dev: false
+
+  /@protobufjs/codegen/2.0.4:
+    resolution: {integrity: sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==}
+    dev: false
+
+  /@protobufjs/eventemitter/1.1.0:
+    resolution: {integrity: sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==}
+    dev: false
+
+  /@protobufjs/fetch/1.1.0:
+    resolution: {integrity: sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==}
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/inquire': 1.1.0
+    dev: false
+
+  /@protobufjs/float/1.0.2:
+    resolution: {integrity: sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ==}
+    dev: false
+
+  /@protobufjs/inquire/1.1.0:
+    resolution: {integrity: sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==}
+    dev: false
+
+  /@protobufjs/path/1.1.2:
+    resolution: {integrity: sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA==}
+    dev: false
+
+  /@protobufjs/pool/1.1.0:
+    resolution: {integrity: sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw==}
+    dev: false
+
+  /@protobufjs/utf8/1.1.0:
+    resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==}
+    dev: false
 
   /@types/chai-subset/1.3.3:
     resolution: {integrity: sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==}
@@ -322,7 +434,6 @@ packages:
 
   /@types/node/18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
-    dev: true
 
   /acorn-walk/8.2.0:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
@@ -530,6 +641,14 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
+  /lodash.merge/4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+    dev: false
+
+  /long/5.2.3:
+    resolution: {integrity: sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q==}
+    dev: false
+
   /loupe/2.3.6:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
     dependencies:
@@ -547,7 +666,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       yallist: 4.0.0
-    dev: true
 
   /mlly/1.1.0:
     resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
@@ -721,6 +839,25 @@ packages:
     hasBin: true
     dev: true
 
+  /protobufjs/7.2.3:
+    resolution: {integrity: sha512-TtpvOqwB5Gdz/PQmOjgsrGH1nHjAQVCN7JG4A6r1sXRWESL5rNMAiRcBQlCAdKxZcAbstExQePYG8xof/JVRgg==}
+    engines: {node: '>=12.0.0'}
+    requiresBuild: true
+    dependencies:
+      '@protobufjs/aspromise': 1.1.2
+      '@protobufjs/base64': 1.1.2
+      '@protobufjs/codegen': 2.0.4
+      '@protobufjs/eventemitter': 1.1.0
+      '@protobufjs/fetch': 1.1.0
+      '@protobufjs/float': 1.0.2
+      '@protobufjs/inquire': 1.1.0
+      '@protobufjs/path': 1.1.2
+      '@protobufjs/pool': 1.1.0
+      '@protobufjs/utf8': 1.1.0
+      '@types/node': 18.11.18
+      long: 5.2.3
+    dev: false
+
   /resolve/1.22.1:
     resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
     hasBin: true
@@ -744,7 +881,7 @@ packages:
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
-    dev: true
+    dev: false
 
   /sentence-case/3.0.4:
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
@@ -963,4 +1100,3 @@ packages:
 
   /yallist/4.0.0:
     resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==}
-    dev: true

package/src/ModelAPI.js

@@ -3,7 +3,11 @@ const { QueryBuilder } = require("./QueryBuilder");
 const { QueryContext } = require("./QueryContext");
 const { applyWhereConditions } = require("./applyWhereConditions");
 const { applyJoins } = require("./applyJoins");
-const { camelCaseObject, snakeCaseObject } = require("./casing");
+const {
+  camelCaseObject,
+  snakeCaseObject,
+  upperCamelCase,
+} = require("./casing");
 const tracing = require("./tracing");
 
 /**
@@ -44,129 +48,123 @@ class ModelAPI {
     this._defaultValues = defaultValues;
     this._tableName = tableName;
     this._tableConfigMap = tableConfigMap;
+    this._modelName = upperCamelCase(this._tableName);
   }
 
   async create(values) {
-    try {
-      const defaults = this._defaultValues();
-      const query = this._db
-        .insertInto(this._tableName)
-        .values(
-          snakeCaseObject({
-            ...defaults,
-            ...values,
-          })
-        )
-        .returningAll();
-      const sql = query.compile().sql;
-      const row = await tracing.withSpan(
-        `${this._tableName}.create`,
-        (span) => {
-          span.setAttribute("sql", sql);
-          return query.executeTakeFirstOrThrow();
-        }
-      );
-
-      return camelCaseObject(row);
-    } catch (e) {
-      throw new DatabaseError(e);
-    }
+    const name = spanName(this._modelName, "create");
+
+    return tracing.withSpan(name, async (span) => {
+      try {
+        const defaults = this._defaultValues();
+        const query = this._db
+          .insertInto(this._tableName)
+          .values(
+            snakeCaseObject({
+              ...defaults,
+              ...values,
+            })
+          )
+          .returningAll();
+
+        span.setAttribute("sql", query.compile().sql);
+        const row = await query.executeTakeFirstOrThrow();
+
+        return camelCaseObject(row);
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
+    });
   }
 
   async findOne(where = {}) {
-    let builder = this._db
-      .selectFrom(this._tableName)
-      .distinctOn(`${this._tableName}.id`)
-      .selectAll(this._tableName);
+    const name = spanName(this._modelName, "findOne");
 
-    const context = new QueryContext([this._tableName], this._tableConfigMap);
+    return tracing.withSpan(name, async (span) => {
+      let builder = this._db
+        .selectFrom(this._tableName)
+        .distinctOn(`${this._tableName}.id`)
+        .selectAll(this._tableName);
 
-    builder = applyJoins(context, builder, where);
-    builder = applyWhereConditions(context, builder, where);
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
 
-    const sql = builder.compile().sql;
-    const row = await tracing.withSpan(`${this._tableName}.findOne`, (span) => {
-      span.setAttribute("sql", sql);
-      return builder.executeTakeFirst();
-    });
-    if (!row) {
-      return null;
-    }
+      builder = applyJoins(context, builder, where);
+      builder = applyWhereConditions(context, builder, where);
 
-    return camelCaseObject(row);
+      span.setAttribute("sql", builder.compile().sql);
+      const row = await builder.executeTakeFirst();
+      if (!row) {
+        return null;
+      }
+
+      return camelCaseObject(row);
+    });
   }
 
   async findMany(where = {}) {
-    let builder = this._db
-      .selectFrom(this._tableName)
-      .distinctOn(`${this._tableName}.id`)
-      .selectAll(this._tableName);
+    const name = spanName(this._modelName, "findMany");
 
-    const context = new QueryContext([this._tableName], this._tableConfigMap);
+    return tracing.withSpan(name, async (span) => {
+      let builder = this._db
+        .selectFrom(this._tableName)
+        .distinctOn(`${this._tableName}.id`)
+        .selectAll(this._tableName);
 
-    builder = applyJoins(context, builder, where);
-    builder = applyWhereConditions(context, builder, where);
-    const query = builder.orderBy("id");
-
-    const sql = query.compile().sql;
-    const rows = await tracing.withSpan(
-      `${this._tableName}.findMany`,
-      (span) => {
-        span.setAttribute("sql", sql);
-        return builder.execute();
-      }
-    );
-    return rows.map((x) => camelCaseObject(x));
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
+
+      builder = applyJoins(context, builder, where);
+      builder = applyWhereConditions(context, builder, where);
+      const query = builder.orderBy("id");
+
+      span.setAttribute("sql", query.compile().sql);
+      const rows = await builder.execute();
+      return rows.map((x) => camelCaseObject(x));
+    });
   }
 
   async update(where, values) {
-    let builder = this._db.updateTable(this._tableName).returningAll();
+    const name = spanName(this._modelName, "update");
 
-    builder = builder.set(snakeCaseObject(values));
+    return tracing.withSpan(name, async (span) => {
+      let builder = this._db.updateTable(this._tableName).returningAll();
 
-    const context = new QueryContext([this._tableName], this._tableConfigMap);
+      builder = builder.set(snakeCaseObject(values));
 
-    // TODO: support joins for update
-    builder = applyWhereConditions(context, builder, where);
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
 
-    try {
-      const sql = builder.compile().sql;
-      const row = await tracing.withSpan(
-        `${this._tableName}.update`,
-        (span) => {
-          span.setAttribute("sql", sql);
-          return builder.executeTakeFirstOrThrow();
-        }
-      );
+      // TODO: support joins for update
+      builder = applyWhereConditions(context, builder, where);
 
-      return camelCaseObject(row);
-    } catch (e) {
-      throw new DatabaseError(e);
-    }
+      span.setAttribute("sql", builder.compile().sql);
+
+      try {
+        const row = await builder.executeTakeFirstOrThrow();
+        return camelCaseObject(row);
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
+    });
   }
 
   async delete(where) {
-    let builder = this._db.deleteFrom(this._tableName).returning(["id"]);
+    const name = spanName(this._modelName, "delete");
 
-    const context = new QueryContext([this._tableName], this._tableConfigMap);
+    return tracing.withSpan(name, async (span) => {
+      let builder = this._db.deleteFrom(this._tableName).returning(["id"]);
 
-    // TODO: support joins for delete
-    builder = applyWhereConditions(context, builder, where);
+      const context = new QueryContext([this._tableName], this._tableConfigMap);
 
-    try {
-      const sql = builder.compile().sql;
-      const row = await tracing.withSpan(
-        `${this._tableName}.delete`,
-        (span) => {
-          span.setAttribute("sql", sql);
-          return builder.executeTakeFirstOrThrow();
-        }
-      );
-
-      return row.id;
-    } catch (e) {
-      throw new DatabaseError(e);
-    }
+      // TODO: support joins for delete
+      builder = applyWhereConditions(context, builder, where);
+
+      span.setAttribute("sql", builder.compile().sql);
+      try {
+        const row = await builder.executeTakeFirstOrThrow();
+        return row.id;
+      } catch (e) {
+        throw new DatabaseError(e);
+      }
+    });
   }
 
   where(where) {
@@ -180,10 +178,14 @@ class ModelAPI {
     builder = applyJoins(context, builder, where);
     builder = applyWhereConditions(context, builder, where);
 
-    return new QueryBuilder(context, builder);
+    return new QueryBuilder(this._tableName, context, builder);
   }
 }
 
+function spanName(modelName, action) {
+  return `Database ${modelName}.${action}`;
+}
+
 module.exports = {
   ModelAPI,
   DatabaseError,

package/src/QueryBuilder.js

@@ -1,14 +1,16 @@
 const { applyWhereConditions } = require("./applyWhereConditions");
 const { applyJoins } = require("./applyJoins");
-const { camelCaseObject } = require("./casing");
+const { camelCaseObject, upperCamelCase } = require("./casing");
 const tracing = require("./tracing");
 
 class QueryBuilder {
   /**
+   * @param {string} tableName
    * @param {import("./QueryContext").QueryContext} context
    * @param {import("kysely").Kysely} db
    */
-  constructor(context, db) {
+  constructor(tableName, context, db) {
+    this._tableName = tableName;
     this._context = context;
     this._db = db;
   }
@@ -19,7 +21,7 @@ class QueryBuilder {
     let builder = applyJoins(context, this._db, where);
     builder = applyWhereConditions(context, builder, where);
 
-    return new QueryBuilder(context, builder);
+    return new QueryBuilder(this._tableName, context, builder);
   }
 
   orWhere(where) {
@@ -31,17 +33,17 @@ class QueryBuilder {
       return applyWhereConditions(context, qb, where);
     });
 
-    return new QueryBuilder(context, builder);
+    return new QueryBuilder(this._tableName, context, builder);
   }
 
   async findMany() {
-    const query = this._db.orderBy("id");
-    const sql = query.compile().sql;
-    const rows = await tracing.withSpan(`query`, (span) => {
-      span.setAttribute("sql", sql);
-      return query.execute();
+    const spanName = `Database ${upperCamelCase(this._tableName)}.findMany`;
+    return tracing.withSpan(spanName, async (span) => {
+      const query = this._db.orderBy("id");
+      span.setAttribute("sql", query.compile().sql);
+      const rows = await query.execute();
+      return rows.map((x) => camelCaseObject(x));
     });
-    return rows.map((x) => camelCaseObject(x));
   }
 }
 

package/src/casing.js

@@ -16,9 +16,15 @@ function snakeCaseObject(obj) {
   return r;
 }
 
+function upperCamelCase(s) {
+  s = camelCase(s);
+  return s[0].toUpperCase() + s.substring(1);
+}
+
 module.exports = {
   camelCaseObject,
   snakeCaseObject,
   snakeCase,
   camelCase,
+  upperCamelCase,
 };

package/src/handleRequest.js

@@ -14,166 +14,161 @@ const { PROTO_ACTION_TYPES } = require("./consts");
 
 const { errorToJSONRPCResponse, RuntimeErrors } = require("./errors");
 const opentelemetry = require("@opentelemetry/api");
-const { getTracer } = require("./tracing");
+const { getTracer, withSpan } = require("./tracing");
 
 // Generic handler function that is agnostic to runtime environment (local or lambda)
 // to execute a custom function based on the contents of a jsonrpc-2.0 payload object.
 // To read more about jsonrpc request and response shapes, please read https://www.jsonrpc.org/specification
 async function handleRequest(request, config) {
+  // Try to extract trace context from caller
   const activeContext = opentelemetry.propagation.extract(
     opentelemetry.context.active(),
-    // "?." is so we don't have to provide this field on tests
     request.meta?.tracing
   );
-  let span = getTracer().startSpan(
-    `Function/${request.method}`,
-    { attributes: {} },
-    activeContext
-  );
-  opentelemetry.trace.setSpan(activeContext, span);
-
-  //
-  // WARNING: Nothing should be done before this try block, as the finally closes the span
-  //
-  try {
-    const {
-      createFunctionAPI,
-      createContextAPI,
-      functions,
-      permissions,
-      actionTypes,
-    } = config;
-
-    if (!(request.method in functions)) {
-      const message = `no corresponding function found for '${request.method}'`;
-      span.setStatus({
-        code: opentelemetry.SpanStatusCode.ERROR,
-        message: message,
-      });
-      return createJSONRPCErrorResponse(
-        request.id,
-        JSONRPCErrorCode.MethodNotFound,
-        message
-      );
-    }
-
-    // headers reference passed to custom function where object data can be modified
-    const headers = new Headers();
-
-    const db = getDatabase();
-
-    // We want to wrap the execution of the custom function in a transaction so that any call the user makes
-    // to any of the model apis we provide to the custom function is processed in a transaction.
-    // This is useful for permissions where we want to only proceed with database writes if all permission rules
-    // have been validated.
-    const result = await db.transaction().execute(async (transaction) => {
-      const ctx = createContextAPI({
-        responseHeaders: headers,
-        meta: request.meta,
-      });
-      const api = createFunctionAPI({
-        meta: request.meta,
-        db: transaction,
-      });
-
-      const customFunction = functions[request.method];
-
-      // Call the user's custom function!
-      const fnResult = await customFunction(ctx, request.params, api);
-
-      // api.permissions maintains an internal state of whether the current operation has been *explicitly* permitted/denied by the user in the course of their custom function, or if execution has already been permitted by a role based permission (evaluated in the main runtime).
-      // we need to check that the final state is permitted or unpermitted. if it's not, then it means that the user has taken no explicit action to permit/deny
-      // and therefore we default to checking the permissions defined in the schema automatically.
-      switch (api.permissions.getState()) {
-        case PERMISSION_STATE.PERMITTED:
-          return fnResult;
-        case PERMISSION_STATE.UNPERMITTED:
-          throw new PermissionError(
-            `Not permitted to access ${request.method}`
+
+  // Run the whole request with the extracted context
+  return opentelemetry.context.with(activeContext, () => {
+    // Wrapping span for the whole request
+    return withSpan(request.method, async (span) => {
+      try {
+        const {
+          createFunctionAPI,
+          createContextAPI,
+          functions,
+          permissions,
+          actionTypes,
+        } = config;
+
+        if (!(request.method in functions)) {
+          const message = `no corresponding function found for '${request.method}'`;
+          span.setStatus({
+            code: opentelemetry.SpanStatusCode.ERROR,
+            message: message,
+          });
+          return createJSONRPCErrorResponse(
+            request.id,
+            JSONRPCErrorCode.MethodNotFound,
+            message
           );
-        default:
-          // unknown state, proceed with checking against the built in permissions in the schema
-          const relevantPermissions = permissions[request.method];
+        }
 
-          const actionType = actionTypes[request.method];
+        // headers reference passed to custom function where object data can be modified
+        const headers = new Headers();
 
-          const peakInsideTransaction =
-            actionType === PROTO_ACTION_TYPES.CREATE;
+        const db = getDatabase();
 
-          let rowsForPermissions = [];
-          switch (actionType) {
-            case PROTO_ACTION_TYPES.LIST:
-              rowsForPermissions = fnResult;
+        // We want to wrap the execution of the custom function in a transaction so that any call the user makes
+        // to any of the model apis we provide to the custom function is processed in a transaction.
+        // This is useful for permissions where we want to only proceed with database writes if all permission rules
+        // have been validated.
+        const result = await db.transaction().execute(async (transaction) => {
+          const ctx = createContextAPI({
+            responseHeaders: headers,
+            meta: request.meta,
+          });
+          const api = createFunctionAPI({
+            meta: request.meta,
+            db: transaction,
+          });
 
-              break;
-            case PROTO_ACTION_TYPES.DELETE:
-              rowsForPermissions = [{ id: fnResult }];
-              break;
+          const customFunction = functions[request.method];
+
+          // Call the user's custom function!
+          const fnResult = await customFunction(ctx, request.params, api);
+
+          // api.permissions maintains an internal state of whether the current operation has been *explicitly* permitted/denied by the user in the course of their custom function, or if execution has already been permitted by a role based permission (evaluated in the main runtime).
+          // we need to check that the final state is permitted or unpermitted. if it's not, then it means that the user has taken no explicit action to permit/deny
+          // and therefore we default to checking the permissions defined in the schema automatically.
+          switch (api.permissions.getState()) {
+            case PERMISSION_STATE.PERMITTED:
+              return fnResult;
+            case PERMISSION_STATE.UNPERMITTED:
+              throw new PermissionError(
+                `Not permitted to access ${request.method}`
+              );
             default:
-              rowsForPermissions = [fnResult];
-              break;
+              // unknown state, proceed with checking against the built in permissions in the schema
+              const relevantPermissions = permissions[request.method];
+
+              const actionType = actionTypes[request.method];
+
+              const peakInsideTransaction =
+                actionType === PROTO_ACTION_TYPES.CREATE;
+
+              let rowsForPermissions = [];
+              switch (actionType) {
+                case PROTO_ACTION_TYPES.LIST:
+                  rowsForPermissions = fnResult;
+
+                  break;
+                case PROTO_ACTION_TYPES.DELETE:
+                  rowsForPermissions = [{ id: fnResult }];
+                  break;
+                default:
+                  rowsForPermissions = [fnResult];
+                  break;
+              }
+
+              // check will throw a PermissionError if a permission rule is invalid
+              await checkBuiltInPermissions({
+                rows: rowsForPermissions,
+                permissions: relevantPermissions,
+                // it is important that we pass db here as db represents the connection to the database
+                // *outside* of the current transaction. Given that any changes inside of a transaction
+                // are opaque to the outside, we can utilize this when running permission rules and then deciding to
+                // rollback any changes if they do not pass. However, for creates we need to be able to 'peak' inside the transaction to read the created record, as this won't exist outside of the transaction.
+                db: peakInsideTransaction ? transaction : db,
+                ctx,
+                functionName: request.method,
+              });
+
+              // If the built in permission check above doesn't throw, then it means that the request is permitted and we can continue returning the return value from the custom function out of the transaction
+              return fnResult;
           }
-
-          // check will throw a PermissionError if a permission rule is invalid
-          await checkBuiltInPermissions({
-            rows: rowsForPermissions,
-            permissions: relevantPermissions,
-            // it is important that we pass db here as db represents the connection to the database
-            // *outside* of the current transaction. Given that any changes inside of a transaction
-            // are opaque to the outside, we can utilize this when running permission rules and then deciding to
-            // rollback any changes if they do not pass. However, for creates we need to be able to 'peak' inside the transaction to read the created record, as this won't exist outside of the transaction.
-            db: peakInsideTransaction ? transaction : db,
-            ctx,
-            functionName: request.method,
+        });
+
+        if (result === undefined) {
+          // no result returned from custom function
+          return createJSONRPCErrorResponse(
+            request.id,
+            RuntimeErrors.NoResultError,
+            `no result returned from function '${request.method}'`
+          );
+        }
+
+        const response = createJSONRPCSuccessResponse(request.id, result);
+
+        const responseHeaders = {};
+        for (const pair of headers.entries()) {
+          responseHeaders[pair[0]] = pair[1].split(", ");
+        }
+        response.meta = { headers: responseHeaders };
+
+        return response;
+      } catch (e) {
+        if (e instanceof Error) {
+          span.recordException(e);
+          span.setStatus({
+            code: opentelemetry.SpanStatusCode.ERROR,
+            message: e.message,
           });
-
-          // If the built in permission check above doesn't throw, then it means that the request is permitted and we can continue returning the return value from the custom function out of the transaction
-          return fnResult;
+          return errorToJSONRPCResponse(request, e);
+        }
+
+        const message = JSON.stringify(e);
+
+        span.setStatus({
+          code: opentelemetry.SpanStatusCode.ERROR,
+          message: message,
+        });
+        return createJSONRPCErrorResponse(
+          request.id,
+          RuntimeErrors.UnknownError,
+          message
+        );
       }
     });
-
-    if (result === undefined) {
-      // no result returned from custom function
-      return createJSONRPCErrorResponse(
-        request.id,
-        RuntimeErrors.NoResultError,
-        `no result returned from function '${request.method}'`
-      );
-    }
-
-    const response = createJSONRPCSuccessResponse(request.id, result);
-
-    const responseHeaders = {};
-    for (const pair of headers.entries()) {
-      responseHeaders[pair[0]] = pair[1].split(", ");
-    }
-    response.meta = { headers: responseHeaders };
-
-    return response;
-  } catch (e) {
-    if (e instanceof Error) {
-      span.recordException(e);
-      span.setStatus({
-        code: opentelemetry.SpanStatusCode.ERROR,
-        message: e.message,
-      });
-      return errorToJSONRPCResponse(request, e);
-    }
-
-    const message = JSON.stringify(e);
-
-    span.setStatus({
-      code: opentelemetry.SpanStatusCode.ERROR,
-      message: message,
-    });
-    return createJSONRPCErrorResponse(
-      request.id,
-      RuntimeErrors.UnknownError,
-      message
-    );
-  } finally {
-    span.end();
-  }
+  });
 }
 
 module.exports = {

package/src/index.js

@@ -8,6 +8,7 @@ const {
   PERMISSION_STATE,
   checkBuiltInPermissions,
 } = require("./permissions");
+const tracing = require("./tracing");
 
 module.exports = {
   ModelAPI,
@@ -17,6 +18,7 @@ module.exports = {
   Permissions,
   PERMISSION_STATE,
   checkBuiltInPermissions,
+  tracing,
   ksuid() {
     return KSUID.randomSync().string;
   },

package/src/tracing.js

@@ -1,4 +1,10 @@
 const opentelemetry = require("@opentelemetry/api");
+const { BatchSpanProcessor } = require("@opentelemetry/sdk-trace-base");
+const {
+  OTLPTraceExporter,
+} = require("@opentelemetry/exporter-trace-otlp-proto");
+const { NodeTracerProvider } = require("@opentelemetry/sdk-trace-node");
+const { envDetectorSync } = require("@opentelemetry/resources");
 
 function withSpan(name, fn) {
   return getTracer().startActiveSpan(name, async (span) => {
@@ -21,7 +27,7 @@ function withSpan(name, fn) {
   });
 }
 
-function init() {
+function patchFetch() {
   if (!globalThis.fetch.patched) {
     const originalFetch = globalThis.fetch;
 
@@ -47,6 +53,20 @@ function init() {
   }
 }
 
+function init() {
+  if (process.env.KEEL_TRACING_ENABLED == "true") {
+    const provider = new NodeTracerProvider({
+      resource: envDetectorSync.detect(),
+    });
+    const exporter = new OTLPTraceExporter();
+    const processor = new BatchSpanProcessor(exporter);
+    provider.addSpanProcessor(processor);
+    provider.register();
+  }
+
+  patchFetch();
+}
+
 function getTracer() {
   return opentelemetry.trace.getTracer("functions");
 }