@gasket/plugin-elastic-apm 7.0.0-cli.6 → 7.0.0-next.0

package/lib/index.d.ts

@@ -1,5 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'http';
 import type { AgentConfigOptions, Transaction } from 'elastic-apm-node';
+import type { MaybeAsync } from '@gasket/engine';
 
 declare module '@gasket/engine' {
   export interface GasketConfig {
@@ -7,7 +8,11 @@ declare module '@gasket/engine' {
       sensitiveCookies?: Array<string>
     },
   }
-  
+
+  export interface Gasket {
+    apm?: Agent;
+  }
+
   export interface HookExecTypes {
     apmTransaction(
       transaction: Transaction,

package/lib/index.js

@@ -25,7 +25,7 @@ const isActive = (config, env) => {
 module.exports = {
   hooks: {
     configure: {
-      handler: async (gasket, config) => {
+      handler: (gasket, config) => {
         config.elasticAPM = config.elasticAPM || {};
 
         // eslint-disable-next-line no-process-env

package/lib/middleware.js

@@ -10,7 +10,6 @@
  */
 
 const { callbackify } = require('util');
-const apm = require('elastic-apm-node');
 
 /**
  * Middleware for customizing transactions
@@ -20,6 +19,12 @@ const apm = require('elastic-apm-node');
  * @param {Response}  res     The server response
  */
 async function customizeTransaction(gasket, req, res) {
+  const apm = gasket.apm;
+
+  if (!apm?.isStarted()) {
+    return;
+  }
+
   const transaction = apm.currentTransaction;
   if (!transaction) {
     return;
@@ -28,6 +33,9 @@ async function customizeTransaction(gasket, req, res) {
   await gasket.exec('apmTransaction', transaction, { req, res });
 }
 
-module.exports = (gasket) => [
-  callbackify(async (req, res) => customizeTransaction(gasket, req, res))
-];
+module.exports = (gasket) => {
+  return (
+    gasket.apm
+    && [callbackify(async (req, res) => customizeTransaction(gasket, req, res))]
+  );
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gasket/plugin-elastic-apm",
-  "version": "7.0.0-cli.6",
+  "version": "7.0.0-next.0",
   "description": "Adds Elastic APM instrumentation to your application",
   "main": "lib",
   "types": "lib/index.d.ts",
@@ -40,7 +40,7 @@
   },
   "homepage": "https://github.com/godaddy/gasket/tree/main/packages/gasket-plugin-elastic-apm",
   "devDependencies": {
-    "@gasket/engine": "^7.0.0-cli.6",
+    "@gasket/engine": "^7.0.0-next.0",
     "dot-env": "^0.0.1",
     "elastic-apm-node": "^4.4.1",
     "eslint": "^8.56.0",
@@ -66,5 +66,5 @@
   "jest": {
     "testEnvironment": "node"
   },
-  "gitHead": "55e09f4b9d9d059c108f0c4f9ccf442f2ff78ad2"
+  "gitHead": "55ab680e659ef5315c1d82f511439f32cca5f2e4"
 }