@m1212e/rumble 0.16.17 → 0.16.19

package/out/index.cjs

@@ -31,6 +31,7 @@ const require_generate = require('./generate-9zSO5f7n.cjs');
 let graphql = require("graphql");
 let _escape_tech_graphql_armor = require("@escape.tech/graphql-armor");
 let _graphql_yoga_plugin_disable_introspection = require("@graphql-yoga/plugin-disable-introspection");
+let _opentelemetry_api = require("@opentelemetry/api");
 let _pothos_tracing_opentelemetry = require("@pothos/tracing-opentelemetry");
 let es_toolkit = require("es-toolkit");
 let graphql_yoga = require("graphql-yoga");
@@ -215,6 +216,10 @@ function mapNullFieldsToUndefined(obj) {
 	return Object.fromEntries(Object.entries(obj).map(([key, value]) => [key, value === null ? void 0 : value]));
 }
 
+//#endregion
+//#region package.json
+var version = "0.16.19";
+
 //#endregion
 //#region lib/helpers/mergeFilters.ts
 function mergeFilters(filterA, filterB) {
@@ -544,7 +549,7 @@ const createAbilityBuilder = ({ db, actions, defaultLimit, otel }) => {
 								span?.setAttribute("abilities.status", "applied");
 								return transformToResponse(mergedFilters);
 							};
-							if (otel?.tracer) return otel.tracer.startActiveSpan(`prepare_query_abilities_${action}`, (span) => {
+							if (otel?.enabled && otel.tracer) return otel.tracer.startActiveSpan(`prepare_query_abilities_${action}`, (span) => {
 								try {
 									return assembleAbilities(span);
 								} finally {
@@ -1457,8 +1462,10 @@ const applyFilters = async ({ filters, entities, context }) => {
 const applyFiltersKey = "applyFilters";
 var RuntimeFiltersPlugin = class extends _pothos_core.BasePlugin {
 	tracer;
+	tracerEnabled;
 	onTypeConfig(typeConfig) {
-		this.tracer = this.builder.options.otelTracer;
+		this.tracer = this.builder.options.otel?.tracer;
+		this.tracerEnabled = this.builder.options.otel?.enabled;
 		return typeConfig;
 	}
 	wrapResolve(resolver, fieldConfig) {
@@ -1485,9 +1492,9 @@ var RuntimeFiltersPlugin = class extends _pothos_core.BasePlugin {
 				if (Array.isArray(resolved)) return allowed;
 				return allowed[0] ?? null;
 			};
-			if (this.tracer) return this.tracer.startActiveSpan(`apply_filters_${fieldConfig.name}`, async (span) => {
+			if (this.tracer && this.tracerEnabled) return this.tracer.startActiveSpan(`apply_filters_${fieldConfig.name}`, async (span) => {
 				try {
-					return await runFilters();
+					return await runFilters(span);
 				} finally {
 					span.end();
 				}
@@ -1507,7 +1514,7 @@ function registerRuntimeFiltersPlugin() {
 //#endregion
 //#region lib/schemaBuilder.ts
 const createSchemaBuilder = ({ db, disableDefaultObjects, pubsub, pothosConfig, otel }) => {
-	const createSpan = otel?.tracer ? (0, _pothos_tracing_opentelemetry.createOpenTelemetryWrapper)(otel.tracer, otel.options) : void 0;
+	const createSpan = otel?.enabled && otel.tracer ? (0, _pothos_tracing_opentelemetry.createOpenTelemetryWrapper)(otel.tracer, otel.options) : void 0;
 	registerRuntimeFiltersPlugin();
 	const schemaBuilder = new _pothos_core.default({
 		...pothosConfig,
@@ -1533,10 +1540,10 @@ const createSchemaBuilder = ({ db, disableDefaultObjects, pubsub, pothosConfig,
 		}) },
 		defaultFieldNullability: false,
 		tracing: {
-			default: otel?.tracer ? (config) => (0, _pothos_plugin_tracing.isRootField)(config) : () => false,
+			default: otel?.enabled ? (config) => (0, _pothos_plugin_tracing.isRootField)(config) : () => false,
 			wrap: createSpan ? (resolver, options) => createSpan(resolver, options) : (resolver) => resolver
 		},
-		otelTracer: otel?.tracer
+		otel
 	});
 	schemaBuilder.addScalarType("JSON", graphql_scalars.JSONResolver);
 	schemaBuilder.addScalarType("Date", graphql_scalars.DateResolver);
@@ -1584,6 +1591,7 @@ export const db = drizzle(
 	];
 	if (rumbleInput.defaultLimit === void 0) rumbleInput.defaultLimit = 100;
 	if (rumbleInput.search?.enabled) initSearchIfApplicable(rumbleInput);
+	if (rumbleInput.otel?.enabled && !rumbleInput.otel.tracer) rumbleInput.otel.tracer = _opentelemetry_api.trace.getTracer("@m1212e/rumble", version);
 	const abilityBuilder = createAbilityBuilder(rumbleInput);
 	const context = createContextFunction({
 		...rumbleInput,
@@ -1638,7 +1646,7 @@ export const db = drizzle(
 			plugins: [
 				...args?.plugins ?? [],
 				...enableApiDocs ? [] : [(0, _graphql_yoga_plugin_disable_introspection.useDisableIntrospection)(), (0, _escape_tech_graphql_armor.EnvelopArmorPlugin)()],
-				rumbleInput.otel?.tracer ? { onExecute: ({ setExecuteFn, executeFn }) => {
+				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) => {
 						try {
 							return await executeFn(options);