@contember/engine-server 2.1.0-rc.3 → 2.2.0-alpha.10

package/dist/types/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,GAAI,IAAI,MAAM,qBAG/B,CAAA"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,OAAQ,MAAM,qBAG/B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-server",
-  "version": "2.1.0-rc.3",
+  "version": "2.2.0-alpha.10",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,11 +23,12 @@
     }
   },
   "dependencies": {
-    "@contember/engine-actions": "2.1.0-rc.3",
-    "@contember/engine-http": "2.1.0-rc.3",
-    "@contember/engine-plugins": "2.1.0-rc.3",
-    "@contember/engine-s3-plugin": "2.1.0-rc.3",
-    "@contember/engine-vimeo-plugin": "2.1.0-rc.3",
+    "@contember/engine-actions": "2.2.0-alpha.10",
+    "@contember/engine-http": "2.2.0-alpha.10",
+    "@contember/engine-panel": "2.2.0-alpha.10",
+    "@contember/engine-plugins": "2.2.0-alpha.10",
+    "@contember/engine-s3-plugin": "2.2.0-alpha.10",
+    "@contember/engine-vimeo-plugin": "2.2.0-alpha.10",
     "graphql": "^16.13.1",
     "pg": "^8.20.0",
     "uuid": "^13.0.0"

package/src/cluster.ts

@@ -1,5 +1,5 @@
 import cluster, { Worker } from 'node:cluster'
-import { timeout } from './utils'
+import { timeout } from './utils.js'
 
 export const getClusterProcessType = (isClusterMode: boolean): ProcessType =>
 	!isClusterMode ? 'singleNode' : cluster.isMaster ? 'clusterMaster' : 'clusterWorker'

package/src/loadPlugins.ts

@@ -1,8 +1,9 @@
 import ActionsPlugin from '@contember/engine-actions'
+import PanelPlugin from '@contember/engine-panel'
 import { Plugin } from '@contember/engine-plugins'
 import S3Plugin from '@contember/engine-s3-plugin'
 import VimeoPlugin from '@contember/engine-vimeo-plugin'
 
 export default function loadPlugins(): Promise<Plugin[]> {
-	return Promise.resolve([new S3Plugin(), new VimeoPlugin(), new ActionsPlugin()])
+	return Promise.resolve([new S3Plugin(), new VimeoPlugin(), new ActionsPlugin(), new PanelPlugin()])
 }

package/src/start.ts

@@ -4,6 +4,7 @@ import {
 	createContainer,
 	createDefaultLogger,
 	createSentryLoggerHandler,
+	createTelemetry,
 	getServerVersion,
 	isDebugMode,
 	listenOnProcessTermination,
@@ -12,11 +13,11 @@ import {
 	serverConfigSchema,
 	TerminationJob,
 } from '@contember/engine-http'
-import loadPlugins from './loadPlugins'
+import loadPlugins from './loadPlugins.js'
 import cluster from 'node:cluster'
 import * as os from 'node:os'
-import { timeout } from './utils'
-import { getClusterProcessType, notifyWorkerStarted, WorkerManager } from './cluster'
+import { timeout } from './utils.js'
+import { getClusterProcessType, notifyWorkerStarted, WorkerManager } from './cluster.js'
 
 const logger = createDefaultLogger()
 process.on('warning', message => {
@@ -28,7 +29,7 @@ process.on('warning', message => {
 	const version = await getServerVersion()
 	printStartInfo({ version, isDebug }, logger)
 	const plugins = await loadPlugins()
-	const { serverConfig, projectConfigResolver, tenantConfigResolver } = await resolveServerConfig({ plugins, serverConfigSchema })
+	const { serverConfig, projectConfigResolver, tenantConfigResolver, env } = await resolveServerConfig({ plugins, serverConfigSchema })
 
 	if (process.argv[2] === 'validate') {
 		process.exit(0)
@@ -39,6 +40,8 @@ process.on('warning', message => {
 		logger.addHandler(sentryhandler)
 	}
 
+	const telemetry = createTelemetry({ config: serverConfig.telemetry, logger, env })
+
 	const workerConfig = serverConfig.workerCount || 1
 
 	const workerCount = workerConfig === 'auto' ? os.cpus().length : Number(workerConfig)
@@ -51,15 +54,51 @@ process.on('warning', message => {
 		serverConfig,
 		projectConfigResolver,
 		tenantConfigResolver,
+		env,
 		plugins,
 		processType,
 		version,
 		logger,
+		tracer: telemetry.tracer,
 	})
 
 	let initializedProjects: string[] = []
 	const terminationJobs: TerminationJob[] = []
-	listenOnProcessTermination(terminationJobs, logger)
+	const finalTerminationJobs: TerminationJob[] = []
+	// A cluster worker is signalled by the master, which has already served the delay.
+	listenOnProcessTermination(terminationJobs, logger, {
+		sigtermDelayMs: processType === 'clusterWorker' ? 0 : serverConfig.shutdownDelayMs,
+		finalJobs: finalTerminationJobs,
+	})
+
+	const spanProcessor = telemetry.processor
+	if (spanProcessor !== undefined) {
+		terminationJobs.push(async () => {
+			let timer: ReturnType<typeof setTimeout> | undefined
+			let flushed = false
+			try {
+				await Promise.race([
+					spanProcessor.forceFlush().then(() => {
+						flushed = true
+					}),
+					new Promise<void>(resolve => {
+						timer = setTimeout(resolve, 5000)
+					}),
+				])
+			} finally {
+				if (timer !== undefined) {
+					clearTimeout(timer)
+				}
+			}
+			if (!flushed) {
+				logger.warn('Telemetry pre-shutdown flush timed out')
+			}
+		})
+		finalTerminationJobs.push(async () => {
+			await spanProcessor.shutdown()
+			logger.info('Telemetry shut down')
+		})
+	}
 
 	if (cluster.isMaster) {
 		const monitoringPort = serverConfig.monitoringPort
@@ -106,7 +145,7 @@ process.on('warning', message => {
 			},
 		})
 		terminationJobs.push(async () => {
-			;(await runningWorker).end()
+			await (await runningWorker).end()
 		})
 		await runningWorker
 		logger.info(`Contember Worker ${workerName} started.`)

package/src/tsconfig.json

@@ -6,6 +6,7 @@
 	"references": [
 		{ "path": "../../engine-actions/src" },
 		{ "path": "../../engine-http/src" },
+		{ "path": "../../engine-panel/src" },
 		{ "path": "../../engine-plugins/src" },
 		{ "path": "../../engine-s3-plugin/src" },
 		{ "path": "../../engine-vimeo-plugin/src" }