@financial-times/cp-content-pipeline-schema 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.2.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.1.0...cp-content-pipeline-schema-v2.2.0) (2024-02-29)
+
+
+### Features
+
+* explicitly log a 408 to graphite if request is aborted ([4da9d5a](https://github.com/Financial-Times/cp-content-pipeline/commit/4da9d5a427e36599bed9b1c879366029e395f76e))
+
 ## [2.1.0](https://github.com/Financial-Times/cp-content-pipeline/compare/cp-content-pipeline-schema-v2.0.3...cp-content-pipeline-schema-v2.1.0) (2024-02-28)
 
 

package/lib/datasources/capi.d.ts

@@ -1,8 +1,7 @@
-import { WillSendRequestOptions } from '@apollo/datasource-rest';
 import { CapiResponse } from '../model/CapiResponse';
 import { InstrumentedRESTDataSource } from './instrumented';
 import { CapiPerson } from '../types/internal-content';
-import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource';
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest';
 export declare class CapiDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     capiKey: string;
@@ -12,7 +11,7 @@ export declare class CapiDataSource extends InstrumentedRESTDataSource {
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
     nextNotificationLink?: string;
-    willSendRequest(request: WillSendRequestOptions): void;
+    willSendRequest(path: string, request: AugmentedRequest): void;
     protected cacheOptionsFor(url: string): CacheOptions | undefined;
     getContent(uuid: string, packageContainer?: CapiResponse): Promise<CapiResponse>;
     getPerson(uuid: string): Promise<CapiPerson>;

package/lib/datasources/capi.js

@@ -20,8 +20,8 @@ class CapiDataSource extends instrumented_1.InstrumentedRESTDataSource {
         this.abortController = new AbortController();
         this.timeout = undefined;
     }
-    willSendRequest(request) {
-        super.willSendRequest(request);
+    willSendRequest(path, request) {
+        super.willSendRequest(path, request);
         request.headers['x-api-key'] = this.capiKey;
         request.signal = this.abortController.signal;
         this.timeout = setTimeout(() => this.abortController.abort(), REQUEST_TIMEOUT);

package/lib/datasources/capi.js.map

@@ -1 +1 @@
-{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"capi.js","sourceRoot":"","sources":["../../src/datasources/capi.ts"],"names":[],"mappings":"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"}

package/lib/datasources/instrumented.d.ts

@@ -1,5 +1,4 @@
-import { WillSendRequestOptions, RESTDataSource, RequestOptions } from '@apollo/datasource-rest';
-import type { FetcherResponse } from '@apollo/utils.fetcher';
+import { RESTDataSource, CacheOptions, DataSourceFetchResult, DataSourceRequest, AugmentedRequest } from '@apollo/datasource-rest';
 import { QueryContext } from '..';
 import { BaseDataSource, BaseDataSourceOptions } from './base';
 export declare class InstrumentedRESTDataSource extends RESTDataSource implements BaseDataSource {
@@ -8,7 +7,7 @@ export declare class InstrumentedRESTDataSource extends RESTDataSource implement
     context: QueryContext;
     constructor({ cache, context }: BaseDataSourceOptions);
     get cachePrefix(): string;
-    willSendRequest(request: WillSendRequestOptions): void;
-    trace<TResult>(url: URL, request: WillSendRequestOptions, fn: () => Promise<TResult>): Promise<TResult>;
-    didReceiveResponse<TResult>(response: FetcherResponse, request: RequestOptions): Promise<TResult>;
+    willSendRequest(path: string, request: AugmentedRequest): void;
+    throwIfResponseIsError(): Promise<void>;
+    fetch<TResult>(path: string, incomingRequest?: DataSourceRequest<CacheOptions>): Promise<DataSourceFetchResult<TResult>>;
 }

package/lib/datasources/instrumented.js

@@ -22,44 +22,50 @@ class InstrumentedRESTDataSource extends datasource_rest_1.RESTDataSource {
     get cachePrefix() {
         return this.constructor.name.replace(/DataSource$/, '').toLowerCase();
     }
-    willSendRequest(request) {
+    willSendRequest(path, request) {
         request.headers['user-agent'] = `cp-content-pipeline-api/${this.context.versions.api} cp-content-pipeline-schema/${this.context.versions.schema} `;
+        if (this.context.requestId && !this.context.contentRequestedOnce) {
+            request.headers['x-request-id'] = this.context.requestId;
+        }
     }
-    async trace(url, request, fn) {
-        this.startTime = process.hrtime.bigint();
+    // we implement our own error handling so skip the built-in GraphQLError
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    async throwIfResponseIsError() { }
+    async fetch(path, incomingRequest) {
+        const startTime = process.hrtime.bigint();
         this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.request.count`, 1);
         this.context.logger.info({
             event: 'REQUEST_DATASOURCE',
             datasource: this.constructor.name,
             request: {
                 id: this.context.requestId,
-                url: url.href,
-                method: request.method,
+                url: new URL(path, this.baseURL).href,
+                method: incomingRequest?.method,
             },
         });
-        if (this.context.requestId && !this.context.contentRequestedOnce) {
-            request.headers['x-request-id'] = this.context.requestId;
-        }
-        return fn();
-    }
-    async didReceiveResponse(response, request) {
-        // this.startTime will definitely have been set by willSendRequest, but no way of encoding that in types
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        const duration = (process.hrtime.bigint() - this.startTime) / BigInt(1e6);
-        this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${response.status}.count`, 1);
-        this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${response.status}.time`, Number(duration));
-        if (response.ok) {
-            return super.didReceiveResponse(response, request);
+        try {
+            const result = await super.fetch(path, incomingRequest);
+            const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6);
+            this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${result.response.status}.count`, 1);
+            this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.${result.response.status}.time`, Number(duration));
+            if (!result.response.ok) {
+                throw new errors_1.UpstreamServiceError({
+                    message: `${result.response.status}: ${result.response.statusText} from ${this.constructor.name}`,
+                    statusCode: result.response.status,
+                    relatesToSystems: this.backendSystemCodes,
+                    url: result.response.url,
+                    body: result.parsedBody,
+                });
+            }
+            return result;
         }
-        else {
-            const body = await this.parseBody(response);
-            throw new errors_1.UpstreamServiceError({
-                message: `${response.status}: ${response.statusText} from ${this.constructor.name}`,
-                statusCode: response.status,
-                relatesToSystems: this.backendSystemCodes,
-                url: response.url,
-                body,
-            });
+        catch (error) {
+            if (error instanceof Error && error.name === 'AbortError') {
+                const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6);
+                this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.408.count`, 1);
+                this.context.metrics?.count(`graphql.datasource.${this.constructor.name}.response.408.time`, Number(duration));
+            }
+            throw error;
         }
     }
 }

package/lib/datasources/instrumented.js.map

@@ -1 +1 @@
-{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"instrumented.js","sourceRoot":"","sources":["../../src/datasources/instrumented.ts"],"names":[],"mappings":"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"}

package/lib/datasources/origami-image.d.ts

@@ -1,13 +1,12 @@
-import { WillSendRequestOptions } from '@apollo/datasource-rest';
 import { InstrumentedRESTDataSource } from './instrumented';
-import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource';
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest';
 export declare class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     backendSystemCodes: string[];
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
     imageMetadataCacheTTL: number;
-    willSendRequest(request: WillSendRequestOptions): void;
+    willSendRequest(path: string, request: AugmentedRequest): void;
     protected cacheOptionsFor(): CacheOptions;
     getImageMetadata(url: string): Promise<{
         width: number;

package/lib/datasources/origami-image.js

@@ -15,8 +15,8 @@ class OrigamiImageDataSource extends instrumented_1.InstrumentedRESTDataSource {
             ? parseInt(process.env.IMAGE_METADATA_CACHE_TTL)
             : 60 * 60 * 24 * 7; // 1 week
     }
-    willSendRequest(request) {
-        super.willSendRequest(request);
+    willSendRequest(path, request) {
+        super.willSendRequest(path, request);
         request.signal = this.abortController.signal;
         this.timeout = setTimeout(() => this.abortController.abort(), REQUEST_TIMEOUT);
     }

package/lib/datasources/origami-image.js.map

@@ -1 +1 @@
-{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":";;;AACA,2DAGuC;AACvC,iDAA2D;AAG3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,sBAAuB,SAAQ,yCAA0B;IAAtE;;QACE,YAAO,GAAG,+CAA+C,CAAA;QACzD,uBAAkB,GAAG,CAAC,0BAA0B,CAAC,CAAA;QAEjD,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;QAE9D,0BAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAC1D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAChD,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,SAAS;IAyChC,CAAC;IAvCU,eAAe,CAAC,OAA+B;QACtD,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAE9B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAES,eAAe;QACvB,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAClC,oBAAoB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAC1D,CAAA;YACD,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YACD,OAAO,aAAa,CAAA;SACrB;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,6CAA6C,eAAe,8BAA8B;oBACnG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF;AAlDD,wDAkDC"}
+{"version":3,"file":"origami-image.js","sourceRoot":"","sources":["../../src/datasources/origami-image.ts"],"names":[],"mappings":";;;AAAA,2DAAqE;AACrE,iDAA2D;AAG3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AAEzC,MAAa,sBAAuB,SAAQ,yCAA0B;IAAtE;;QACE,YAAO,GAAG,+CAA+C,CAAA;QACzD,uBAAkB,GAAG,CAAC,0BAA0B,CAAC,CAAA;QAEjD,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;QAE9D,0BAAqB,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB;YAC1D,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;YAChD,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAA,CAAC,SAAS;IAyChC,CAAC;IAvCU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAES,eAAe;QACvB,OAAO,EAAE,GAAG,EAAE,IAAI,CAAC,qBAAqB,EAAE,CAAA;IAC5C,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,GAAW;QAEX,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,GAAG,CAClC,oBAAoB,kBAAkB,CAAC,GAAG,CAAC,cAAc,CAC1D,CAAA;YACD,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YACD,OAAO,aAAa,CAAA;SACrB;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,6CAA6C,eAAe,8BAA8B;oBACnG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF;AAlDD,wDAkDC"}

package/lib/datasources/twitter.d.ts

@@ -1,11 +1,11 @@
-import { CacheOptions, WillSendRequestOptions } from '@apollo/datasource-rest/dist/RESTDataSource';
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest';
 import { InstrumentedRESTDataSource } from './instrumented';
 export declare class TwitterDataSource extends InstrumentedRESTDataSource {
     baseURL: string;
     backendSystemCodes: string[];
     abortController: AbortController;
     timeout: ReturnType<typeof setTimeout> | undefined;
-    willSendRequest(request: WillSendRequestOptions): void;
+    willSendRequest(path: string, request: AugmentedRequest): void;
     getTweet(tweetUrl: string): Promise<any>;
     cacheOptionsFor(): CacheOptions;
 }

package/lib/datasources/twitter.js

@@ -12,8 +12,8 @@ class TwitterDataSource extends instrumented_1.InstrumentedRESTDataSource {
         this.abortController = new AbortController();
         this.timeout = undefined;
     }
-    willSendRequest(request) {
-        super.willSendRequest(request);
+    willSendRequest(path, request) {
+        super.willSendRequest(path, request);
         request.signal = this.abortController.signal;
         this.timeout = setTimeout(() => this.abortController.abort(), REQUEST_TIMEOUT);
     }

package/lib/datasources/twitter.js.map

@@ -1 +1 @@
-{"version":3,"file":"twitter.js","sourceRoot":"","sources":["../../src/datasources/twitter.ts"],"names":[],"mappings":";;;AAIA,2DAGuC;AACvC,iDAA2D;AAE3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AACzC,MAAa,iBAAkB,SAAQ,yCAA0B;IAAjE;;QACE,YAAO,GAAG,6BAA6B,CAAA;QACvC,uBAAkB,GAAG,CAAC,oBAAoB,CAAC,CAAA;QAE3C,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IAyChE,CAAC;IAvCU,eAAe,CAAC,OAA+B;QACtD,KAAK,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;QAE9B,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,QAAQ,mBAAmB,CAAC,CAAA;YAExE,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YAED,OAAO,KAAK,CAAA;SACb;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,2CAA2C,eAAe,8BAA8B;oBACjG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED,eAAe;QACb,iFAAiF;QACjF,oFAAoF;QACpF,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IACtB,CAAC;CACF;AA9CD,8CA8CC"}
+{"version":3,"file":"twitter.js","sourceRoot":"","sources":["../../src/datasources/twitter.ts"],"names":[],"mappings":";;;AACA,2DAAqE;AACrE,iDAA2D;AAE3D,MAAM,eAAe,GAAG,IAAI,CAAA,CAAC,YAAY;AACzC,MAAa,iBAAkB,SAAQ,yCAA0B;IAAjE;;QACE,YAAO,GAAG,6BAA6B,CAAA;QACvC,uBAAkB,GAAG,CAAC,oBAAoB,CAAC,CAAA;QAE3C,oBAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QACvC,YAAO,GAA8C,SAAS,CAAA;IAyChE,CAAC;IAvCU,eAAe,CAAC,IAAY,EAAE,OAAyB;QAC9D,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;QAEpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAA;QAC5C,IAAI,CAAC,OAAO,GAAG,UAAU,CACvB,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,EAClC,eAAe,CAChB,CAAA;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,QAAgB;QAC7B,IAAI;YACF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,QAAQ,mBAAmB,CAAC,CAAA;YAExE,IAAI,IAAI,CAAC,OAAO,EAAE;gBAChB,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC1B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAA;aACzB;YAED,OAAO,KAAK,CAAA;SACb;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,YAAY,EAAE;gBACzD,MAAM,IAAI,6BAAoB,CAAC;oBAC7B,IAAI,EAAE,4BAA4B;oBAClC,OAAO,EAAE,2CAA2C,eAAe,8BAA8B;oBACjG,UAAU,EAAE,GAAG;oBACf,gBAAgB,EAAE,IAAI,CAAC,kBAAkB;iBAC1C,CAAC,CAAA;aACH;YAED,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;IAED,eAAe;QACb,iFAAiF;QACjF,oFAAoF;QACpF,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;IACtB,CAAC;CACF;AA9CD,8CA8CC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/Financial-Times/cp-content-pipeline#readme",
   "dependencies": {
-    "@apollo/datasource-rest": "^4.3.2",
+    "@apollo/datasource-rest": "^6.2.2",
     "@apollo/utils.keyvaluecache": "^1.0.1",
     "@dotcom-reliability-kit/errors": "^2.0.0",
     "@dotcom-reliability-kit/log-error": "^2.0.0",

package/src/datasources/capi.ts

@@ -1,13 +1,11 @@
-import { WillSendRequestOptions } from '@apollo/datasource-rest'
 import { CapiResponse } from '../model/CapiResponse'
 import { InstrumentedRESTDataSource } from './instrumented'
 import { CapiPerson } from '../types/internal-content'
-import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource'
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
 import {
   OperationalError,
   UpstreamServiceError,
 } from '@dotcom-reliability-kit/errors'
-import { uuidFromUrl } from '../helpers/metadata'
 
 const REQUEST_TIMEOUT = 5000 // 5 seconds
 
@@ -28,8 +26,8 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
 
   nextNotificationLink?: string
 
-  override willSendRequest(request: WillSendRequestOptions) {
-    super.willSendRequest(request)
+  override willSendRequest(path: string, request: AugmentedRequest) {
+    super.willSendRequest(path, request)
 
     request.headers['x-api-key'] = this.capiKey
     request.signal = this.abortController.signal

package/src/datasources/instrumented.ts

@@ -1,9 +1,10 @@
 import {
-  WillSendRequestOptions,
   RESTDataSource,
-  RequestOptions,
+  CacheOptions,
+  DataSourceFetchResult,
+  DataSourceRequest,
+  AugmentedRequest,
 } from '@apollo/datasource-rest'
-import type { FetcherResponse } from '@apollo/utils.fetcher'
 import { PrefixingKeyValueCache } from '@apollo/utils.keyvaluecache'
 import { SerializedRequest } from '@dotcom-reliability-kit/serialize-request'
 import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
@@ -40,69 +41,82 @@ export class InstrumentedRESTDataSource
     return this.constructor.name.replace(/DataSource$/, '').toLowerCase()
   }
 
-  override willSendRequest(request: WillSendRequestOptions): void {
+  override willSendRequest(path: string, request: AugmentedRequest): void {
     request.headers[
       'user-agent'
     ] = `cp-content-pipeline-api/${this.context.versions.api} cp-content-pipeline-schema/${this.context.versions.schema} `
+
+    if (this.context.requestId && !this.context.contentRequestedOnce) {
+      request.headers['x-request-id'] = this.context.requestId
+    }
   }
 
-  override async trace<TResult>(
-    url: URL,
-    request: WillSendRequestOptions,
-    fn: () => Promise<TResult>
-  ): Promise<TResult> {
-    this.startTime = process.hrtime.bigint()
+  // we implement our own error handling so skip the built-in GraphQLError
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  async throwIfResponseIsError() {}
+
+  async fetch<TResult>(
+    path: string,
+    incomingRequest?: DataSourceRequest<CacheOptions>
+  ): Promise<DataSourceFetchResult<TResult>> {
+    const startTime = process.hrtime.bigint()
 
     this.context.metrics?.count(
       `graphql.datasource.${this.constructor.name}.request.count`,
       1
     )
+
     this.context.logger.info({
       event: 'REQUEST_DATASOURCE',
       datasource: this.constructor.name,
       request: {
         id: this.context.requestId,
-        url: url.href,
-        method: request.method,
+        url: new URL(path, this.baseURL).href,
+        method: incomingRequest?.method,
       } as SerializedRequest,
     })
 
-    if (this.context.requestId && !this.context.contentRequestedOnce) {
-      request.headers['x-request-id'] = this.context.requestId
-    }
+    try {
+      const result = await super.fetch<TResult>(path, incomingRequest)
+      const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6)
 
-    return fn()
-  }
+      this.context.metrics?.count(
+        `graphql.datasource.${this.constructor.name}.response.${result.response.status}.count`,
+        1
+      )
 
-  async didReceiveResponse<TResult>(
-    response: FetcherResponse,
-    request: RequestOptions
-  ): Promise<TResult> {
-    // this.startTime will definitely have been set by willSendRequest, but no way of encoding that in types
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const duration = (process.hrtime.bigint() - this.startTime!) / BigInt(1e6)
+      this.context.metrics?.count(
+        `graphql.datasource.${this.constructor.name}.response.${result.response.status}.time`,
+        Number(duration)
+      )
 
-    this.context.metrics?.count(
-      `graphql.datasource.${this.constructor.name}.response.${response.status}.count`,
-      1
-    )
-    this.context.metrics?.count(
-      `graphql.datasource.${this.constructor.name}.response.${response.status}.time`,
-      Number(duration)
-    )
+      if (!result.response.ok) {
+        throw new UpstreamServiceError({
+          message: `${result.response.status}: ${result.response.statusText} from ${this.constructor.name}`,
+          statusCode: result.response.status,
+          relatesToSystems: this.backendSystemCodes,
+          url: result.response.url,
+          body: result.parsedBody,
+        })
+      }
+
+      return result
+    } catch (error) {
+      if (error instanceof Error && error.name === 'AbortError') {
+        const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6)
+
+        this.context.metrics?.count(
+          `graphql.datasource.${this.constructor.name}.response.408.count`,
+          1
+        )
+
+        this.context.metrics?.count(
+          `graphql.datasource.${this.constructor.name}.response.408.time`,
+          Number(duration)
+        )
+      }
 
-    if (response.ok) {
-      return super.didReceiveResponse(response, request)
-    } else {
-      const body = await this.parseBody(response)
-
-      throw new UpstreamServiceError({
-        message: `${response.status}: ${response.statusText} from ${this.constructor.name}`,
-        statusCode: response.status,
-        relatesToSystems: this.backendSystemCodes,
-        url: response.url,
-        body,
-      })
+      throw error
     }
   }
 }

package/src/datasources/origami-image.ts

@@ -1,10 +1,6 @@
-import { WillSendRequestOptions } from '@apollo/datasource-rest'
-import {
-  OperationalError,
-  UpstreamServiceError,
-} from '@dotcom-reliability-kit/errors'
+import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
 import { InstrumentedRESTDataSource } from './instrumented'
-import { CacheOptions } from '@apollo/datasource-rest/dist/RESTDataSource'
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
 
 const REQUEST_TIMEOUT = 5000 // 5 seconds
 
@@ -19,8 +15,8 @@ export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
     ? parseInt(process.env.IMAGE_METADATA_CACHE_TTL)
     : 60 * 60 * 24 * 7 // 1 week
 
-  override willSendRequest(request: WillSendRequestOptions) {
-    super.willSendRequest(request)
+  override willSendRequest(path: string, request: AugmentedRequest) {
+    super.willSendRequest(path, request)
 
     request.signal = this.abortController.signal
     this.timeout = setTimeout(

package/src/datasources/twitter.ts

@@ -1,11 +1,5 @@
-import {
-  CacheOptions,
-  WillSendRequestOptions,
-} from '@apollo/datasource-rest/dist/RESTDataSource'
-import {
-  OperationalError,
-  UpstreamServiceError,
-} from '@dotcom-reliability-kit/errors'
+import { AugmentedRequest, CacheOptions } from '@apollo/datasource-rest'
+import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
 import { InstrumentedRESTDataSource } from './instrumented'
 
 const REQUEST_TIMEOUT = 5000 // 5 seconds
@@ -16,8 +10,8 @@ export class TwitterDataSource extends InstrumentedRESTDataSource {
   abortController = new AbortController()
   timeout: ReturnType<typeof setTimeout> | undefined = undefined
 
-  override willSendRequest(request: WillSendRequestOptions) {
-    super.willSendRequest(request)
+  override willSendRequest(path: string, request: AugmentedRequest) {
+    super.willSendRequest(path, request)
 
     request.signal = this.abortController.signal
     this.timeout = setTimeout(