Hive Logger

.changeset/@graphql-hive_gateway-1030-dependencies.md

@@ -0,0 +1,7 @@
+---
+'@graphql-hive/gateway': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)

.changeset/@graphql-hive_gateway-runtime-1030-dependencies.md

@@ -0,0 +1,9 @@
+---
+'@graphql-hive/gateway-runtime': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@envelop/instrumentation@^1.0.0` ↗︎](https://www.npmjs.com/package/@envelop/instrumentation/v/1.0.0) (to `dependencies`)
+- Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)
+- Removed dependency [`@graphql-hive/logger-json@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger-json/v/workspace:^) (from `dependencies`)

.changeset/@graphql-mesh_fusion-runtime-1030-dependencies.md

@@ -0,0 +1,7 @@
+---
+'@graphql-mesh/fusion-runtime': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)

.changeset/@graphql-mesh_plugin-prometheus-1030-dependencies.md

@@ -0,0 +1,7 @@
+---
+'@graphql-mesh/plugin-prometheus': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)

.changeset/@graphql-mesh_transport-common-1030-dependencies.md

@@ -0,0 +1,7 @@
+---
+'@graphql-mesh/transport-common': patch
+---
+
+dependencies updates: 
+
+- Added dependency [`@graphql-hive/logger@workspace:^` ↗︎](https://www.npmjs.com/package/@graphql-hive/logger/v/workspace:^) (to `dependencies`)

.changeset/itchy-ways-cross.md

@@ -0,0 +1,19 @@
+---
+'@graphql-mesh/hmac-upstream-signature': major
+'@graphql-mesh/transport-http-callback': major
+'@graphql-mesh/plugin-opentelemetry': major
+'@graphql-mesh/plugin-prometheus': major
+'@graphql-mesh/transport-common': major
+'@graphql-mesh/plugin-jwt-auth': major
+'@graphql-mesh/fusion-runtime': major
+'@graphql-mesh/transport-ws': major
+'@graphql-hive/gateway': major
+'@graphql-hive/gateway-runtime': major
+'@graphql-hive/nestjs': major
+---
+
+Introduce and use the new Hive Logger
+
+- [Read more about it on the Hive Logger documentation here.](https://the-guild.dev/graphql/hive/docs/logger)
+
+- If coming from Hive Gateway v1, [read the migration guide here.](https://the-guild.dev/graphql/hive/docs/migration-guides/gateway-v1-v2)

.changeset/tough-elephants-shop.md

@@ -0,0 +1,7 @@
+---
+'@graphql-hive/logger': major
+---
+
+Introducing Hive Logger
+
+[Read more about it on the Hive Logger documentation website.](https://the-guild.dev/graphql/hive/docs/logger)

babel.config.cjs

@@ -11,5 +11,6 @@ module.exports = {
     ['@babel/plugin-proposal-decorators', { version: '2023-11' }],
     '@babel/plugin-transform-class-properties',
     '@babel/plugin-proposal-explicit-resource-management',
+    '@babel/plugin-transform-private-methods',
   ],
 };

e2e/config-syntax-error/config-syntax-error.e2e.ts

@@ -31,8 +31,8 @@ it.skipIf(
       }),
     ).rejects.toThrowError(
       gatewayRunner === 'bun' || gatewayRunner === 'bun-docker'
-        ? /error: Expected "{" but found "hello"(.|\n)*\/custom-resolvers.ts:8:11/
-        : /SyntaxError \[Error\]: Error transforming .*(\/|\\)custom-resolvers.ts: Unexpected token, expected "{" \(8:11\)/,
+        ? /Expected \\"{\\" but found \\"hello\\"(.|\n)*\/custom-resolvers.ts/
+        : /Error transforming .*(\/|\\)custom-resolvers.ts: Unexpected token, expected \\"{\\" \(8:11\)/,
     );
   },
 );

e2e/graphos-polling/services/gateway-fastify.ts

@@ -1,5 +1,5 @@
-import { createGatewayRuntime } from '@graphql-hive/gateway-runtime';
-import { createLoggerFromPino } from '@graphql-hive/logger-pino';
+import { createGatewayRuntime, Logger } from '@graphql-hive/gateway-runtime';
+import { PinoLogWriter } from '@graphql-hive/logger/writers/pino';
 import {
   createOtlpHttpExporter,
   useOpenTelemetry,
@@ -43,8 +43,7 @@ export interface FastifyContext {
 }
 
 const gw = createGatewayRuntime<FastifyContext>({
-  // Integrate Fastify's logger / Pino with the gateway logger
-  logging: createLoggerFromPino(app.log),
+  logging: new Logger({ writers: [new PinoLogWriter(app.log)] }),
   // Align with Fastify
   requestId: {
     // Use the same header name as Fastify

e2e/hmac-auth-https/package.json

@@ -9,6 +9,7 @@
     "@apollo/server": "^4.12.2",
     "@apollo/subgraph": "^2.11.0",
     "@graphql-hive/gateway": "workspace:^",
+    "@graphql-hive/logger": "workspace:^",
     "@graphql-mesh/compose-cli": "^1.4.1",
     "@graphql-mesh/hmac-upstream-signature": "workspace:^",
     "@graphql-mesh/plugin-jwt-auth": "workspace:^",

e2e/hmac-auth-https/services/users/index.ts

@@ -2,6 +2,7 @@ import { readFileSync } from 'fs';
 import { createServer } from 'https';
 import { join } from 'path';
 import { buildSubgraphSchema } from '@apollo/subgraph';
+import { Logger } from '@graphql-hive/logger';
 import { useHmacSignatureValidation } from '@graphql-mesh/hmac-upstream-signature';
 import {
   JWTExtendContextFields,
@@ -20,6 +21,7 @@ const yoga = createYoga({
   logging: true,
   plugins: [
     useHmacSignatureValidation({
+      log: new Logger({ level: 'debug' }),
       secret: 'HMAC_SIGNING_SECRET',
     }),
     useForwardedJWT({}),

e2e/retry-timeout/gateway.config.ts

@@ -6,13 +6,13 @@ export const gatewayConfig = defineConfig({
     maxRetries: 4,
   },
   upstreamTimeout: 300,
-  plugins(ctx) {
+  plugins() {
     return [
       ...(process.env['DEDUPLICATE_REQUEST'] ? [useDeduplicateRequest()] : []),
       {
-        onFetch() {
+        onFetch({ context }) {
           i++;
-          ctx.logger.info(`[FETCHING] #${i}`);
+          context.log.info(`[FETCHING] #${i}`);
         },
       },
     ];

e2e/supergraph-file-watcher/supergraph-file-watcher.e2e.ts

@@ -45,7 +45,7 @@ it('should detect supergraph file change and reload schema', async () => {
   for (;;) {
     timeout.throwIfAborted();
     await setTimeout(100);
-    if (gw.getStd('both').match(/invalidating supergraph/i)) {
+    if (gw.getStd('both').match(/supergraph changed/i)) {
       break;
     }
   }

examples/hmac-auth-https/package.json

@@ -13,6 +13,7 @@
     "@apollo/server": "^4.12.2",
     "@apollo/subgraph": "^2.11.0",
     "@graphql-hive/gateway": "^1.15.0",
+    "@graphql-hive/logger": "^0.0.0",
     "@graphql-mesh/compose-cli": "^1.4.1",
     "@graphql-mesh/hmac-upstream-signature": "^1.2.27",
     "@graphql-mesh/plugin-jwt-auth": "^1.5.5",

examples/hmac-auth-https/services/users/index.ts

@@ -2,6 +2,7 @@ import { readFileSync } from 'fs';
 import { createServer } from 'https';
 import { join } from 'path';
 import { buildSubgraphSchema } from '@apollo/subgraph';
+import { Logger } from '@graphql-hive/logger';
 import { useHmacSignatureValidation } from '@graphql-mesh/hmac-upstream-signature';
 import {
   JWTExtendContextFields,
@@ -19,6 +20,7 @@ const yoga = createYoga({
   logging: true,
   plugins: [
     useHmacSignatureValidation({
+      log: new Logger({ level: 'debug' }),
       secret: 'HMAC_SIGNING_SECRET',
     }),
     useForwardedJWT({}),

package.json

@@ -32,6 +32,7 @@
     "@babel/plugin-proposal-explicit-resource-management": "7.27.4",
     "@babel/plugin-transform-class-properties": "7.27.1",
     "@babel/plugin-transform-class-static-block": "7.27.1",
+    "@babel/plugin-transform-private-methods": "^7.27.1",
     "@babel/preset-env": "7.27.2",
     "@babel/preset-typescript": "7.27.1",
     "@changesets/changelog-github": "^0.5.0",

packages/delegate/src/finalizeGatewayRequest.ts

@@ -562,9 +562,6 @@ function finalizeSelectionSet(
         leave: (node) => {
           const type = typeInfo.getType();
           if (type == null) {
-            // console.warn(
-            //   `Invalid type for node: ${typeInfo.getParentType()?.name}.${node.name.value}`,
-            // );
             return null;
           }
           const namedType = getNamedType(type);

packages/fusion-runtime/package.json

@@ -45,6 +45,7 @@
   "dependencies": {
     "@envelop/core": "^5.2.3",
     "@envelop/instrumentation": "^1.0.0",
+    "@graphql-hive/logger": "workspace:^",
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/transport-common": "workspace:^",
     "@graphql-mesh/types": "^0.104.0",

packages/fusion-runtime/src/executor.ts

@@ -34,7 +34,7 @@ export function getExecutorForUnifiedGraph<TContext>(
       () => unifiedGraphManager.getContext(execReq.context),
       (context) => {
         function handleExecutor(executor: Executor) {
-          opts?.transportContext?.logger?.debug(
+          opts?.transportContext?.log.debug(
             'Executing request on unified graph',
             () => print(execReq.document),
           );
@@ -50,7 +50,7 @@ export function getExecutorForUnifiedGraph<TContext>(
               return handleMaybePromise(
                 () => unifiedGraphManager.getUnifiedGraph(),
                 (unifiedGraph) => {
-                  opts?.transportContext?.logger?.debug(
+                  opts?.transportContext?.log.debug(
                     'Executing request on unified graph',
                     () => print(execReq.document),
                   );
@@ -70,9 +70,7 @@ export function getExecutorForUnifiedGraph<TContext>(
     enumerable: true,
     get() {
       return function unifiedGraphExecutorDispose() {
-        opts?.transportContext?.logger?.debug(
-          'Disposing unified graph executor',
-        );
+        opts?.transportContext?.log.debug('Disposing unified graph executor');
         return unifiedGraphManager[DisposableSymbols.asyncDispose]();
       };
     },

packages/fusion-runtime/src/federation/supergraph.ts

@@ -1,7 +1,7 @@
+import { LegacyLogger, Logger } from '@graphql-hive/logger';
 import type { YamlConfig } from '@graphql-mesh/types';
 import {
   getInContextSDK,
-  requestIdByRequest,
   resolveAdditionalResolversWithoutImport,
 } from '@graphql-mesh/utils';
 import type {
@@ -158,7 +158,8 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
   onDelegateHooks,
   additionalTypeDefs: additionalTypeDefsFromConfig = [],
   additionalResolvers: additionalResolversFromConfig = [],
-  logger,
+  // no logger was provided, use a muted logger for consistency across plugin hooks
+  log: rootLog = new Logger({ level: false }),
 }: UnifiedGraphHandlerOpts): UnifiedGraphHandlerResult {
   const additionalTypeDefs = [...asArray(additionalTypeDefsFromConfig)];
   const additionalResolvers = [...asArray(additionalResolversFromConfig)];
@@ -230,7 +231,7 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
                     originalResolver,
                     typeName,
                     onDelegationStageExecuteHooks,
-                    logger,
+                    rootLog,
                   );
                 }
               }
@@ -278,7 +279,7 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
     executableUnifiedGraph,
     // @ts-expect-error Legacy Mesh RawSource is not compatible with new Mesh
     subschemas,
-    logger,
+    LegacyLogger.from(rootLog),
     onDelegateHooks || [],
   );
   const stitchingInfo = executableUnifiedGraph.extensions?.[
@@ -306,16 +307,9 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
             delegationPlanBuilder = newDelegationPlanBuilder;
           }
           const onDelegationPlanDoneHooks: OnDelegationPlanDoneHook[] = [];
-          let currentLogger = logger;
-          let requestId: string | undefined;
-          if (context?.request) {
-            requestId = requestIdByRequest.get(context.request);
-            if (requestId) {
-              currentLogger = currentLogger?.child({ requestId });
-            }
-          }
+          let log = context.log as Logger;
           if (sourceSubschema.name) {
-            currentLogger = currentLogger?.child({
+            log = log.child({
               subgraph: sourceSubschema.name,
             });
           }
@@ -328,7 +322,7 @@ export const handleFederationSupergraph: UnifiedGraphHandler = function ({
               variables,
               fragments,
               fieldNodes,
-              logger: currentLogger,
+              log,
               context,
               info,
               delegationPlanBuilder,