Merge branch 'master' into feature/postgresql-multiple-schema

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.14.3",
+  "version": "2.14.4",
   "npmClient": "yarn",
   "packages": [
     "packages/*",

packages/server/src/jsRunner.ts

@@ -12,36 +12,51 @@ export function init() {
       const perRequestLimit = env.JS_PER_REQUEST_TIME_LIMIT_MS
       let track: TrackerFn = f => f()
       if (perRequestLimit) {
-        const bbCtx = context.getCurrentContext()
-        if (bbCtx) {
-          if (!bbCtx.jsExecutionTracker) {
-            bbCtx.jsExecutionTracker =
-              timers.ExecutionTimeTracker.withLimit(perRequestLimit)
+        tracer.trace<any>("runJS.setupTracker", {}, span => {
+          const bbCtx = context.getCurrentContext()
+          if (bbCtx) {
+            if (!bbCtx.jsExecutionTracker) {
+              span?.addTags({
+                createdExecutionTracker: true,
+              })
+              bbCtx.jsExecutionTracker =
+                timers.ExecutionTimeTracker.withLimit(perRequestLimit)
+            }
+            span?.addTags({
+              js: {
+                limitMS: bbCtx.jsExecutionTracker.limitMs,
+                elapsedMS: bbCtx.jsExecutionTracker.elapsedMS,
+              },
+            })
+            // We call checkLimit() here to prevent paying the cost of creating
+            // a new VM context below when we don't need to.
+            bbCtx.jsExecutionTracker.checkLimit()
+            track = bbCtx.jsExecutionTracker.track.bind(
+              bbCtx.jsExecutionTracker
+            )
           }
-          span?.addTags({
-            js: {
-              limitMS: bbCtx.jsExecutionTracker.limitMs,
-              elapsedMS: bbCtx.jsExecutionTracker.elapsedMS,
-            },
-          })
-          // We call checkLimit() here to prevent paying the cost of creating
-          // a new VM context below when we don't need to.
-          bbCtx.jsExecutionTracker.checkLimit()
-          track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
-        }
+        })
       }
 
-      ctx = {
-        ...ctx,
-        alert: undefined,
-        setInterval: undefined,
-        setTimeout: undefined,
-      }
-      vm.createContext(ctx)
+      ctx = tracer.trace("runJS.ctxClone", {}, span => {
+        return {
+          ...ctx,
+          alert: undefined,
+          setInterval: undefined,
+          setTimeout: undefined,
+        }
+      })
+
+      tracer.trace("runJS.vm.createContext", {}, span => {
+        vm.createContext(ctx)
+      })
+
       return track(() =>
-        vm.runInNewContext(js, ctx, {
-          timeout: env.JS_PER_EXECUTION_TIME_LIMIT_MS,
-        })
+        tracer.trace("runJS.vm.runInNewContext", {}, span =>
+          vm.runInNewContext(js, ctx, {
+            timeout: env.JS_PER_EXECUTION_TIME_LIMIT_MS,
+          })
+        )
       )
     })
   })