From aefe8eac2a89a8ce4934c2d996ec632b6441f7b0 Mon Sep 17 00:00:00 2001 From: Evans Hauser Date: Tue, 11 Jun 2019 16:48:53 -0700 Subject: [PATCH] reporting: fix forbidden/unregistered op reporting (#2828) * reporting: fix forbidden/unregistered op reporting * update changelog --- CHANGELOG.md | 2 ++ packages/apollo-engine-reporting/src/extension.ts | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce2e92b3cbb..1ac61b77a2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ### vNext +- `apollo-engine-reporting`: Set `forbiddenOperation` and `registeredOperation` later in the request lifecycle [PR #2828](https://github.com/apollographql/apollo-server/pull/2828) + ### v2.6.2 - `apollo-engine-reporting-protobuf`: Update protobuff to include `forbiddenOperations` and `registeredOperations` [PR #2768](https://github.com/apollographql/apollo-server/pull/2768) diff --git a/packages/apollo-engine-reporting/src/extension.ts b/packages/apollo-engine-reporting/src/extension.ts index 732271c0544..f734fa15fd1 100644 --- a/packages/apollo-engine-reporting/src/extension.ts +++ b/packages/apollo-engine-reporting/src/extension.ts @@ -138,12 +138,6 @@ export class EngineReportingExtension if (o.requestContext.metrics.persistedQueryRegister) { this.trace.persistedQueryRegister = true; } - if (o.requestContext.metrics.forbiddenOperation) { - this.trace.forbiddenOperation = true; - } - if (o.requestContext.metrics.registeredOperation) { - this.trace.registeredOperation = true; - } } if (this.options.privateVariables !== true && o.variables) { @@ -204,6 +198,10 @@ export class EngineReportingExtension this.trace.fullQueryCacheHit = !!o.requestContext.metrics .responseCacheHit; + this.trace.forbiddenOperation = !!o.requestContext.metrics + .forbiddenOperation; + this.trace.registeredOperation = !!o.requestContext.metrics + .registeredOperation; // If the `operationName` was not already set elsewhere, for example, // through the `executionDidStart` or the `willResolveField` hooks, then