alternate api for handling hooks

Author: crysmags

packages/datadog-plugin-apollo/src/gateway/execute.js

@@ -6,11 +6,12 @@ class ApolloGatewayExecutePlugin extends ApolloBasePlugin {
   static operation = 'execute'
   static prefix = 'tracing:apm:apollo:gateway:execute'
 
-  asyncStart (ctx) {
+  onAsyncStart (ctx) {
     const span = ctx?.currentStore?.span
-    this.config.hooks.execute(span, ctx)
 
-    return super.asyncStart(ctx)
+    if (!span) return
+
+    this.config.hooks.execute(span, ctx)
   }
 }
 

packages/datadog-plugin-apollo/src/gateway/fetch.js

@@ -30,11 +30,9 @@ class ApolloGatewayFetchPlugin extends ApolloBasePlugin {
     return ctx.currentStore
   }
 
-  asyncStart (ctx) {
+  onAsyncStart (ctx) {
     const span = ctx?.currentStore?.span
     this.config.hooks.fetch(span, ctx)
-
-    return super.asyncStart(ctx)
   }
 }
 

packages/datadog-plugin-apollo/src/gateway/plan.js

@@ -6,11 +6,12 @@ class ApolloGatewayPlanPlugin extends ApolloBasePlugin {
   static operation = 'plan'
   static prefix = 'tracing:apm:apollo:gateway:plan'
 
-  asyncStart (ctx) {
+  onEnd (ctx) {
     const span = ctx?.currentStore?.span
-    this.config.hooks.plan(span, ctx)
 
-    return super.asyncStart(ctx)
+    if (!span) return
+
+    this.config.hooks.plan(span, ctx)
   }
 }
 

packages/datadog-plugin-apollo/src/gateway/postprocessing.js

@@ -6,11 +6,9 @@ class ApolloGatewayPostProcessingPlugin extends ApolloBasePlugin {
   static operation = 'postprocessing'
   static prefix = 'tracing:apm:apollo:gateway:postprocessing'
 
-  asyncStart (ctx) {
+  onAsyncStart (ctx) {
     const span = ctx?.currentStore?.span
     this.config.hooks.postprocessing(span, ctx)
-
-    return super.asyncStart(ctx)
   }
 }
 

packages/datadog-plugin-apollo/src/gateway/request.js

@@ -52,7 +52,7 @@ class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
     return ctx.currentStore
   }
 
-  asyncStart (ctx) {
+  onAsyncStart (ctx) {
     const errors = ctx?.result?.errors
     // apollo gateway catches certain errors and returns them in the result object
     // we want to capture these errors as spans
@@ -62,8 +62,6 @@ class ApolloGatewayRequestPlugin extends ApolloBasePlugin {
 
     const span = ctx?.currentStore?.span
     this.config.hooks.request(span, ctx)
-
-    return super.asyncStart(ctx)
   }
 }
 

packages/datadog-plugin-apollo/src/gateway/validate.js

@@ -6,9 +6,9 @@ class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
   static operation = 'validate'
   static prefix = 'tracing:apm:apollo:gateway:validate'
 
-  end (ctx) {
+  onEnd (ctx) {
     const result = ctx.result
-    const span = ctx.currentStore?.span
+    const span = ctx?.currentStore?.span
 
     if (!span) return
 
@@ -17,8 +17,6 @@ class ApolloGatewayValidatePlugin extends ApolloBasePlugin {
     }
 
     this.config.hooks.validate(span, ctx)
-
-    super.end(ctx)
   }
 }
 

packages/dd-trace/src/plugins/apollo.js

@@ -27,16 +27,21 @@ class ApolloBasePlugin extends TracingPlugin {
   }
 
   end (ctx) {
-    // Only synchronous operations would have `result` or `error` on `end`.
     if (!ctx.hasOwnProperty('result') && !ctx.hasOwnProperty('error')) return
+    this.onEnd(ctx)
     ctx?.currentStore?.span?.finish()
   }
 
   asyncStart (ctx) {
-    ctx?.currentStore?.span.finish()
+    this.onAsyncStart(ctx)
+    ctx?.currentStore?.span?.finish()
     return ctx.parentStore
   }
 
+  onEnd (ctx) {}
+
+  onAsyncStart (ctx) {}
+
   getServiceName () {
     return this.serviceName({
       id: `${this.constructor.id}.${this.constructor.operation}`,