1 files changed, 14 insertions, 3 deletions

diff --git a/server/lib/opentelemetry/tracing.ts b/server/lib/opentelemetry/tracing.ts
index 252a3b664..b1c3bd173 100644
--- a/server/lib/opentelemetry/tracing.ts
+++ b/server/lib/opentelemetry/tracing.ts
@@ -1,5 +1,5 @@
 import { SequelizeInstrumentation } from 'opentelemetry-instrumentation-sequelize'
-import { diag, DiagLogLevel, trace } from '@opentelemetry/api'
+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'
@@ -15,6 +15,8 @@ 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
 
@@ -75,9 +77,18 @@ function registerOpentelemetryTracing () {
   tracerProvider.register()
 }
 
-const tracer = trace.getTracer('peertube')
+async function wrapWithSpanAndContext <T> (spanName: string, cb: () => Promise<T>) {
+  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
+  tracer,
+  wrapWithSpanAndContext
 }