@chainlink/external-adapter-framework 0.0.20 → 0.0.22

package/examples/coingecko/src/globalUtils.js

@@ -11,15 +11,14 @@ exports.inputParameters = {
         required: true,
     },
 };
-const buildGlobalRequestBody = (config) => {
-    const apiKey = {
-        x_cg_pro_api_key: config.API_KEY,
-    };
+const buildGlobalRequestBody = (apiKey) => {
     return {
-        baseURL: config.API_KEY ? config_1.PRO_API_ENDPOINT : config_1.DEFAULT_API_ENDPOINT,
+        baseURL: apiKey ? config_1.PRO_API_ENDPOINT : config_1.DEFAULT_API_ENDPOINT,
         url: '/global',
         method: 'GET',
-        params: apiKey,
+        params: {
+            x_cg_pro_api_key: apiKey,
+        },
     };
 };
 exports.buildGlobalRequestBody = buildGlobalRequestBody;
@@ -39,10 +38,9 @@ const constructEntry = (res, requestPayload, resultPath) => {
         logger.warn(`Data for "${requestPayload.market}" not found".`);
         return;
     }
-    const entry = {
+    return {
         params: requestPayload,
         value: result,
     };
-    return entry;
 };
 exports.constructEntry = constructEntry;

package/examples/coingecko/src/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="node" />
+import { Adapter } from '../../../../src/adapter';
+export declare const adapter: Adapter<import("../../../config").SettingsMap>;
+export declare const server: () => Promise<import("fastify").FastifyInstance<import("fastify").RawServerDefault, import("http").IncomingMessage, import("http").ServerResponse<import("http").IncomingMessage>, import("fastify").FastifyBaseLogger, import("fastify").FastifyTypeProviderDefault> | undefined>;

package/examples/coingecko/src/index.js

@@ -3,12 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.adapter = void 0;
+exports.server = exports.adapter = void 0;
+const __1 = require("../../..");
+const adapter_1 = require("../../../../src/adapter");
 const overrides_json_1 = __importDefault(require("./config/overrides.json"));
 const endpoint_1 = require("./endpoint");
-exports.adapter = {
+exports.adapter = new adapter_1.Adapter({
     defaultEndpoint: 'crypto',
     name: 'coingecko',
     endpoints: [endpoint_1.crypto, endpoint_1.coins, endpoint_1.cryptoMarketcap, endpoint_1.cryptoVolume, endpoint_1.dominance, endpoint_1.globalMarketcap],
     overrides: overrides_json_1.default['coingecko'],
-};
+});
+const server = () => (0, __1.expose)(exports.adapter);
+exports.server = server;

package/examples/coingecko-old/batch-warming.d.ts

@@ -0,0 +1,7 @@
+import { AdapterEndpoint } from '../../adapter';
+interface AdapterRequestParams {
+    base: string;
+    quote: string;
+}
+export declare const batchEndpoint: AdapterEndpoint<AdapterRequestParams, unknown, import("../../config").SettingsMap>;
+export {};

package/examples/coingecko-old/index.d.ts

@@ -0,0 +1,2 @@
+import { Adapter } from '../../adapter';
+export declare const adapter: Adapter<import("../../config").SettingsMap>;

package/examples/coingecko-old/rest.d.ts

@@ -0,0 +1,12 @@
+import { AdapterEndpoint } from '../../adapter';
+interface AdapterRequestParams {
+    base: string;
+    quote: string;
+}
+interface ProviderResponseBody {
+    [base: string]: {
+        [quote: string]: number;
+    };
+}
+export declare const restEndpoint: AdapterEndpoint<AdapterRequestParams, ProviderResponseBody, import("../../config").SettingsMap>;
+export {};

package/index.d.ts

@@ -1,4 +1,4 @@
-import { Server } from 'http';
+import { FastifyInstance } from 'fastify';
 import { Adapter, AdapterDependencies } from './adapter';
 /**
  * Main function for the framework.
@@ -8,4 +8,4 @@ import { Adapter, AdapterDependencies } from './adapter';
  * @param dependencies - an optional object with adapter dependencies to inject
  * @returns a Promise that resolves to the http.Server listening for connections
  */
-export declare const expose: (adapter: Adapter, dependencies?: Partial<AdapterDependencies> | undefined) => Promise<Server | undefined>;
+export declare const expose: (adapter: Adapter, dependencies?: Partial<AdapterDependencies>) => Promise<FastifyInstance | undefined>;

package/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.expose = void 0;
 const fastify_1 = __importDefault(require("fastify"));
 const path_1 = require("path");
+const adapter_1 = require("./adapter");
 const background_executor_1 = require("./background-executor");
 const cache_1 = require("./cache");
 const metrics_1 = require("./metrics");
@@ -24,25 +25,36 @@ const VERSION = process.env['npm_package_version'];
  * @returns a Promise that resolves to the http.Server listening for connections
  */
 const expose = async (adapter, dependencies) => {
+    if (!(adapter instanceof adapter_1.Adapter)) {
+        throw new Error('The adapter has not been initialized as an instance of the Adapter class, exiting.');
+    }
     // Initialize adapter (create dependencies, inject them, build endpoint map, etc.)
     await adapter.initialize(dependencies);
-    let server = undefined;
+    let api = undefined;
     if (adapter.config.METRICS_ENABLED && adapter.config.EXPERIMENTAL_METRICS_ENABLED) {
         (0, metrics_1.setupMetricsServer)(adapter.name, adapter.config);
     }
+    // Optional Promise to indicate that the API is shutting down (for us to close background executors)
+    let apiShutdownPromise;
     if (adapter.config.EA_MODE === 'reader' || adapter.config.EA_MODE === 'reader-writer') {
         // Main REST API server to handle incoming requests
-        const app = await buildRestApi(adapter);
+        api = await buildRestApi(adapter);
+        // Add a hook on close to use on the background execution loop to stop it
+        apiShutdownPromise = new Promise((resolve) => {
+            api?.addHook('onClose', async () => resolve());
+        });
         // Start listening for incoming requests
         try {
-            await app.listen(adapter.config.EA_PORT, adapter.config.EA_HOST);
+            await api.listen({
+                port: adapter.config.EA_PORT,
+                host: adapter.config.EA_HOST,
+            });
         }
         catch (err) {
             logger.fatal(`There was an error when starting the EA server: ${err}`);
             process.exit();
         }
-        logger.info(`Listening on port ${app.server.address().port}`);
-        server = app.server;
+        logger.info(`Listening on port ${api.server.address().port}`);
     }
     else {
         logger.info('REST API is disabled; this instance will not process incoming requests.');
@@ -50,12 +62,12 @@ const expose = async (adapter, dependencies) => {
     if (adapter.config.EA_MODE === 'writer' || adapter.config.EA_MODE === 'reader-writer') {
         // Start background loop that will take care of calling any async Transports
         logger.info('Starting background execution loop');
-        (0, background_executor_1.callBackgroundExecutes)(adapter, server);
+        (0, background_executor_1.callBackgroundExecutes)(adapter, apiShutdownPromise);
     }
     else {
         logger.info('Background executor is disabled; this instance will not perform async background executes.');
     }
-    return server;
+    return api;
 };
 exports.expose = expose;
 async function buildRestApi(adapter) {
@@ -66,6 +78,11 @@ async function buildRestApi(adapter) {
     });
     // Use global error handling
     app.setErrorHandler(validation_1.errorCatchingMiddleware);
+    // Always reply with json content
+    app.addHook('preHandler', (_, reply, done) => {
+        reply.headers({ 'content-type': 'application/json; charset=utf-8' });
+        done();
+    });
     const transportHandler = await (0, transports_1.buildTransportHandler)(adapter);
     app.register(async (router) => {
         // Set up "middlewares" (hooks in fastify)

package/metrics/index.d.ts

@@ -11,5 +11,5 @@ export declare const setupMetrics: (name: string, config: AdapterConfig) => void
  * @returns the cache middleware function
  */
 export declare const buildMetricsMiddleware: (req: AdapterRequest, res: FastifyReply, done: HookHandlerDoneFunction) => void;
-export declare const httpRequestsTotal: client.Counter<"type" | "method" | "feed_id" | "status_code" | "provider_status_code" | "retry" | "is_cache_warming">;
+export declare const httpRequestsTotal: client.Counter<"type" | "method" | "status_code" | "retry" | "is_cache_warming" | "feed_id" | "provider_status_code">;
 export declare const httpRequestDurationSeconds: client.Histogram<string>;

package/metrics/index.js

@@ -46,7 +46,10 @@ function setupMetricsServer(name, config) {
         res.type('txt');
         res.send(await client.register.metrics());
     });
-    metricsApp.listen(metricsPort, eaHost, () => logger.info(`Monitoring listening on port ${metricsPort}!`));
+    metricsApp.listen({
+        port: metricsPort,
+        host: eaHost,
+    }, () => logger.info(`Monitoring listening on port ${metricsPort}!`));
 }
 exports.setupMetricsServer = setupMetricsServer;
 const setupMetrics = (name, config) => {
@@ -64,8 +67,9 @@ exports.setupMetrics = setupMetrics;
  * @returns the cache middleware function
  */
 const buildMetricsMiddleware = (req, res, done) => {
-    const feedId = req.requestContext.meta?.metrics?.feedId || 'N/A';
-    const labels = buildHttpRequestMetricsLabel(feedId, req.requestContext.meta?.error, req.requestContext.meta?.metrics?.cacheHit);
+    // The request context can technically be empty if the input validation failed
+    const feedId = req.requestContext?.meta?.metrics?.feedId || 'N/A';
+    const labels = buildHttpRequestMetricsLabel(feedId, req.requestContext?.meta?.error, req.requestContext?.meta?.metrics?.cacheHit);
     // Record number of requests sent to EA
     exports.httpRequestsTotal.labels(labels).inc();
     // Record response time of request through entire EA

package/package.json

@@ -1,31 +1,36 @@
 {
   "name": "@chainlink/external-adapter-framework",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "main": "dist/index.js",
   "license": "MIT",
   "dependencies": {
     "axios": "^0.27.2",
-    "fastify": "^3.29.0",
+    "fastify": "^4.5.3",
     "ioredis": "^5.0.4",
     "pino": "^7.9.2",
     "prom-client": "13.2.0",
+    "supertest": "^6.2.4",
+    "ts-jest": "^28.0.7",
     "ts-node": "^10.9.1",
     "typescript": "^4.6.3",
     "ws": "^8.5.0"
   },
   "scripts": {
-    "start": "ts-node src/test.ts",
     "generate-docs": "typedoc src/**/*.ts",
     "test": "LOG_LEVEL=error EA_PORT=0 c8 ava",
     "test-debug": "LOG_LEVEL=trace DEBUG=true EA_PORT=0 c8 ava --verbose",
     "build": "tsc",
     "lint": "eslint ./src && prettier --check ./src/**/*.ts",
-    "dev": "NODE_ENV=develop tsnd --respawn --transpile-only --project tsconfig.json './src/test.ts'"
+    "lint-fix": "eslint --fix ./src && prettier --write ./src/**/*.ts",
+    "dev": "NODE_ENV=develop tsnd --respawn --transpile-only --project tsconfig.json './src/test.ts'",
+    "verify": "yarn lint && yarn build && yarn build -p ./test/tsconfig.json && yarn test"
   },
   "devDependencies": {
     "@sinonjs/fake-timers": "^9.1.2",
+    "@types/jest": "^28.1.7",
     "@types/node": "^18.6.5",
     "@types/sinonjs__fake-timers": "^8.1.2",
+    "@types/supertest": "^2.0.12",
     "@types/ws": "^8.5.3",
     "@typescript-eslint/eslint-plugin": "^5.17.0",
     "@typescript-eslint/parser": "^5.17.0",
@@ -34,11 +39,12 @@
     "eslint": "^8.14.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-tsdoc": "^0.2.16",
+    "jest": "^29.0.3",
     "mock-socket": "^9.1.3",
     "nock": "^13.2.4",
     "pino-pretty": "^7.6.0",
     "prettier": "^2.6.1",
-    "ts-node-dev": "2.0.0",
+    "ts-node-dev": "^2.0.0",
     "typedoc": "^0.22.15"
   },
   "prettier": {

package/rate-limiting/index.d.ts

@@ -44,7 +44,7 @@ export interface BackgroundExecuteRateLimiter extends RateLimiter {
  * @param limits - the rate limit tier set for the adapter
  * @returns the most restrictive of the set options, in requests per second
  */
-export declare const consolidateTierLimits: (limits?: AdapterRateLimitTier | undefined) => number;
+export declare const consolidateTierLimits: (limits?: AdapterRateLimitTier) => number;
 /**
  * Validates rate limiting tiers specified for the adapter, and returns the one to use.
  *
@@ -52,4 +52,4 @@ export declare const consolidateTierLimits: (limits?: AdapterRateLimitTier | und
  * @param tiers - the adapter config listing the different available API tiers
  * @returns the specified API tier, or a default one if none are specified
  */
-export declare const getRateLimitingTier: (config: AdapterConfig, tiers?: Record<string, AdapterRateLimitTier> | undefined) => AdapterRateLimitTier | undefined;
+export declare const getRateLimitingTier: (config: AdapterConfig, tiers?: Record<string, AdapterRateLimitTier>) => AdapterRateLimitTier | undefined;

package/test.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _1 = require(".");
-const bank_frick_1 = require("./examples/bank-frick");
+const src_1 = require("./examples/coingecko/src");
 // Start sample adapter
-(0, _1.expose)(bank_frick_1.adapter);
+(0, _1.expose)(src_1.adapter);

package/transports/batch-warming.d.ts

@@ -26,7 +26,7 @@ export declare class BatchWarmingTransport<AdapterParams, ProviderRequestBody, P
     WARMER_ACTIVE: boolean;
     constructor(config: {
         prepareRequest: (params: AdapterParams[], context: AdapterContext<CustomSettings>) => AxiosRequestConfig<ProviderRequestBody>;
-        parseResponse: (res: AxiosResponse<ProviderResponseBody>, context: AdapterContext<CustomSettings>) => ProviderResult<AdapterParams>[];
+        parseResponse: (params: AdapterParams[], res: AxiosResponse<ProviderResponseBody>, context: AdapterContext<CustomSettings>) => ProviderResult<AdapterParams>[];
     });
     initialize(dependencies: AdapterDependencies): Promise<void>;
     hasBeenSetUp(req: AdapterRequest<AdapterParams>): Promise<boolean>;

package/transports/batch-warming.js

@@ -1,35 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchWarmingTransport = void 0;
 const util_1 = require("../util");
 const _1 = require("./");
 const util_2 = require("./util");
-const rateLimitMetrics = __importStar(require("../rate-limiting/metrics"));
-const cacheMetrics = __importStar(require("../cache/metrics"));
-const WARMUP_BATCH_REQUEST_ID = '9002';
 const logger = (0, util_1.makeLogger)('BatchWarmingTransport');
 /**
  * Transport implementation that takes incoming batches requests and keeps a warm cache of values.
@@ -69,32 +43,22 @@ class BatchWarmingTransport {
             logger.debug('No entries in batch warming set, skipping');
             if (this.WARMER_ACTIVE) {
                 // Decrement count when warmer changed from having entries to having none
-                cacheMetrics.cacheWarmerCount.labels({ isBatched: 'true' }).dec();
                 this.WARMER_ACTIVE = false;
             }
             return this.rateLimiter.msUntilNextExecution(context.adapterEndpoint.name);
         }
         else if (this.WARMER_ACTIVE === false) {
             // Increment count when warmer changed from having no entries to having some
-            cacheMetrics.cacheWarmerCount.labels({ isBatched: 'true' }).inc();
             this.WARMER_ACTIVE = true;
         }
         const request = this.config.prepareRequest(entries, context);
         logger.trace('Sending request to data provider...');
         const providerResponse = await (0, util_2.axiosRequest)(request, context.adapterConfig);
         logger.debug(`Got response from provider, parsing (raw body: ${providerResponse.data})`);
-        const results = this.config.parseResponse(providerResponse, context);
+        const results = this.config.parseResponse(entries, providerResponse, context);
         const adapterResponses = (0, _1.buildCacheEntriesFromResults)(results, context);
         logger.debug('Setting adapter responses in cache');
         await this.cache.setMany(adapterResponses, context.adapterConfig.CACHE_MAX_AGE);
-        // Record cost of data provider call
-        const cost = rateLimitMetrics.retrieveCost(providerResponse.data);
-        rateLimitMetrics.rateLimitCreditsSpentTotal
-            .labels({
-            feed_id: 'N/A',
-            participant_id: WARMUP_BATCH_REQUEST_ID,
-        })
-            .inc(cost);
         return this.rateLimiter.msUntilNextExecution(context.adapterEndpoint.name);
     }
 }

package/transports/index.d.ts

@@ -60,7 +60,9 @@ export interface Transport<Params, Result, CustomSettings extends SettingsMap> {
  * @param context - context for the Adapter
  * @returns a list of CacheEntries of AdapterResponses
  */
-export declare const buildCacheEntriesFromResults: <Params, CustomSettings extends SettingsMap>(results: ProviderResult<Params>[], context: AdapterContext<CustomSettings>) => CacheEntry<AdapterResponse<null>>[];
+export declare const buildCacheEntriesFromResults: <Params, CustomSettings extends SettingsMap>(results: ProviderResult<Params>[], context: AdapterContext<CustomSettings>) => CacheEntry<AdapterResponse<{
+    result: unknown;
+}>>[];
 /**
  * Takes an Adapter, its configuration, and its dependencies, and it creates an express middleware
  * that will pass along the AdapterRequest to the appropriate Transport (acc. to the endpoint in the req.)

package/transports/index.js

@@ -34,7 +34,9 @@ const buildCacheEntriesFromResults = (results, context) => results.map((r) => {
         value: {
             result: r.value,
             statusCode: 200,
-            data: null, // TODO: Maybe add data as well?
+            data: {
+                result: r.value,
+            },
         },
     };
     if (context.adapterConfig.METRICS_ENABLED &&

package/transports/metrics.d.ts

@@ -1,7 +1,7 @@
 import * as client from 'prom-client';
 import { AdapterContext } from '../adapter';
 import { SettingsMap } from '../config';
-export declare const dataProviderMetricsLabel: (providerStatusCode?: number | undefined, method?: string) => {
+export declare const dataProviderMetricsLabel: (providerStatusCode?: number, method?: string) => {
     provider_status_code: number | undefined;
     method: string;
 };

package/transports/rest.js

@@ -1,33 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RestTransport = void 0;
 const util_1 = require("../util");
 const error_1 = require("../validation/error");
 const util_2 = require("./util");
-const rateLimitMetrics = __importStar(require("../rate-limiting/metrics"));
 const IN_FLIGHT_PREFIX = 'InFlight';
 const logger = (0, util_1.makeLogger)('RestTransport');
 /**
@@ -114,14 +90,6 @@ class RestTransport {
         }
         logger.debug('Setting provider response in cache');
         await this.cache.set(req.requestContext.cacheKey, parsedResponse, config.CACHE_MAX_AGE);
-        // Record cost of data provider call
-        const cost = rateLimitMetrics.retrieveCost(providerResponse.data);
-        rateLimitMetrics.rateLimitCreditsSpentTotal
-            .labels({
-            feed_id: req.requestContext.meta?.metrics?.feedId || 'N/A',
-            participant_id: req.requestContext.cacheKey,
-        })
-            .inc(cost);
         // Update cacheHit flag in request meta for metrics use
         req.requestContext.meta = {
             ...req.requestContext.meta,

package/transports/util.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -29,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.axiosRequest = void 0;
 const axios_1 = __importDefault(require("axios"));
 const error_1 = require("../validation/error");
-const transportMetrics = __importStar(require("./metrics"));
 /**
  * Performs axios request along with metrics recording and error handling
  *
@@ -37,7 +13,6 @@ const transportMetrics = __importStar(require("./metrics"));
  * @returns axios response for the request
  */
 async function axiosRequest(request, config) {
-    const responseTimer = transportMetrics.dataProviderRequestDurationSeconds.startTimer();
     let providerResponse;
     try {
         request.timeout = config.API_TIMEOUT;
@@ -62,9 +37,6 @@ async function axiosRequest(request, config) {
             providerStatusCode = 0; // 0 -> connection error
         }
         // Record count of failed data provider request
-        transportMetrics.dataProviderRequests
-            .labels(transportMetrics.dataProviderMetricsLabel(providerStatusCode, request.method))
-            .inc();
         adapterError.statusCode = 200;
         adapterError.providerStatusCode = providerStatusCode;
         adapterError.message = error?.message;
@@ -75,12 +47,7 @@ async function axiosRequest(request, config) {
     }
     finally {
         // Record time taken for data provider request for success or failure
-        responseTimer();
     }
-    // Record count of successful data provider requests
-    transportMetrics.dataProviderRequests
-        .labels(transportMetrics.dataProviderMetricsLabel(providerResponse.status, request.method))
-        .inc();
     return providerResponse;
 }
 exports.axiosRequest = axiosRequest;

package/transports/websocket.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -30,7 +7,6 @@ exports.WebSocketTransport = exports.WebSocketClassProvider = void 0;
 const ws_1 = __importDefault(require("ws"));
 const util_1 = require("../util");
 const _1 = require("./");
-const transportMetrics = __importStar(require("./metrics"));
 const logger = (0, util_1.makeLogger)('WebSocketTransport');
 class WebSocketClassProvider {
     static set(ctor) {
@@ -87,7 +63,6 @@ class WebSocketTransport {
                 logger.debug('Successfully executed connection opened handler');
                 // Record active ws connections by incrementing count on open
                 // Using URL in label since connection_key is removed from v3
-                transportMetrics.wsConnectionActive.inc();
                 resolve(true);
             });
             this.wsConnection.addEventListener('message', async (event) => {
@@ -103,15 +78,11 @@ class WebSocketTransport {
             });
             this.wsConnection.addEventListener('error', async (event) => {
                 // Record connection error count
-                transportMetrics.wsConnectionErrors
-                    .labels(transportMetrics.connectionErrorLabels(event.message))
-                    .inc();
             });
             this.wsConnection.addEventListener('close', (event) => {
                 logger.debug(`Closed websocket connection. Code: ${event.code} ; reason: ${event.reason?.toString()}`);
                 // Record active ws connections by decrementing count on close
                 // Using URL in label since connection_key is removed from v3
-                transportMetrics.wsConnectionActive.dec();
             });
         });
     }
@@ -155,8 +126,6 @@ class WebSocketTransport {
             logger.trace(`Sending message: ${JSON.stringify(message)}`);
             this.wsConnection.send(message);
         }
-        // Record WS message and subscription metrics
-        transportMetrics.recordWsMessageMetrics(context, subscribeParams, unsubscribeParams);
         logger.debug('Setting local state to cache value');
         this.localSubscriptions = desiredSubs;
         logger.debug('Background execute complete');

package/util/request.d.ts

@@ -51,7 +51,6 @@ export declare type AdapterResponse<T = unknown> = {
     result: unknown;
     maxAge?: number;
     meta?: AdapterRequestMeta;
-    providerStatusCode?: number;
 };
 export declare type Middleware = ((req: AdapterRequest, reply: FastifyReply, done: HookHandlerDoneFunction) => FastifyReply | void) | ((req: AdapterRequest, reply: FastifyReply) => Promise<FastifyReply | void>);
 export declare type AdapterMiddlewareBuilder = (adapter: Adapter) => Middleware;

package/validation/index.js

@@ -39,7 +39,6 @@ const validatorMiddleware = (adapter) => (req, reply, done) => {
         });
     }
     // Validate data using validator from v2
-    // TODO: See if we want to change this whole thing
     const validator = new validator_1.Validator(req.body, endpoint.inputParameters);
     req.requestContext = {
         id: req.body.id || '1',
@@ -76,7 +75,10 @@ const validatorMiddleware = (adapter) => (req, reply, done) => {
 exports.validatorMiddleware = validatorMiddleware;
 const errorCatchingMiddleware = (err, req, res) => {
     // Add adapter or generic error to request meta for metrics use
-    req.requestContext.meta = { ...req.requestContext.meta, error: err };
+    // There's a chance we have no request context if there was an error during input validation
+    if (req.requestContext) {
+        req.requestContext.meta = { ...req.requestContext?.meta, error: err };
+    }
     if (err instanceof error_1.AdapterError) {
         // We want to log these as warn, because although they are to be expected, NOPs should
         // Only use "correct" job specs and therefore not hit adapters with invalid requests.