Rename instruments to instrumentation

Author: ardatan

.changeset/vast-spies-joke.md

@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/utils': patch
+---
+
+Rename instruments to instrumentation

packages/legacy/utils/CHANGELOG.md

@@ -7,8 +7,8 @@
 - [#8456](https://github.com/ardatan/graphql-mesh/pull/8456)
   [`4528794`](https://github.com/ardatan/graphql-mesh/commit/45287948dbfbe07c3f60f9c36253099c549207d9)
   Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Add compatibility with new
-  `Instruments` API of Hive Gateway. See
-  [Hive Gateway documentation](https://the-guild.dev/graphql/hive/docs/gateway/other-features/custom-plugins#instruments)
+  `instrumentation` API of Hive Gateway. See
+  [Hive Gateway documentation](https://the-guild.dev/graphql/hive/docs/gateway/other-features/custom-plugins#instrumentation)
   for more details.
 
 ### Patch Changes
@@ -17,7 +17,7 @@
   [`4528794`](https://github.com/ardatan/graphql-mesh/commit/45287948dbfbe07c3f60f9c36253099c549207d9)
   Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - dependencies updates:
   - Added dependency
-    [`@envelop/instruments@^1.0.0` ↗︎](https://www.npmjs.com/package/@envelop/instruments/v/1.0.0)
+    [`@envelop/instrumentation@^1.0.0` ↗︎](https://www.npmjs.com/package/@envelop/instrumentation/v/1.0.0)
     (to `dependencies`)
 - Updated dependencies []:
   - @graphql-mesh/types@0.104.0

packages/legacy/utils/package.json

@@ -35,7 +35,7 @@
     "graphql": "*"
   },
   "dependencies": {
-    "@envelop/instruments": "^1.0.0",
+    "@envelop/instrumentation": "^1.0.0",
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/string-interpolation": "^0.5.8",
     "@graphql-mesh/types": "^0.104.0",

packages/legacy/utils/src/wrapFetchWithHooks.ts

@@ -1,4 +1,4 @@
-import { getInstrumented } from '@envelop/instruments';
+import { getInstrumented } from '@envelop/instrumentation';
 import type { Logger, MeshFetch, OnFetchHook, OnFetchHookDone } from '@graphql-mesh/types';
 import { type ExecutionRequest, type MaybePromise } from '@graphql-tools/utils';
 import { handleMaybePromise, iterateAsync } from '@whatwg-node/promise-helpers';
@@ -7,7 +7,7 @@ import { DefaultLogger } from './logger.js';
 export const requestIdByRequest = new WeakMap<Request, string>();
 export const loggerForExecutionRequest = new WeakMap<ExecutionRequest, Logger>();
 
-export type FetchInstruments = {
+export type FetchInstrumentation = {
   fetch?: (
     payload: { executionRequest: ExecutionRequest },
     wrapped: () => MaybePromise<void>,
@@ -16,7 +16,7 @@ export type FetchInstruments = {
 
 export function wrapFetchWithHooks<TContext>(
   onFetchHooks: OnFetchHook<TContext>[],
-  instruments?: () => FetchInstruments | undefined,
+  instrumentation?: () => FetchInstrumentation | undefined,
 ): MeshFetch {
   let wrappedFetchFn = function wrappedFetchFn(url, options, context, info) {
     let fetchFn: MeshFetch;
@@ -103,10 +103,10 @@ export function wrapFetchWithHooks<TContext>(
     );
   } as MeshFetch;
 
-  if (instruments) {
+  if (instrumentation) {
     const originalWrappedFetch = wrappedFetchFn;
     wrappedFetchFn = function wrappedFetchFn(url, options, context, info) {
-      const fetchInstrument = instruments()?.fetch;
+      const fetchInstrument = instrumentation()?.fetch;
       const instrumentedFetch = fetchInstrument
         ? getInstrumented({
             get executionRequest() {

packages/legacy/utils/test/fetch-instruments.spec.ts renamed to packages/legacy/utils/test/fetch-instrumentation.spec.ts

@@ -1,12 +1,12 @@
 import type { GraphQLResolveInfo } from 'graphql';
 import { createServerAdapter, Response } from '@whatwg-node/server';
-import { wrapFetchWithHooks, type FetchInstruments } from '../src/wrapFetchWithHooks';
+import { wrapFetchWithHooks, type FetchInstrumentation } from '../src/wrapFetchWithHooks';
 
-describe('Fetch instruments', () => {
-  it('should wrap fetch instruments', async () => {
+describe('Fetch instrumentation', () => {
+  it('should wrap fetch instrumentation', async () => {
     await using adapter = createServerAdapter(() => Response.json({ hello: 'world' }));
     let receivedExecutionRequest;
-    const fetchInstruments: FetchInstruments = {
+    const fetchInstrumentation: FetchInstrumentation = {
       fetch: async ({ executionRequest }, wrapped) => {
         receivedExecutionRequest = executionRequest;
         await wrapped();
@@ -18,7 +18,7 @@ describe('Fetch instruments', () => {
           setFetchFn(adapter.fetch);
         },
       ],
-      () => fetchInstruments,
+      () => fetchInstrumentation,
     );
     const executionRequest = {};
     const res = await wrappedFetch('http://localhost:4000', {}, {}, {

yarn.lock

@@ -4080,6 +4080,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@envelop/instrumentation@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@envelop/instrumentation@npm:1.0.0"
+  dependencies:
+    "@whatwg-node/promise-helpers": "npm:^1.2.1"
+    tslib: "npm:^2.5.0"
+  checksum: 10c0/134df1ac481fb392aafc4522a22bcdc6ef0701f2d15d51b16207f3c9a4c7d3760adfa5f5bcc84f0c0ec7b011d84bcd40fff671eb471bed54bd928c165994b4e3
+  languageName: node
+  linkType: hard
+
 "@envelop/instruments@npm:1.0.0, @envelop/instruments@npm:^1.0.0":
   version: 1.0.0
   resolution: "@envelop/instruments@npm:1.0.0"
@@ -7982,7 +7992,7 @@ __metadata:
   resolution: "@graphql-mesh/utils@workspace:packages/legacy/utils"
   dependencies:
     "@apollo/server": "npm:4.11.3"
-    "@envelop/instruments": "npm:^1.0.0"
+    "@envelop/instrumentation": "npm:^1.0.0"
     "@graphql-mesh/cross-helpers": "npm:^0.4.10"
     "@graphql-mesh/string-interpolation": "npm:^0.5.8"
     "@graphql-mesh/types": "npm:^0.104.0"