From 3a4992633ee62d5edfbb484d9c6bcb3cf158489d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 31 Jul 2023 14:34:36 +0200 Subject: Migrate server to ESM Sorry for the very big commit that may lead to git log issues and merge conflicts, but it's a major step forward: * Server can be faster at startup because imports() are async and we can easily lazy import big modules * Angular doesn't seem to support ES import (with .js extension), so we had to correctly organize peertube into a monorepo: * Use yarn workspace feature * Use typescript reference projects for dependencies * Shared projects have been moved into "packages", each one is now a node module (with a dedicated package.json/tsconfig.json) * server/tools have been moved into apps/ and is now a dedicated app bundled and published on NPM so users don't have to build peertube cli tools manually * server/tests have been moved into packages/ so we don't compile them every time we want to run the server * Use isolatedModule option: * Had to move from const enum to const (https://www.typescriptlang.org/docs/handbook/enums.html#objects-vs-enums) * Had to explictely specify "type" imports when used in decorators * Prefer tsx (that uses esbuild under the hood) instead of ts-node to load typescript files (tests with mocha or scripts): * To reduce test complexity as esbuild doesn't support decorator metadata, we only test server files that do not import server models * We still build tests files into js files for a faster CI * Remove unmaintained peertube CLI import script * Removed some barrels to speed up execution (less imports) --- server/lib/opentelemetry/tracing.ts | 94 ------------------------------------- 1 file changed, 94 deletions(-) delete mode 100644 server/lib/opentelemetry/tracing.ts (limited to 'server/lib/opentelemetry/tracing.ts') diff --git a/server/lib/opentelemetry/tracing.ts b/server/lib/opentelemetry/tracing.ts deleted file mode 100644 index 9a81680b2..000000000 --- a/server/lib/opentelemetry/tracing.ts +++ /dev/null @@ -1,94 +0,0 @@ -import { SequelizeInstrumentation } from 'opentelemetry-instrumentation-sequelize' -import { context, diag, DiagLogLevel, trace } from '@opentelemetry/api' -import { JaegerExporter } from '@opentelemetry/exporter-jaeger' -import { registerInstrumentations } from '@opentelemetry/instrumentation' -import { DnsInstrumentation } from '@opentelemetry/instrumentation-dns' -import { ExpressInstrumentation } from '@opentelemetry/instrumentation-express' -import FsInstrumentation from '@opentelemetry/instrumentation-fs' -import { HttpInstrumentation } from '@opentelemetry/instrumentation-http' -import { IORedisInstrumentation } from '@opentelemetry/instrumentation-ioredis' -import { PgInstrumentation } from '@opentelemetry/instrumentation-pg' -import { Resource } from '@opentelemetry/resources' -import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base' -import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node' -import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions' -import { logger } from '@server/helpers/logger' -import { CONFIG } from '@server/initializers/config' - -const tracer = trace.getTracer('peertube') - -function registerOpentelemetryTracing () { - if (CONFIG.OPEN_TELEMETRY.TRACING.ENABLED !== true) return - - logger.info('Registering Open Telemetry tracing') - - const customLogger = (level: string) => { - return (message: string, ...args: unknown[]) => { - let fullMessage = message - - for (const arg of args) { - if (typeof arg === 'string') fullMessage += arg - else break - } - - logger[level](fullMessage) - } - } - - diag.setLogger({ - error: customLogger('error'), - warn: customLogger('warn'), - info: customLogger('info'), - debug: customLogger('debug'), - verbose: customLogger('verbose') - }, DiagLogLevel.INFO) - - const tracerProvider = new NodeTracerProvider({ - resource: new Resource({ - [SemanticResourceAttributes.SERVICE_NAME]: 'peertube' - }) - }) - - registerInstrumentations({ - tracerProvider, - instrumentations: [ - new PgInstrumentation({ - enhancedDatabaseReporting: true - }), - new DnsInstrumentation(), - new HttpInstrumentation(), - new ExpressInstrumentation(), - new IORedisInstrumentation({ - dbStatementSerializer: function (cmdName, cmdArgs) { - return [ cmdName, ...cmdArgs ].join(' ') - } - }), - new FsInstrumentation(), - new SequelizeInstrumentation() - ] - }) - - tracerProvider.addSpanProcessor( - new BatchSpanProcessor( - new JaegerExporter({ endpoint: CONFIG.OPEN_TELEMETRY.TRACING.JAEGER_EXPORTER.ENDPOINT }) - ) - ) - - tracerProvider.register() -} - -async function wrapWithSpanAndContext (spanName: string, cb: () => Promise) { - const span = tracer.startSpan(spanName) - const activeContext = trace.setSpan(context.active(), span) - - const result = await context.with(activeContext, () => cb()) - span.end() - - return result -} - -export { - registerOpentelemetryTracing, - tracer, - wrapWithSpanAndContext -} -- cgit v1.2.3