@envelop/newrelic 5.0.0-alpha-d0d0776.0 → 5.0.0-alpha-ccec0fc.0

package/README.md

@@ -31,8 +31,8 @@ yarn add newrelic @envelop/newrelic
 ## Basic usage Example
 
 ```ts
-import { envelop } from '@envelop/core';
-import { useNewRelic } from '@envelop/newrelic';
+import { envelop } from '@envelop/core'
+import { useNewRelic } from '@envelop/newrelic'
 
 const getEnveloped = envelop({
   plugins: [
@@ -44,11 +44,13 @@ const getEnveloped = envelop({
       trackResolvers: true, // default `false`. When set to `true`, track resolvers as segments to monitor their performance
       includeResolverArgs: false, // default `false`. When set to `true`, includes all the arguments passed to resolvers with their values
       rootFieldsNaming: true, // default `false`. When set to `true` append the names of operation root fields to the transaction name
-      skipError: error => { ... return true; }, // a function that allows you to skip reporting a given error to NewRelic. By default custom `EnvelopError`s will be skipped
-      extractOperationName: (context) => context.request.body.customOperationName, // Allows to set a custom operation name to be used as transaction name and attribute
-    }),
-  ],
-});
+      skipError: error => {
+        return true // a function that allows you to skip reporting a given error to NewRelic. By default custom `EnvelopError`s will be skipped
+      },
+      extractOperationName: context => context.request.body.customOperationName // Allows to set a custom operation name to be used as transaction name and attribute
+    })
+  ]
+})
 ```
 
 > Note: Transaction and segment/span timings may be affected by other plugins used. In order to get more accurate tracking, it is recommended to add the New Relic plugin last.

package/{index.js → cjs/index.js}

@@ -1,28 +1,31 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-const core = require('@envelop/core');
-const graphql = require('graphql');
-
-function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
-    const n = Object.create(null);
-    if (e) {
-        for (const k in e) {
-            if (k !== 'default') {
-                const d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
-        }
+"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]; } };
     }
-    n["default"] = e;
-    return Object.freeze(n);
-}
-
+    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.useNewRelic = exports.defaultSkipError = void 0;
+const core_1 = require("@envelop/core");
+const graphql_1 = require("@graphql-tools/graphql");
 var AttributeName;
 (function (AttributeName) {
     AttributeName["COMPONENT_NAME"] = "Envelop_NewRelic_Plugin";
@@ -48,19 +51,21 @@ const DEFAULT_OPTIONS = {
     skipError: defaultSkipError,
 };
 function defaultSkipError(error) {
-    return error.originalError instanceof core.EnvelopError;
+    return error.originalError instanceof core_1.EnvelopError;
 }
+exports.defaultSkipError = defaultSkipError;
 const useNewRelic = (rawOptions) => {
     const options = {
         ...DEFAULT_OPTIONS,
-        ...(rawOptions || {}),
+        ...rawOptions,
     };
     options.isExecuteVariablesRegex = options.includeExecuteVariables instanceof RegExp;
     options.isResolverArgsRegex = options.includeResolverArgs instanceof RegExp;
-    const instrumentationApi$ = Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('newrelic')); })
-        .then(m => m.default || m)
+    const instrumentationApi$ = Promise.resolve().then(() => __importStar(require('newrelic'))).then(m => m.default || m)
         .then(({ shim }) => {
-        shim.agent.metrics.getOrCreateMetric(`Supportability/ExternalModules/${AttributeName.COMPONENT_NAME}`).incrementCallCount();
+        shim.agent.metrics
+            .getOrCreateMetric(`Supportability/ExternalModules/${AttributeName.COMPONENT_NAME}`)
+            .incrementCallCount();
         return shim;
     });
     const logger$ = instrumentationApi$.then(({ logger }) => {
@@ -70,26 +75,28 @@ const useNewRelic = (rawOptions) => {
     });
     return {
         async onExecute({ args }) {
+            var _a, _b;
             const instrumentationApi = await instrumentationApi$;
             const transactionNameState = instrumentationApi.agent.tracer.getTransaction().nameState;
             const spanContext = instrumentationApi.agent.tracer.getSpanContext();
             const delimiter = transactionNameState.delimiter;
-            const rootOperation = args.document.definitions.find(definitionNode => definitionNode.kind === graphql.Kind.OPERATION_DEFINITION);
+            const rootOperation = args.document.definitions.find(definitionNode => definitionNode.kind === graphql_1.Kind.OPERATION_DEFINITION);
             const operationType = rootOperation.operation;
-            const document = graphql.print(args.document);
-            const operationName = options.extractOperationName?.(args.contextValue) ||
+            const document = (0, graphql_1.print)(args.document);
+            const operationName = ((_a = options.extractOperationName) === null || _a === void 0 ? void 0 : _a.call(options, args.contextValue)) ||
                 args.operationName ||
-                rootOperation.name?.value ||
+                ((_b = rootOperation.name) === null || _b === void 0 ? void 0 : _b.value) ||
                 AttributeName.ANONYMOUS_OPERATION;
             let rootFields = null;
             if (options.rootFieldsNaming) {
-                const fieldNodes = rootOperation.selectionSet.selections.filter(selectionNode => selectionNode.kind === graphql.Kind.FIELD);
+                const fieldNodes = rootOperation.selectionSet.selections.filter(selectionNode => selectionNode.kind === graphql_1.Kind.FIELD);
                 rootFields = fieldNodes.map(fieldNode => fieldNode.name.value);
             }
             transactionNameState.setName(transactionNameState.prefix, transactionNameState.verb, delimiter, operationType + delimiter + operationName + (rootFields ? delimiter + rootFields.join('&') : ''));
             spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_NAME, operationName);
             spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_TYPE, operationType);
-            options.includeOperationDocument && spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_DOCUMENT, document);
+            options.includeOperationDocument &&
+                spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_DOCUMENT, document);
             if (options.includeExecuteVariables) {
                 const rawVariables = args.variableValues || {};
                 const executeVariablesToTrack = options.isExecuteVariablesRegex
@@ -136,6 +143,7 @@ const useNewRelic = (rawOptions) => {
                 onResolverCalled,
                 onExecuteDone({ result }) {
                     const sendResult = (singularResult) => {
+                        var _a;
                         if (singularResult.data && options.includeRawResult) {
                             spanContext.addCustomAttribute(AttributeName.EXECUTION_RESULT, JSON.stringify(singularResult));
                         }
@@ -143,13 +151,13 @@ const useNewRelic = (rawOptions) => {
                             const agent = instrumentationApi.agent;
                             const transaction = instrumentationApi.tracer.getTransaction();
                             for (const error of singularResult.errors) {
-                                if (options.skipError?.(error))
+                                if ((_a = options.skipError) === null || _a === void 0 ? void 0 : _a.call(options, error))
                                     continue;
                                 agent.errors.add(transaction, JSON.stringify(error));
                             }
                         }
                     };
-                    if (core.isAsyncIterable(result)) {
+                    if ((0, core_1.isAsyncIterable)(result)) {
                         return {
                             onNext: ({ result: singularResult }) => {
                                 sendResult(singularResult);
@@ -167,6 +175,7 @@ const useNewRelic = (rawOptions) => {
         },
     };
 };
+exports.useNewRelic = useNewRelic;
 function flattenPath(fieldPath, delimiter = '/') {
     const pathArray = [];
     let thisPath = fieldPath;
@@ -186,6 +195,3 @@ function filterPropertiesByRegex(initialObject, pattern) {
     }
     return filteredObject;
 }
-
-exports.defaultSkipError = defaultSkipError;
-exports.useNewRelic = useNewRelic;

package/cjs/package.json

@@ -0,0 +1 @@
+{"type":"commonjs"}

package/{index.mjs → esm/index.js}

@@ -1,6 +1,5 @@
-import { EnvelopError, isAsyncIterable } from '@envelop/core';
-import { Kind, print } from 'graphql';
-
+import { isAsyncIterable, EnvelopError } from '@envelop/core';
+import { print, Kind } from '@graphql-tools/graphql';
 var AttributeName;
 (function (AttributeName) {
     AttributeName["COMPONENT_NAME"] = "Envelop_NewRelic_Plugin";
@@ -25,20 +24,22 @@ const DEFAULT_OPTIONS = {
     rootFieldsNaming: false,
     skipError: defaultSkipError,
 };
-function defaultSkipError(error) {
+export function defaultSkipError(error) {
     return error.originalError instanceof EnvelopError;
 }
-const useNewRelic = (rawOptions) => {
+export const useNewRelic = (rawOptions) => {
     const options = {
         ...DEFAULT_OPTIONS,
-        ...(rawOptions || {}),
+        ...rawOptions,
     };
     options.isExecuteVariablesRegex = options.includeExecuteVariables instanceof RegExp;
     options.isResolverArgsRegex = options.includeResolverArgs instanceof RegExp;
     const instrumentationApi$ = import('newrelic')
         .then(m => m.default || m)
         .then(({ shim }) => {
-        shim.agent.metrics.getOrCreateMetric(`Supportability/ExternalModules/${AttributeName.COMPONENT_NAME}`).incrementCallCount();
+        shim.agent.metrics
+            .getOrCreateMetric(`Supportability/ExternalModules/${AttributeName.COMPONENT_NAME}`)
+            .incrementCallCount();
         return shim;
     });
     const logger$ = instrumentationApi$.then(({ logger }) => {
@@ -48,6 +49,7 @@ const useNewRelic = (rawOptions) => {
     });
     return {
         async onExecute({ args }) {
+            var _a, _b;
             const instrumentationApi = await instrumentationApi$;
             const transactionNameState = instrumentationApi.agent.tracer.getTransaction().nameState;
             const spanContext = instrumentationApi.agent.tracer.getSpanContext();
@@ -55,9 +57,9 @@ const useNewRelic = (rawOptions) => {
             const rootOperation = args.document.definitions.find(definitionNode => definitionNode.kind === Kind.OPERATION_DEFINITION);
             const operationType = rootOperation.operation;
             const document = print(args.document);
-            const operationName = options.extractOperationName?.(args.contextValue) ||
+            const operationName = ((_a = options.extractOperationName) === null || _a === void 0 ? void 0 : _a.call(options, args.contextValue)) ||
                 args.operationName ||
-                rootOperation.name?.value ||
+                ((_b = rootOperation.name) === null || _b === void 0 ? void 0 : _b.value) ||
                 AttributeName.ANONYMOUS_OPERATION;
             let rootFields = null;
             if (options.rootFieldsNaming) {
@@ -67,7 +69,8 @@ const useNewRelic = (rawOptions) => {
             transactionNameState.setName(transactionNameState.prefix, transactionNameState.verb, delimiter, operationType + delimiter + operationName + (rootFields ? delimiter + rootFields.join('&') : ''));
             spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_NAME, operationName);
             spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_TYPE, operationType);
-            options.includeOperationDocument && spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_DOCUMENT, document);
+            options.includeOperationDocument &&
+                spanContext.addCustomAttribute(AttributeName.EXECUTION_OPERATION_DOCUMENT, document);
             if (options.includeExecuteVariables) {
                 const rawVariables = args.variableValues || {};
                 const executeVariablesToTrack = options.isExecuteVariablesRegex
@@ -114,6 +117,7 @@ const useNewRelic = (rawOptions) => {
                 onResolverCalled,
                 onExecuteDone({ result }) {
                     const sendResult = (singularResult) => {
+                        var _a;
                         if (singularResult.data && options.includeRawResult) {
                             spanContext.addCustomAttribute(AttributeName.EXECUTION_RESULT, JSON.stringify(singularResult));
                         }
@@ -121,7 +125,7 @@ const useNewRelic = (rawOptions) => {
                             const agent = instrumentationApi.agent;
                             const transaction = instrumentationApi.tracer.getTransaction();
                             for (const error of singularResult.errors) {
-                                if (options.skipError?.(error))
+                                if ((_a = options.skipError) === null || _a === void 0 ? void 0 : _a.call(options, error))
                                     continue;
                                 agent.errors.add(transaction, JSON.stringify(error));
                             }
@@ -164,5 +168,3 @@ function filterPropertiesByRegex(initialObject, pattern) {
     }
     return filteredObject;
 }
-
-export { defaultSkipError, useNewRelic };

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@envelop/newrelic",
-  "version": "5.0.0-alpha-d0d0776.0",
+  "version": "5.0.0-alpha-ccec0fc.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@envelop/core": "3.0.0-alpha-d0d0776.0",
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
-    "newrelic": "^7 || ^8.0.0"
+    "@envelop/core": "3.0.0-alpha-ccec0fc.0",
+    "newrelic": "^7 || ^8.0.0",
+    "@graphql-tools/graphql": "0.1.0-alpha-e7752ba5.0"
   },
+  "dependencies": {},
   "repository": {
     "type": "git",
     "url": "https://github.com/n1ru4l/envelop.git",
@@ -14,33 +15,42 @@
   },
   "author": "Santino Puleio <santinopuleio@gmail.com>",
   "license": "MIT",
-  "main": "index.js",
-  "module": "index.mjs",
-  "typings": "index.d.ts",
+  "main": "cjs/index.js",
+  "module": "esm/index.js",
+  "typings": "typings/index.d.ts",
   "typescript": {
-    "definition": "index.d.ts"
+    "definition": "typings/index.d.ts"
   },
+  "type": "module",
   "exports": {
     ".": {
       "require": {
-        "default": "./index.js",
-        "types": "./index.d.ts"
+        "types": "./typings/index.d.ts",
+        "default": "./cjs/index.js"
       },
       "import": {
-        "default": "./index.mjs",
-        "types": "./index.d.ts"
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "default": {
+        "types": "./typings/index.d.ts",
+        "default": "./esm/index.js"
       }
     },
     "./*": {
       "require": {
-        "default": "./*.js",
-        "types": "./*.d.ts"
+        "types": "./typings/*.d.ts",
+        "default": "./cjs/*.js"
       },
       "import": {
-        "default": "./*.mjs",
-        "types": "./*.d.ts"
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
+      },
+      "default": {
+        "types": "./typings/*.d.ts",
+        "default": "./esm/*.js"
       }
     },
     "./package.json": "./package.json"
   }
-}
+}

package/{index.d.ts → typings/index.d.ts}

@@ -1,5 +1,5 @@
 import { Plugin, DefaultContext } from '@envelop/core';
-import { GraphQLError } from 'graphql';
+import { GraphQLError } from '@graphql-tools/graphql';
 export declare type UseNewRelicOptions = {
     includeOperationDocument?: boolean;
     includeExecuteVariables?: boolean | RegExp;
@@ -18,4 +18,4 @@ export declare type UseNewRelicOptions = {
     skipError?: (error: GraphQLError) => boolean;
 };
 export declare function defaultSkipError(error: GraphQLError): boolean;
-export declare const useNewRelic: (rawOptions?: UseNewRelicOptions | undefined) => Plugin;
+export declare const useNewRelic: (rawOptions?: UseNewRelicOptions) => Plugin;