@gasket/plugin-elastic-apm 7.0.6 → 7.1.0-canary.1

package/lib/actions.js

@@ -1,20 +1,24 @@
+const { withGasketRequest } = require('@gasket/request');
+
 /** @type {import('@gasket/core').ActionHandler<'getApmTransaction'>} */
-async function getApmTransaction(gasket, req) {
-  const apm = require('elastic-apm-node');
+const getApmTransaction = withGasketRequest(
+  async function getApmTransaction(gasket, req) {
+    const apm = require('elastic-apm-node');
 
-  if (!apm?.isStarted()) {
-    return;
-  }
+    if (!apm?.isStarted()) {
+      return;
+    }
 
-  const transaction = apm.currentTransaction;
-  if (!transaction) {
-    return;
-  }
+    const transaction = apm.currentTransaction;
+    if (!transaction) {
+      return;
+    }
 
-  await gasket.exec('apmTransaction', transaction, { req });
+    await gasket.exec('apmTransaction', transaction, { req });
 
-  return transaction;
-}
+    return transaction;
+  }
+);
 
 module.exports = {
   getApmTransaction

package/lib/index.d.ts

@@ -1,7 +1,5 @@
-import type { IncomingMessage } from 'http';
 import type { AgentConfigOptions, Transaction, Payload, Agent } from 'elastic-apm-node';
-import type { MaybeAsync, GasketConfig, Plugin } from '@gasket/core';
-import type { Request } from 'express';
+import type { GasketConfig, Plugin } from '@gasket/core';
 
 export function filterSensitiveCookies(config: GasketConfig): function(Payload): Payload;
 
@@ -10,6 +8,8 @@ export interface ExtendedAgentConfigOptions extends AgentConfigOptions {
 }
 
 declare module '@gasket/core' {
+  import { RequestLike, GasketRequest } from '@gasket/request';
+
   export interface GasketConfig {
     elasticAPM?: ExtendedAgentConfigOptions;
   }
@@ -19,8 +19,8 @@ declare module '@gasket/core' {
   }
 
   export interface GasketActions {
-    async getApmTransaction(
-      req: IncomingMessage | Request
+    getApmTransaction(
+      req: RequestLike
     ): Promise<Transaction | void>
   }
 
@@ -28,7 +28,7 @@ declare module '@gasket/core' {
     apmTransaction(
       transaction: Transaction,
       context: {
-        req: IncomingMessage | Request;
+        req: GasketRequest;
       }
     ): MaybeAsync<void>;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasket/plugin-elastic-apm",
-  "version": "7.0.6",
+  "version": "7.1.0-canary.1",
   "description": "Adds Elastic APM instrumentation to your application",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -36,8 +36,12 @@
     "url": "https://github.com/godaddy/gasket/issues"
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/gasket-plugin-elastic-apm",
+  "dependencies": {
+    "@gasket/request": "7.1.0-canary.1"
+  },
   "devDependencies": {
-    "@gasket/core": "^7.0.6",
+    "@gasket/core": "7.1.0-canary.1",
+    "cross-env": "^7.0.3",
     "dotenv": "^16.4.5",
     "elastic-apm-node": "^4.4.1",
     "eslint": "^8.56.0",
@@ -66,5 +70,5 @@
   "jest": {
     "testEnvironment": "node"
   },
-  "gitHead": "90fec87372fb74755e92668a9158fc3c820dd37f"
+  "gitHead": "79706568a4b2a7aa2621bf1f0bdaded08c396ed4"
 }