@m1212e/rumble 0.16.20 → 0.16.22

package/out/index.cjs

@@ -218,7 +218,7 @@ function mapNullFieldsToUndefined(obj) {
 
 //#endregion
 //#region package.json
-var version = "0.16.20";
+var version = "0.16.22";
 
 //#endregion
 //#region lib/helpers/mergeFilters.ts
@@ -1640,32 +1640,56 @@ export const db = drizzle(
 		return (0, graphql_yoga.createYoga)({
 			...args,
 			graphiql: enableApiDocs,
+			schema: builtSchema(),
+			context,
 			plugins: [
 				...args?.plugins ?? [],
 				...enableApiDocs ? [] : [(0, _graphql_yoga_plugin_disable_introspection.useDisableIntrospection)(), (0, _escape_tech_graphql_armor.EnvelopArmorPlugin)()],
 				rumbleInput.otel?.enabled ? { onExecute: ({ setExecuteFn, executeFn }) => {
-					setExecuteFn((options) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: { [_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: options.operationName ?? "anonymous" } }, async (span) => {
+					setExecuteFn((options) => rumbleInput.otel.tracer.startActiveSpan(_pothos_tracing_opentelemetry.SpanNames.EXECUTE, { attributes: {
+						[_pothos_tracing_opentelemetry.AttributeNames.OPERATION_NAME]: options.operationName ?? "anonymous",
+						[_pothos_tracing_opentelemetry.AttributeNames.SOURCE]: options.document
+					} }, async (span) => {
 						try {
-							return await executeFn(options);
+							const result = await executeFn(options);
+							if (result && "errors" in result && result.errors?.length) {
+								for (const error of result.errors) span.recordException(error);
+								span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+							}
+							return result;
 						} catch (error) {
-							span.recordException(error);
+							if (error instanceof Error) span.recordException(error);
+							span.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
 							throw error;
 						} finally {
 							span.end();
 						}
 					}));
 				} } : false
-			].filter(Boolean),
-			schema: builtSchema(),
-			context
+			].filter(Boolean)
 		});
 	};
 	const createSofa = (args) => {
 		if (args.openAPI) (0, es_toolkit.merge)(args.openAPI, sofaOpenAPIWebhookDocs);
+		if (args.errorHandler) {
+			const originalHandler = args.errorHandler;
+			args.errorHandler = (errors) => {
+				const span = _opentelemetry_api.trace.getActiveSpan();
+				for (const error of errors) span?.recordException(error);
+				span?.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+				return originalHandler(errors);
+			};
+		}
 		return (0, sofa_api.useSofa)({
 			...args,
 			schema: builtSchema(),
-			context
+			context,
+			errorHandler(errors) {
+				const span = _opentelemetry_api.trace.getActiveSpan();
+				for (const error of errors) span?.recordException(error);
+				span?.setStatus({ code: _opentelemetry_api.SpanStatusCode.ERROR });
+				return new Response(errors[0].message, { status: 500 });
+			}
 		});
 	};
 	return {