fix after review

Author: EmrysMyrddin

packages/plugins/apollo-usage-report/package.json

@@ -44,6 +44,7 @@
     "@apollo/server-gateway-interface": "^1.1.1",
     "@apollo/usage-reporting-protobuf": "^4.1.1",
     "@apollo/utils.usagereporting": "^2.1.0",
+    "@graphql-tools/utils": "^10.8.6",
     "@graphql-yoga/plugin-apollo-inline-trace": "workspace:^",
     "@whatwg-node/promise-helpers": "^1.2.4",
     "tslib": "^2.8.1"

packages/plugins/apollo-usage-report/src/index.ts

@@ -1,4 +1,4 @@
-import { DocumentNode, getOperationAST, GraphQLSchema, Kind, printSchema } from 'graphql';
+import { DocumentNode, getOperationAST, GraphQLSchema, Kind } from 'graphql';
 import {
   isAsyncIterable,
   YogaLogger,
@@ -12,6 +12,7 @@ import {
   calculateReferencedFieldsByType,
   usageReportingSignature,
 } from '@apollo/utils.usagereporting';
+import { printSchemaWithDirectives } from '@graphql-tools/utils';
 import {
   ApolloInlineGraphqlTraceContext,
   ApolloInlineRequestTraceContext,
@@ -129,7 +130,7 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
   ];
 
   let schemaIdSet$: MaybePromise<void> | undefined;
-  let schema: { id: string; schema: GraphQLSchema } | undefined;
+  let currentSchema: { id: string; schema: GraphQLSchema } | undefined;
   let yoga: YogaServer<Record<string, unknown>, Record<string, unknown>>;
   let reporter: Reporter;
 
@@ -174,9 +175,9 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
 
         onSchemaChange({ schema }) {
           if (schema) {
-            schemaIdSet$ = hashSHA256(printSchema(schema), yoga.fetchAPI)
+            schemaIdSet$ = hashSHA256(printSchemaWithDirectives(schema), yoga.fetchAPI)
               .then(id => {
-                schema = { id, schema };
+                currentSchema = { id, schema };
                 schemaIdSet$ = undefined;
               })
               .catch(error => {
@@ -191,7 +192,7 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
 
         onParse() {
           return function onParseEnd({ result, context }) {
-            if (!schema) {
+            if (!currentSchema) {
               throw new Error("should not happen: schema doesn't exists");
             }
             const ctx = ctxForReq.get(context.request)?.traces.get(context);
@@ -211,11 +212,11 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
 
             ctx.referencedFieldsByType = calculateReferencedFieldsByType({
               document: result,
-              schema: schema.schema,
+              schema: currentSchema.schema,
               resolvedOperationName: operationName ?? null,
             });
             ctx.operationKey = `# ${operationName || '-'}\n${signature}`;
-            ctx.schemaId = schema!.id;
+            ctx.schemaId = currentSchema!.id;
           };
         },
 
@@ -249,7 +250,7 @@ export function useApolloUsageReport(options: ApolloUsageReportOptions = {}): Pl
             }
 
             serverContext.waitUntil(
-              reporter.addTrace(schema!.id, {
+              reporter.addTrace(currentSchema!.id, {
                 statsReportKey: trace.operationKey,
                 trace: trace.trace,
                 referencedFieldsByType: trace.referencedFieldsByType,

packages/plugins/apollo-usage-report/src/reporter.ts

@@ -39,10 +39,10 @@ export class Reporter {
     this.#yoga = yoga;
     this.#options = {
       ...options,
-      maxBatchDelay: options.maxBatchDelay ?? 20 * 60 * 1000, // 20min
+      maxBatchDelay: options.maxBatchDelay ?? 20_000, // 20s
       maxBatchUncompressedSize: options.maxBatchUncompressedSize ?? 4 * 1024 * 1024, // 4mb
       maxTraceSize: options.maxTraceSize ?? 10 * 1024 * 1024, // 10mb
-      exportTimeout: options.exportTimeout ?? 30 * 1000, // 60s
+      exportTimeout: options.exportTimeout ?? 30_000, // 30s
     };
     this.#reportHeaders = {
       graphRef: getGraphRef(options),
@@ -94,33 +94,26 @@ export class Reporter {
 
     if (this.#nextSendAfterDelay != null) {
       clearTimeout(this.#nextSendAfterDelay);
+      this.#nextSendAfterDelay = undefined;
     }
 
     delete this.#reportsBySchema[schemaId];
     report.endTime = dateToProtoTimestamp(new Date());
     report.ensureCountsAreIntegers();
 
     const validationError = Report.verify(report);
-    if (!validationError) {
+    if (validationError) {
       throw new TypeError(`Invalid report: ${validationError}`);
     }
 
-    const encodedReport = Report.encode(report).finish();
-    const compressedReport = new ReadableStream({
-      start(controller) {
-        controller.enqueue(encodedReport);
-        controller.close();
-      },
-    }).pipeThrough(new CompressionStream('gzip'));
-
     const { apiKey = getEnvVar('APOLLO_KEY'), endpoint = DEFAULT_REPORTING_ENDPOINT } =
       this.#options;
 
+    const encodedReport = Report.encode(report).finish();
+
     for (let tries = 0; tries < 5; tries++) {
       try {
-        const abortCtl = new AbortController();
         this.#logger?.debug(`Sending report (try ${tries}/5)`);
-        const timeout = setTimeout(() => abortCtl.abort(), this.#options.exportTimeout);
         const response = await fetch(endpoint, {
           method: 'POST',
           headers: {
@@ -130,10 +123,14 @@ export class Reporter {
             'x-api-key': apiKey!,
             accept: 'application/json',
           },
-          body: compressedReport,
-          signal: abortCtl.signal,
+          body: new ReadableStream({
+            start(controller) {
+              controller.enqueue(encodedReport);
+              controller.close();
+            },
+          }).pipeThrough(new CompressionStream('gzip')),
+          signal: AbortSignal.timeout(this.#options.exportTimeout),
         });
-        clearTimeout(timeout);
 
         const result = await response.text();
         if (response.ok) {