fix: apply review fixes

Author: m1212e

bun.lock

@@ -1,4 +1,4 @@
-import { type Span, trace } from "@opentelemetry/api";
+import type { Span } from "@opentelemetry/api";
 import { relationsFilterToSQL } from "drizzle-orm";
 import { debounce } from "es-toolkit";
 import { lazy } from "./helpers/lazy";
@@ -556,9 +556,7 @@ export const createAbilityBuilder = <
                     // in case we have a wildcard ability, skip the rest and return no filters at all
                     if (filters === "unrestricted") {
                       span?.setAttribute("abilities.status", "unrestricted");
-                      const r = transformToResponse();
-                      span?.end();
-                      return r;
+                      return transformToResponse();
                     }
 
                     // if nothing has been allowed, block everything
@@ -571,9 +569,7 @@ export const createAbilityBuilder = <
                         tableName.toString(),
                         action,
                       );
-                      const r = transformToResponse(blockEverythingFilter);
-                      span?.end();
-                      return r;
+                      return transformToResponse(blockEverythingFilter);
                     }
 
                     // run all dynamic filters
@@ -590,9 +586,7 @@ export const createAbilityBuilder = <
                       const result = func(userContext);
                       // if one of the dynamic filters returns "allow", we want to allow everything
                       if (result === "allow") {
-                        const r = transformToResponse();
-                        span?.end();
-                        return r;
+                        return transformToResponse();
                       }
                       // if nothing is returned, nothing is allowed by this filter
                       if (result === undefined) continue;
@@ -627,9 +621,7 @@ export const createAbilityBuilder = <
                         "blocked_everything",
                       );
 
-                      const r = transformToResponse(blockEverythingFilter);
-                      span?.end();
-                      return r;
+                      return transformToResponse(blockEverythingFilter);
                     }
 
                     const mergedFilters =
@@ -640,15 +632,19 @@ export const createAbilityBuilder = <
                           }, {});
 
                     span?.setAttribute("abilities.status", "applied");
-                    const r = transformToResponse(mergedFilters as any);
-                    span?.end();
-                    return r;
+                    return transformToResponse(mergedFilters as any);
                   };
 
                   if (otel?.tracer) {
                     return otel.tracer.startActiveSpan(
                       `prepare_query_abilities_${action}`,
-                      assembleAbilities,
+                      (span) => {
+                        try {
+                          return assembleAbilities(span);
+                        } finally {
+                          span.end();
+                        }
+                      },
                     );
                   } else {
                     return assembleAbilities();

lib/abilityBuilder.ts

@@ -241,7 +241,7 @@ export const db = drizzle(
                     {
                       attributes: {
                         [AttributeNames.OPERATION_NAME]:
-                          options.operationName ?? undefined,
+                          options.operationName ?? "anonymous",
                         // TODO
                         // [AttributeNames.SOURCE]: print(options.document),
                       },
@@ -317,20 +317,19 @@ export const db = drizzle(
      */
     schemaBuilder,
     /**
-       * Creates the native yoga instance. Can be used to run an actual HTTP server.
-       *
-       * @example
-       *
-       * ```ts
+     * Creates the native yoga instance. Can be used to run an actual HTTP server.
+     *
+     * @example
      *
-        import { createServer } from "node:http";
-    * const server = createServer(createYoga());
-    server.listen(3000, () => {
-            console.info("Visit http://localhost:3000/graphql");
-      });
-      * ```
+     * ```ts
+     * import { createServer } from "node:http";
+     * const server = createServer(createYoga());
+     * server.listen(3000, () => {
+     *   console.info("Visit http://localhost:3000/graphql");
+     * });
+     * ```
      * https://the-guild.dev/graphql/yoga-server/docs#server
-       */
+     */
     createYoga,
     /**
      * Creates a sofa instance to offer a REST API.

lib/rumble.ts

@@ -39,7 +39,6 @@ export class RuntimeFiltersPlugin<
 
         if (!filters || !Array.isArray(filters) || filters.length === 0) {
           span?.setAttribute("filters.status", "unrestricted");
-          span?.end();
           // if no filter should be applied, just continue
           return resolver(parent, args, context, info);
         }
@@ -60,11 +59,9 @@ export class RuntimeFiltersPlugin<
 
         // if the original value was an array, return an array
         if (Array.isArray(resolved)) {
-          span?.end();
           return allowed;
         }
 
-        span?.end();
         // if the original value was a single value, return the first allowed
         // or null if not allowed
         return allowed[0] ?? null;
@@ -73,7 +70,13 @@ export class RuntimeFiltersPlugin<
       if (this.tracer) {
         return this.tracer.startActiveSpan(
           `apply_filters_${fieldConfig.name}`,
-          runFilters,
+          (span) => {
+            try {
+              return runFilters();
+            } finally {
+              span.end();
+            }
+          },
         );
       } else {
         return runFilters();

lib/runtimeFiltersPlugin/runtimeFiltersPlugin.ts

@@ -81,7 +81,7 @@ export type RumbleInput<
       }
     | undefined;
   /**
-   * rumble can setup otel tracing if you want to. This will provide details of execution time and outcome to the provided tracer. See https://pothos-graphql.dev/docs/plugins/tracing#install for more information.
+   * rumble can set up otel tracing if you want to. This will provide details of execution time and outcome to the provided tracer. See https://pothos-graphql.dev/docs/plugins/tracing#install for more information.
    */
   otel?: {
     /**

lib/types/rumbleInput.ts

@@ -38,6 +38,7 @@
     "@escape.tech/graphql-armor": "^3.2.0",
     "@graphql-yoga/plugin-disable-introspection": "^2.19.0",
     "@opentelemetry/api": "^1.9.0",
+    "@opentelemetry/semantic-conventions": "^1.39.0",
     "@pothos/core": "^4.12.0",
     "@pothos/plugin-drizzle": "^0.17.0",
     "@pothos/plugin-smart-subscriptions": "^4.1.4",