fix(gatsby): fix broken GraphQL resolver tracing (#29015)

* fix(gatsby): fix broken GraphQL resolvers tracing * end activity for sync resolvers
gatsbyjs · Jan 15, 2021 · 48db6ac · 48db6ac
1 parent 90b6e3d
commit 48db6ac
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/packages/gatsby/src/schema/resolvers.ts b/packages/gatsby/src/schema/resolvers.ts
@@ -566,13 +566,23 @@ export function wrappingResolver<TSource, TArgs>(
       )
       activity.start()
     }
-    try {
-      return resolver(parent, args, context, info)
-    } finally {
+    const result = resolver(parent, args, context, info)
+
+    if (!activity) {
+      return result
+    }
+
+    const endActivity = (): void => {
       if (activity) {
         activity.end()
       }
     }
+    if (typeof result?.then === `function`) {
+      result.then(endActivity, endActivity)
+    } else {
+      endActivity()
+    }
+    return result
   }
 }