@financial-times/cp-content-pipeline-schema 2.5.3 → 2.5.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/cp-content-pipeline-schema",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/src/datasources/base.ts

@@ -3,6 +3,7 @@ import { QueryContext } from '..'
 
 export interface BaseDataSource {
   context: QueryContext
+  calls: string[]
 }
 
 export type BaseDataSourceOptions = {

package/src/datasources/capi.ts

@@ -46,6 +46,7 @@ export class CapiDataSource extends InstrumentedRESTDataSource {
         cacheOptions: { ttl: this.articleCacheTTL },
       })
       this.context.contentRequestedOnce = true
+      this.calls.push(uuid)
 
       if (this.timeout) {
         clearTimeout(this.timeout)

package/src/datasources/instrumented.ts

@@ -6,7 +6,6 @@ import {
   AugmentedRequest,
 } from '@apollo/datasource-rest'
 import { PrefixingKeyValueCache } from '@apollo/utils.keyvaluecache'
-import { SerializedRequest } from '@dotcom-reliability-kit/serialize-request'
 import { UpstreamServiceError } from '@dotcom-reliability-kit/errors'
 import { QueryContext } from '..'
 import { isContextableCache } from '../types/cache'
@@ -19,6 +18,7 @@ export class InstrumentedRESTDataSource
   startTime?: bigint
   backendSystemCodes: string[] = []
   context: QueryContext
+  calls: string[] = []
 
   constructor({ cache, context }: BaseDataSourceOptions) {
     const wrappedCache = new PrefixingKeyValueCache(
@@ -70,16 +70,6 @@ export class InstrumentedRESTDataSource
       1
     )
 
-    this.context.logger.info({
-      event: 'REQUEST_DATASOURCE',
-      datasource: this.constructor.name,
-      request: {
-        id: this.context.requestId,
-        url: new URL(path, this.baseURL).href,
-        method: incomingRequest?.method,
-      } as SerializedRequest,
-    })
-
     try {
       const result = await super.fetch<TResult>(path, incomingRequest)
       const duration = (process.hrtime.bigint() - startTime) / BigInt(1e6)

package/src/datasources/origami-image.ts

@@ -36,6 +36,9 @@ export class OrigamiImageDataSource extends InstrumentedRESTDataSource {
       const imageMetadata = await this.get(
         `images/metadata/${encodeURIComponent(url)}?source=next`
       )
+
+      this.calls.push(url)
+
       if (this.timeout) {
         clearTimeout(this.timeout)
         this.timeout = undefined

package/src/datasources/twitter.ts

@@ -24,6 +24,8 @@ export class TwitterDataSource extends InstrumentedRESTDataSource {
     try {
       const tweet = await this.get(`oembed?url=${tweetUrl}&omit_script=true`)
 
+      this.calls.push(tweetUrl)
+
       if (this.timeout) {
         clearTimeout(this.timeout)
         this.timeout = undefined

package/src/datasources/url-management.ts

@@ -15,6 +15,7 @@ export class URLManagementDataSource implements BaseDataSource {
   memoizedResults = new Map<string, Promise<string>>()
   cache: KeyValueCache
   context: QueryContext
+  calls: string[] = []
 
   static clientInitialised = false
 
@@ -61,6 +62,7 @@ export class URLManagementDataSource implements BaseDataSource {
     promise = getVanity()
     this.memoizedResults.set(fromURL, promise)
 
+    this.calls.push(fromURL)
     return promise
   }
 }