@apifuse/provider-sdk 2.2.0-beta.55 → 2.2.0-beta.57

package/dist/server/serve-implementation.js

@@ -26,6 +26,7 @@ import { getProviderBaseUrl } from "../runtime/provider.js";
 import { createOcrClientFromEnv } from "../runtime/ocr.js";
 import { PROXY_AUTH_IP_DENIED_CODE, PROXY_EDGE_AUTH_REJECTED_CODE, PROXY_POOL_EXHAUSTED_CODE, } from "../runtime/proxy-errors.js";
 import { PROVIDER_TELEMETRY_HEADER, ProxyTelemetryCollector, } from "../runtime/proxy-telemetry.js";
+import { closedEnum, RequestTelemetry, tenantOpaqueKeys, } from "../runtime/request-telemetry.js";
 import { createUnsupportedResolverClient, } from "../runtime/resolver-shared.js";
 import { assertRequiredSecretsPresent, listMissingRequiredSecrets, MISSING_SECRET_CODE, } from "../runtime/secrets.js";
 import { createProviderRuntimeStateFromEnv, createUnsupportedProviderRuntimeState, } from "../runtime/state.js";
@@ -75,6 +76,16 @@ function providerErrorCode(error) {
 }
 const AUTH_FLOW_LOCALES = ["en", "ko", "ja"];
 const retryResponseMeta = new WeakMap();
+const RETRY_LAST_ERROR_CODES = [
+    "transport_cancelled",
+    "transport_timeout",
+    "transport_network_error",
+    "upstream_http_error",
+    "other",
+];
+function tenantRetryLastErrorCode(value) {
+    return RETRY_LAST_ERROR_CODES.find((candidate) => candidate === value) ?? "other";
+}
 const STATEFUL_INTERNAL_OPERATIONS_ROUTE = "/__apifuse/stateful/operations";
 const STATEFUL_FORWARDING_SOURCE_POD_HEADER = "x-apifuse-stateful-source-pod";
 const DEFAULT_STATEFUL_FORWARDING_MAX_SKEW_MS = 5 * 60_000;
@@ -409,7 +420,7 @@ function createProviderContext(provider, request, operationId, options, state =
     const proxyClientOptions = {
         upstream: { proxy: provider.proxy },
         affinityKey: resolveProviderProxyAffinityKey(provider, request, operationId),
-        telemetry: scope.proxyTelemetry,
+        telemetry: scope.telemetry.proxy,
         engineCredentials: engineProxyCredentials,
     };
     const resolverIdentityScope = resolveProviderResolverIdentityScope(provider, proxyClientOptions.affinityKey, request.requestId);
@@ -417,7 +428,7 @@ function createProviderContext(provider, request, operationId, options, state =
     const stealthClientOptions = {
         upstream: proxyClientOptions.upstream,
         affinityKey: proxyClientOptions.affinityKey,
-        telemetry: scope.proxyTelemetry,
+        telemetry: scope.telemetry.proxy,
         engineCredentials: engineProxyCredentials,
         ...(signal ? { signal } : {}),
         ...(provider.stealth ? { stealth: provider.stealth } : {}),
@@ -564,14 +575,14 @@ function createAuthFlowContext(provider, request, options, state, scope, signal)
     const proxyClientOptions = {
         upstream: { proxy: provider.proxy },
         affinityKey: resolveAuthFlowProxyAffinityKey(provider, request),
-        telemetry: scope.proxyTelemetry,
+        telemetry: scope.telemetry.proxy,
         engineCredentials: engineProxyCredentials,
     };
     const resolverIdentityScope = resolveProviderResolverIdentityScope(provider, proxyClientOptions.affinityKey, request.requestId);
     const stealthClientOptions = {
         upstream: proxyClientOptions.upstream,
         affinityKey: proxyClientOptions.affinityKey,
-        telemetry: scope.proxyTelemetry,
+        telemetry: scope.telemetry.proxy,
         engineCredentials: engineProxyCredentials,
         ...(signal ? { signal } : {}),
         ...(provider.stealth ? { stealth: provider.stealth } : {}),
@@ -1014,7 +1025,7 @@ function providerErrorCauseChain(error) {
     }
     return frames.length > 0 ? frames : undefined;
 }
-function logProviderError(logger, provider, kind, route, requestId, error, status, cost, declaredErrorCode, proxyTelemetry, observabilityDetails, correlation = {}) {
+function logProviderError(logger, provider, kind, route, requestId, error, status, cost, declaredErrorCode, telemetry, observabilityDetails, correlation = {}) {
     const providerCode = isProviderError(error) ? providerErrorCode(error) : undefined;
     const code = isProviderError(error)
         ? (providerCode ?? "provider_error")
@@ -1033,7 +1044,7 @@ function logProviderError(logger, provider, kind, route, requestId, error, statu
         typeof providerCode === "string" &&
         !SDK_OWNED_PROVIDER_ERROR_CODES.has(providerCode) &&
         declaredErrorCode === undefined;
-    const proxy = proxyTelemetry?.toLogPayload();
+    const telemetryPayload = telemetry?.toLogPayload();
     const emit = typeof logger === "function" ? logger : defaultProviderServerLogger;
     // The logger is caller-supplied and may mutate the event synchronously.
     // Give it an independent snapshot so those mutations cannot corrupt the
@@ -1058,7 +1069,7 @@ function logProviderError(logger, provider, kind, route, requestId, error, statu
             : {}),
         status,
         ...cost,
-        ...(proxy ? { proxy } : {}),
+        ...(telemetryPayload ?? {}),
         code,
         errorClass,
         message,
@@ -1093,8 +1104,8 @@ function logProviderCleanupError(logger, provider, kind, operationId, requestId,
         message,
     });
 }
-function logProviderSuccess(logger, provider, kind, route, requestId, status, cost, proxyTelemetry, correlation = {}) {
-    const proxy = proxyTelemetry?.toLogPayload();
+function logProviderSuccess(logger, provider, kind, route, requestId, status, cost, telemetry, correlation = {}) {
+    const telemetryPayload = telemetry?.toLogPayload();
     const emit = typeof logger === "function" ? logger : defaultProviderServerLogger;
     emit({
         level: "info",
@@ -1113,7 +1124,7 @@ function logProviderSuccess(logger, provider, kind, route, requestId, status, co
             : {}),
         status,
         ...cost,
-        ...(proxy ? { proxy } : {}),
+        ...(telemetryPayload ?? {}),
     });
 }
 const STREAM_CLEANUP_TIMEOUT_MS = 100;
@@ -1165,7 +1176,6 @@ function requestTraceId(headers, requestId) {
 function createRequestScope(input) {
     const requestCost = startRequestCost();
     const traceConfig = resolveTraceConfigFromEnv();
-    const proxyTelemetry = new ProxyTelemetryCollector();
     const details = {
         route: input.route,
         requestId: input.requestId,
@@ -1188,6 +1198,9 @@ function createRequestScope(input) {
             ...(initialTraceId ? { traceId: initialTraceId } : {}),
         })
         : createTraceContext();
+    const proxyCollector = new ProxyTelemetryCollector();
+    const telemetry = new RequestTelemetry(trace);
+    telemetry.register(proxyCollector);
     let rootRunner = (fn) => fn();
     let resolveRoot;
     const rootTerminal = new Promise((resolve) => {
@@ -1233,7 +1246,7 @@ function createRequestScope(input) {
         await Promise.all(streamCleanups.map(runCleanupEntry));
     };
     const headerSnapshot = (error) => {
-        const providerTelemetryHeader = proxyTelemetry.toHeaderValue();
+        const providerTelemetryHeader = telemetry.toHeaderValue();
         const declaredErrorCode = error === undefined ? undefined : input.declaredErrorCode?.(error);
         const errorObservability = error === undefined ? undefined : errorObservabilityDetails(error, declaredErrorCode);
         return {
@@ -1261,7 +1274,7 @@ function createRequestScope(input) {
     };
     const scope = {
         trace,
-        proxyTelemetry,
+        telemetry,
         enrich(enrichment) {
             if (terminalOutcome)
                 return;
@@ -1334,10 +1347,10 @@ function createRequestScope(input) {
                 const cost = finishRequestCost(requestCost);
                 try {
                     if (error === undefined) {
-                        logProviderSuccess(input.logger, input.provider, input.kind, details.route, details.requestId, status, cost, proxyTelemetry, details.correlation);
+                        logProviderSuccess(input.logger, input.provider, input.kind, details.route, details.requestId, status, cost, telemetry, details.correlation);
                     }
                     else {
-                        logProviderError(input.logger, input.provider, input.kind, details.route, details.requestId, error, status, cost, declaredErrorCode, proxyTelemetry, finishedResult.errorObservability, details.correlation);
+                        logProviderError(input.logger, input.provider, input.kind, details.route, details.requestId, error, status, cost, declaredErrorCode, telemetry, finishedResult.errorObservability, details.correlation);
                     }
                 }
                 catch {
@@ -1407,18 +1420,43 @@ function toJsonSuccessResponse(result, ctx) {
     }
     const cacheMeta = ctx && "cache" in ctx ? ctx.cache.responseMeta() : undefined;
     const retryMeta = ctx ? retryResponseMeta.get(ctx) : undefined;
+    const cache = cacheMeta
+        ? {
+            hit: cacheMeta.hit,
+            stale: cacheMeta.stale,
+            // TODO(owner): keep or remove implementation-shaped cache keys from tenant meta.
+            keys: tenantOpaqueKeys(cacheMeta.keys),
+            ...(cacheMeta.source ? { source: closedEnum(cacheMeta.source) } : {}),
+        }
+        : undefined;
+    const retry = retryMeta
+        ? {
+            attempts: retryMeta.attempts,
+            retries: retryMeta.retries,
+            ...(retryMeta.preset ? { preset: closedEnum(retryMeta.preset) } : {}),
+            transport: closedEnum(retryMeta.transport),
+            ...(retryMeta.lastErrorCode
+                ? {
+                    lastErrorCode: closedEnum(tenantRetryLastErrorCode(retryMeta.lastErrorCode)),
+                }
+                : {}),
+            ...(retryMeta.lastStatus ? { lastStatus: retryMeta.lastStatus } : {}),
+        }
+        : undefined;
     const meta = cacheMeta || retryMeta
         ? {
-            ...(cacheMeta
+            ...(cache
                 ? {
-                    cached: cacheMeta.hit,
-                    stale: cacheMeta.stale,
-                    cache: cacheMeta,
+                    cached: cache.hit,
+                    stale: cache.stale,
+                    cache,
                 }
                 : {}),
-            ...(retryMeta ? { retry: retryMeta } : {}),
+            ...(retry ? { retry } : {}),
         }
         : undefined;
+    const _neutralMeta = meta;
+    void _neutralMeta;
     return {
         data: result,
         ...(meta ? { meta } : {}),

package/package.json

@@ -1,5 +1,5 @@
 {
-	"version": "2.2.0-beta.55",
+	"version": "2.2.0-beta.57",
 	"name": "@apifuse/provider-sdk",
 	"private": false,
 	"type": "module",

package/src/cli/__tests__/fixtures/migrate-operation-declaration/discovery-runtime-composed-index.ts.txt

@@ -0,0 +1,3 @@
+import { makeRegistry } from "./operations/registry";
+
+export default buildProvider({ operations: makeRegistry({ publicOnly: true }) });

package/src/cli/__tests__/fixtures/migrate-operation-declaration/discovery-runtime-composed-one.ts.txt

@@ -0,0 +1,6 @@
+export const firstOperation = defineOperation<ProviderContext>()({
+	annotations: { readOnly: true },
+	input: FirstInputSchema,
+	output: FirstOutputSchema,
+	handler: firstHandler,
+});

package/src/cli/__tests__/fixtures/migrate-operation-declaration/discovery-runtime-composed-two.ts.txt

@@ -0,0 +1,6 @@
+export const secondOperation = defineOperation<ProviderContext>()({
+	annotations: { readOnly: true },
+	input: SecondInputSchema,
+	output: SecondOutputSchema,
+	handler: secondHandler,
+});

package/src/cli/__tests__/fixtures/migrate-operation-declaration/discovery-runtime-mixed-index.ts.txt

@@ -0,0 +1,14 @@
+import { makeRegistry } from "./operations/registry";
+
+const literalOperation = defineOperation<ProviderContext>()({
+	annotations: { readOnly: true },
+	input: LiteralInputSchema,
+	output: LiteralOutputSchema,
+	handler: literalHandler,
+});
+
+export const literalProvider = buildProvider({
+	operations: { literal: literalOperation },
+});
+
+export default buildProvider({ operations: makeRegistry({ publicOnly: true }) });

package/src/cli/__tests__/fixtures/migrate-operation-declaration/discovery-runtime-registry.ts.txt

@@ -0,0 +1,3 @@
+export function makeRegistry(_options: { publicOnly: boolean }) {
+	return {};
+}

package/src/cli/migrate-operation-declaration.ts

@@ -141,6 +141,8 @@ type RepositoryMigrationContext = {
 	readonly operationSites?: ReadonlyMap<number, string>;
 	readonly excludedBindings?: ReadonlySet<string>;
 	readonly staticObjectResolver?: StaticObjectResolver;
+	readonly runtimeComposedInitializers?: ReadonlySet<number>;
+	readonly recordDiscoveredSites?: (count: number) => void;
 };
 
 type OperationSite = {
@@ -194,7 +196,9 @@ function migrateOperationDeclarationInternal(
 		options.operationIds,
 		context.operationSites,
 		context.excludedBindings,
+		context.runtimeComposedInitializers,
 	);
+	context.recordDiscoveredSites?.(discovery.discoveredCount);
 	if (discovery.refusals.length > 0) {
 		return { status: "refused", refusals: discovery.refusals };
 	}
@@ -1047,18 +1051,27 @@ function discoverOperationSites(
 	operationIds: ReadonlyMap<string, string> | undefined,
 	operationSites: ReadonlyMap<number, string> | undefined,
 	excludedBindings: ReadonlySet<string> | undefined,
+	runtimeComposedInitializers: ReadonlySet<number> | undefined,
 ): {
 	readonly sites: OperationSite[];
+	readonly discoveredCount: number;
 	readonly refusals: OperationDeclarationRefusal[];
 } {
 	const sitesByStart = new Map<number, OperationSite>();
+	const discoveredStarts = new Set<number>();
 	const localIds = new Map(operationIds ?? []);
 	const localExcludedBindings = new Set(excludedBindings ?? []);
 	const refusals: OperationDeclarationRefusal[] = [];
 	const operationFactories = collectSimpleOperationFactories(source);
 	const factoryCallIds = new Map<string, Set<string>>();
 
-	for (const map of collectOperationsMaps(source, constObjects, fileName, refusals)) {
+	for (const map of collectOperationsMaps(
+		source,
+		constObjects,
+		fileName,
+		refusals,
+		runtimeComposedInitializers,
+	)) {
 		for (const property of map.properties) {
 			if (ts.isSpreadAssignment(property)) continue;
 			const key = staticPropertyName(property.name);
@@ -1145,12 +1158,15 @@ function discoverOperationSites(
 		if (ts.isCallExpression(node) && isOperationHelperCall(node)) {
 			const argument = operationArgument(node);
 			const bindingName = enclosingBindingName(node);
+			const unwrappedArgument = unwrapExpression(argument);
+			if (unwrappedArgument !== undefined && ts.isObjectLiteralExpression(unwrappedArgument)) {
+				discoveredStarts.add(unwrappedArgument.getStart(source));
+			}
 			if (bindingName !== undefined && localExcludedBindings.has(bindingName)) return;
 			const operationKey =
 				(bindingName === undefined ? undefined : localIds.get(bindingName)) ??
 				bindingName ??
 				"<anonymous>";
-			const unwrappedArgument = unwrapExpression(argument);
 			if (unwrappedArgument === undefined || !ts.isObjectLiteralExpression(unwrappedArgument)) {
 				refusals.push(
 					refusal(
@@ -1181,10 +1197,12 @@ function discoverOperationSites(
 		ts.forEachChild(node, visit);
 	};
 	visit(source);
+	for (const start of sitesByStart.keys()) discoveredStarts.add(start);
 	return {
 		sites: [...sitesByStart.values()].sort(
 			(left, right) => left.object.getStart(source) - right.object.getStart(source),
 		),
+		discoveredCount: discoveredStarts.size,
 		refusals,
 	};
 }
@@ -1223,6 +1241,7 @@ function collectOperationsMaps(
 	constObjects: ReadonlyMap<string, TS.ObjectLiteralExpression>,
 	fileName: string,
 	refusals: OperationDeclarationRefusal[],
+	runtimeComposedInitializers?: ReadonlySet<number>,
 ): TS.ObjectLiteralExpression[] {
 	const maps = new Map<number, TS.ObjectLiteralExpression>();
 	const inspect = (expression: TS.Expression, label: string): void => {
@@ -1238,6 +1257,7 @@ function collectOperationsMaps(
 			return;
 		}
 		if (ts.isCallExpression(unwrapped)) {
+			if (runtimeComposedInitializers?.has(expression.getStart(source)) === true) return;
 			refusals.push(
 				refusal(
 					fileName,
@@ -1893,6 +1913,7 @@ export type OperationDeclarationRepositoryResult =
 			readonly providerRoot: string;
 			readonly changedFiles: readonly string[];
 			readonly operationCount: number;
+			readonly notes: readonly OperationDeclarationNote[];
 			readonly sidecar?: string;
 			readonly localeTodoCount: number;
 	  }
@@ -1902,10 +1923,17 @@ export type OperationDeclarationRepositoryResult =
 			readonly refusals: readonly OperationDeclarationRefusal[];
 			/** Operations that were independently migratable before repository-atomic refusal. */
 			readonly operationCount: number;
+			readonly notes: readonly OperationDeclarationNote[];
 			readonly changedFiles: readonly string[];
 			readonly localeTodoCount: number;
 	  };
 
+export type OperationDeclarationNote = {
+	readonly code: "runtime_composed_registry";
+	readonly path: string;
+	readonly initializer: string;
+};
+
 /** Run the file transform repository-wide, committing writes only if every file is provable. */
 export function migrateOperationDeclarationRepository(
 	providerRootInput: string,
@@ -1920,6 +1948,7 @@ export function migrateOperationDeclarationRepository(
 	const todos: LocaleTodo[] = [];
 	const refusals: OperationDeclarationRefusal[] = [...repositoryIndex.refusals];
 	let operationCount = 0;
+	let repositoryDiscoveredCount = 0;
 
 	for (const sourcePath of sourceFiles) {
 		const relativePath = slash(relative(providerRoot, sourcePath));
@@ -1934,6 +1963,10 @@ export function migrateOperationDeclarationRepository(
 				operationSites: repositoryIndex.operationSites.get(sourcePath),
 				excludedBindings: repositoryIndex.excludedBindings.get(sourcePath),
 				staticObjectResolver: repositoryIndex.staticObjectResolverFor(sourcePath),
+				runtimeComposedInitializers: repositoryIndex.runtimeComposedInitializers.get(sourcePath),
+				recordDiscoveredSites: (count) => {
+					repositoryDiscoveredCount += count;
+				},
 			},
 		);
 		if (result.status === "refused") {
@@ -1947,7 +1980,21 @@ export function migrateOperationDeclarationRepository(
 			todos.push(...result.localeTodos);
 		}
 	}
-	if (repositoryIndex.declarations.length > 0 && repositoryIndex.discoveredCount === 0) {
+	const notes: OperationDeclarationNote[] =
+		repositoryDiscoveredCount === 0
+			? []
+			: repositoryIndex.declarations.flatMap((declaration) =>
+					declaration.runtimeInitializer === undefined
+						? []
+						: [
+								{
+									code: "runtime_composed_registry" as const,
+									path: slash(relative(providerRoot, declaration.path)),
+									initializer: declaration.runtimeInitializer,
+								},
+							],
+				);
+	if (repositoryIndex.declarations.length > 0 && repositoryDiscoveredCount === 0) {
 		for (const declaration of repositoryIndex.declarations) {
 			refusals.push(
 				refusal(
@@ -1970,6 +2017,7 @@ export function migrateOperationDeclarationRepository(
 			providerRoot,
 			refusals,
 			operationCount,
+			notes,
 			changedFiles,
 			localeTodoCount: todos.length,
 		};
@@ -1984,6 +2032,7 @@ export function migrateOperationDeclarationRepository(
 			providerRoot,
 			changedFiles: [],
 			operationCount,
+			notes,
 			localeTodoCount: 0,
 		};
 	}
@@ -2000,6 +2049,7 @@ export function migrateOperationDeclarationRepository(
 		providerRoot,
 		changedFiles,
 		operationCount,
+		notes,
 		sidecar,
 		localeTodoCount: todos.length,
 	};
@@ -2180,15 +2230,16 @@ type ProviderOperationsDeclaration = {
 	readonly path: string;
 	readonly construct: string;
 	readonly initializer: TS.Expression;
+	readonly runtimeInitializer?: string;
 };
 
 type RepositoryOperationIndex = {
 	readonly operationIds: Map<string, Map<string, string>>;
 	readonly operationSites: Map<string, Map<number, string>>;
 	readonly excludedBindings: Map<string, Set<string>>;
+	readonly runtimeComposedInitializers: Map<string, Set<number>>;
 	readonly refusals: OperationDeclarationRefusal[];
 	readonly declarations: ProviderOperationsDeclaration[];
-	readonly discoveredCount: number;
 	readonly staticObjectResolverFor: (path: string) => StaticObjectResolver;
 };
 
@@ -2205,12 +2256,12 @@ function buildRepositoryOperationIndex(
 	const operationIds = buildOperationIdIndex(sourceFiles);
 	const operationSites = new Map<string, Map<number, string>>();
 	const excludedBindings = new Map<string, Set<string>>();
+	const runtimeComposedInitializers = new Map<string, Set<number>>();
 	const refusals: OperationDeclarationRefusal[] = [];
 	const declarations: ProviderOperationsDeclaration[] = [];
 	const indexedProviderProperties = new Set<string>();
 	const factoryIds = new Map<string, { path: string; name: string; ids: Set<string> }>();
 	const bindingCandidates = new Map<string, { path: string; name: string; ids: Set<string> }>();
-	let discoveredCount = 0;
 
 	const relativePath = (path: string): string => slash(relative(providerRoot, path));
 	const resolutionRefusal = (path: string, operationKey: string, detail: string): void => {
@@ -2489,7 +2540,6 @@ function buildRepositoryOperationIndex(
 		}
 		sites.set(start, operationId);
 		operationSites.set(path, sites);
-		discoveredCount += 1;
 	};
 
 	const classifyEntry = (entry: RegistryEntry): void => {
@@ -2543,7 +2593,6 @@ function buildRepositoryOperationIndex(
 			};
 			factory.ids.add(entry.operationId);
 			factoryIds.set(key, factory);
-			discoveredCount += 1;
 			return;
 		}
 		resolutionRefusal(
@@ -2562,10 +2611,26 @@ function buildRepositoryOperationIndex(
 		const key = `${path}\0${node.getStart(source)}`;
 		if (indexedProviderProperties.has(key)) return;
 		indexedProviderProperties.add(key);
-		declarations.push({ path, construct, initializer: node.initializer });
+		const resolvedInitializer = resolveLocatedExpression(
+			{ path, source, expression: node.initializer },
+			new Set(),
+		);
+		let runtimeInitializer: string | undefined;
+		if (resolvedInitializer.status === "resolved") {
+			const resolvedExpression = unwrapExpression(resolvedInitializer.value.expression);
+			if (resolvedExpression !== undefined && ts.isCallExpression(resolvedExpression)) {
+				runtimeInitializer = resolvedExpression.getText(resolvedInitializer.value.source);
+				const initializers = runtimeComposedInitializers.get(path) ?? new Set<number>();
+				initializers.add(node.initializer.getStart(source));
+				runtimeComposedInitializers.set(path, initializers);
+			}
+		}
+		declarations.push({ path, construct, initializer: node.initializer, runtimeInitializer });
 		const flattened = flattenRegistry({ path, source, expression: node.initializer }, new Set());
 		if ("detail" in flattened) {
-			resolutionRefusal(path, "<operations>", flattened.detail);
+			if (runtimeInitializer === undefined) {
+				resolutionRefusal(path, "<operations>", flattened.detail);
+			}
 		} else {
 			for (const entry of flattened.entries.values()) classifyEntry(entry);
 		}
@@ -2691,9 +2756,9 @@ function buildRepositoryOperationIndex(
 		operationIds,
 		operationSites,
 		excludedBindings,
+		runtimeComposedInitializers,
 		refusals,
 		declarations,
-		discoveredCount,
 		staticObjectResolverFor: (currentPath) => (expression, source) =>
 			resolveStaticObject(expression, sources.has(source.fileName) ? source.fileName : currentPath),
 	};

package/src/index.ts

@@ -181,10 +181,23 @@ export {
 export type { PrevalidateResult } from "./runtime/prevalidate.js";
 export { getProviderBaseUrl } from "./runtime/provider.js";
 export type {
+	ProxyTelemetryHeaderPayload,
+	ProxyHash,
 	ProxyTelemetryLogPayload,
 	ProxyTelemetryResolvedPayload,
 	ProxyTelemetryUnresolvedPayload,
 } from "./runtime/proxy-telemetry.js";
+export {
+	RequestTelemetry,
+	closedEnum,
+	type ClosedEnum,
+	type GatewayIngestible,
+	type RequestTelemetryLogPayload,
+	type SpanIndex,
+	type TelemetryContributor,
+	type TelemetryKey,
+	type TenantNeutral,
+} from "./runtime/request-telemetry.js";
 export {
 	APIFUSE__CDP_POOL__URL,
 	APIFUSE__RESOLVER__2CAPTCHA__API_KEY,