CodeMirror/budibase
1
0
Fork 0
mirror of synced 2024-07-05 14:31:17 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12637 from Budibase/track-run-js

Browse source
This commit is contained in:
Sam Rose 2023-12-20 09:49:01 +00:00 committed by GitHub
parent 8072d9c2a7 2e58f2cdde
commit d3b7e51f39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend-core/src/timers/timers.ts
View file

@ -30,7 +30,7 @@ export class ExecutionTimeTracker {
return new ExecutionTimeTracker(limitMs) return new ExecutionTimeTracker(limitMs)
} }
constructor(private limitMs: number) {} constructor(readonly limitMs: number) {}
private totalTimeMs = 0 private totalTimeMs = 0
@ -46,6 +46,10 @@ export class ExecutionTimeTracker {
} }
} }
get elapsedMS() {
return this.totalTimeMs
}
private checkLimit() { private checkLimit() {
if (this.totalTimeMs > this.limitMs) { if (this.totalTimeMs > this.limitMs) {
throw new ExecutionTimeoutError( throw new ExecutionTimeoutError(

53
packages/server/src/jsRunner.ts
View file

@ -2,35 +2,44 @@ import vm from "vm"
import env from "./environment" import env from "./environment"
import { setJSRunner } from "@budibase/string-templates" import { setJSRunner } from "@budibase/string-templates"
import { context, timers } from "@budibase/backend-core" import { context, timers } from "@budibase/backend-core"
import tracer from "dd-trace"
type TrackerFn = <T>(f: () => T) => T type TrackerFn = <T>(f: () => T) => T
export function init() { export function init() {
setJSRunner((js: string, ctx: vm.Context) => { setJSRunner((js: string, ctx: vm.Context) => {
const perRequestLimit = env.JS_PER_REQUEST_TIME_LIMIT_MS return tracer.trace("runJS", {}, span => {
let track: TrackerFn = f => f() const perRequestLimit = env.JS_PER_REQUEST_TIME_LIMIT_MS
if (perRequestLimit) { let track: TrackerFn = f => f()
const bbCtx = context.getCurrentContext() if (perRequestLimit) {
if (bbCtx) { const bbCtx = context.getCurrentContext()
if (!bbCtx.jsExecutionTracker) { if (bbCtx) {
bbCtx.jsExecutionTracker = if (!bbCtx.jsExecutionTracker) {
timers.ExecutionTimeTracker.withLimit(perRequestLimit) bbCtx.jsExecutionTracker =
timers.ExecutionTimeTracker.withLimit(perRequestLimit)
}
track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
span?.addTags({
js: {
limitMS: bbCtx.jsExecutionTracker.limitMs,
elapsedMS: bbCtx.jsExecutionTracker.elapsedMS,
},
})
} }
track = bbCtx.jsExecutionTracker.track.bind(bbCtx.jsExecutionTracker)
} }
}
ctx = { ctx = {
...ctx, ...ctx,
alert: undefined, alert: undefined,
setInterval: undefined, setInterval: undefined,
setTimeout: undefined, setTimeout: undefined,
} }
vm.createContext(ctx) vm.createContext(ctx)
return track(() => return track(() =>
vm.runInNewContext(js, ctx, { vm.runInNewContext(js, ctx, {
timeout: env.JS_PER_EXECUTION_TIME_LIMIT_MS, timeout: env.JS_PER_EXECUTION_TIME_LIMIT_MS,
}) })
) )
})
}) })
} }