fix: don't import from @opentelemetry/api in public types (#9066)

sheremet-va · web-flow · commit e944a37b715f · 2025-11-20T12:57:26.000+01:00
diff --git a/packages/vitest/src/runtime/moduleRunner/moduleEvaluator.ts b/packages/vitest/src/runtime/moduleRunner/moduleEvaluator.ts
@@ -29,6 +29,9 @@ export interface VitestModuleEvaluatorOptions {
   getCurrentTestFilepath?: () => string | undefined
   compiledFunctionArgumentsNames?: string[]
   compiledFunctionArgumentsValues?: unknown[]
+  /**
+   * @internal
+   */
   traces?: Traces
 }
 
diff --git a/packages/vitest/src/runtime/moduleRunner/moduleMocker.ts b/packages/vitest/src/runtime/moduleRunner/moduleMocker.ts
@@ -20,6 +20,9 @@ interface MockContext {
 
 export interface VitestMockerOptions {
   context?: vm.Context
+  /**
+   * @internal
+   */
   traces: Traces
   spyModule?: typeof import('@vitest/spy')
   root: string
diff --git a/packages/vitest/src/runtime/moduleRunner/moduleRunner.ts b/packages/vitest/src/runtime/moduleRunner/moduleRunner.ts
@@ -206,6 +206,9 @@ export interface VitestModuleRunnerOptions {
   getWorkerState: () => WorkerGlobalState
   mocker?: VitestMocker
   vm?: VitestVmOptions
+  /**
+   * @internal
+   */
   traces?: Traces
   spyModule?: typeof import('@vitest/spy')
   createImportMeta?: CreateImportMeta
diff --git a/packages/vitest/src/runtime/moduleRunner/startModuleRunner.ts b/packages/vitest/src/runtime/moduleRunner/startModuleRunner.ts
@@ -27,6 +27,9 @@ export interface ContextModuleRunnerOptions {
   context?: vm.Context
   externalModulesExecutor?: ExternalModulesExecutor
   state: WorkerGlobalState
+  /**
+   * @internal
+   */
   traces?: Traces // optional to keep backwards compat
   spyModule?: typeof import('@vitest/spy')
   createImportMeta?: CreateImportMeta
diff --git a/packages/vitest/src/types/worker.ts b/packages/vitest/src/types/worker.ts
@@ -49,6 +49,9 @@ export interface WorkerSetupContext {
   config: SerializedConfig
   projectName: string
   rpc: WorkerRPC
+  /**
+   * @internal
+   */
   traces: Traces
 }
 
diff --git a/packages/vitest/src/utils/traces.ts b/packages/vitest/src/utils/traces.ts
@@ -83,13 +83,19 @@ export class Traces {
     return !!this.#otel
   }
 
+  /**
+   * @internal
+   */
   async waitInit(): Promise<this> {
     if (this.#init) {
       await this.#init
     }
     return this
   }
 
+  /**
+   * @internal
+   */
   startContextSpan(name: string, currentContext?: Context): {
     span: Span
     context: Context
@@ -114,6 +120,9 @@ export class Traces {
     }
   }
 
+  /**
+   * @internal
+   */
   getContextFromCarrier(carrier: OTELCarrier | undefined): Context {
     if (!this.#otel) {
       return this.#noopContext
@@ -125,6 +134,9 @@ export class Traces {
     return this.#otel.propagation.extract(activeContext, carrier)
   }
 
+  /**
+   * @internal
+   */
   getContextCarrier(context?: Context): OTELCarrier | undefined {
     if (!this.#otel) {
       return undefined
@@ -177,8 +189,17 @@ export class Traces {
     }
   }
 
+  /**
+   * @internal
+   */
   $<T>(name: string, fn: (span: Span) => T): T
+  /**
+   * @internal
+   */
   $<T>(name: string, optionsOrFn: TracesSpanOptions, fn: (span: Span) => T): T
+  /**
+   * @internal
+   */
   $<T>(name: string, optionsOrFn: TracesSpanOptions | ((span: Span) => T), fn?: (span: Span) => T): T {
     const callback = typeof optionsOrFn === 'function' ? optionsOrFn : fn!
     if (!this.#otel) {
@@ -203,6 +224,9 @@ export class Traces {
     )
   }
 
+  /**
+   * @internal
+   */
   startSpan(name: string, options?: SpanOptions, context?: Context): Span {
     if (!this.#otel) {
       return this.#noopSpan
@@ -211,6 +235,9 @@ export class Traces {
     return tracer.startSpan(name, options, context)
   }
 
+  /**
+   * @internal
+   */
   async finish(): Promise<void> {
     await this.#sdk?.shutdown()
   }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ export interface VitestModuleEvaluatorOptions {`
`29`	`29`	`getCurrentTestFilepath?: () => string \| undefined`
`30`	`30`	`compiledFunctionArgumentsNames?: string[]`
`31`	`31`	`compiledFunctionArgumentsValues?: unknown[]`
	`32`	`+ /**`
	`33`	`+ * @internal`
	`34`	`+ */`
`32`	`35`	`traces?: Traces`
`33`	`36`	`}`
`34`	`37`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ export interface WorkerSetupContext {`
`49`	`49`	`config: SerializedConfig`
`50`	`50`	`projectName: string`
`51`	`51`	`rpc: WorkerRPC`
	`52`	`+ /**`
	`53`	`+ * @internal`
	`54`	`+ */`
`52`	`55`	`traces: Traces`
`53`	`56`	`}`
`54`	`57`