@graphql-hive/gateway 2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172 → 2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/gateway
 
-## 2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
+## 2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
 
 ### Major Changes
 
@@ -75,19 +75,19 @@
   - Removed dependency [`@graphql-mesh/plugin-mock@^0.105.6` ↗︎](https://www.npmjs.com/package/@graphql-mesh/plugin-mock/v/0.105.6) (from `dependencies`)
 
 - Updated dependencies [[`95484c2`](https://github.com/graphql-hive/gateway/commit/95484c2ca0cea1cd732df4bfe8ce45032ec31d42), [`7dafdeb`](https://github.com/graphql-hive/gateway/commit/7dafdebc803e49373fe9d53997113483e512fdb0), [`6215001`](https://github.com/graphql-hive/gateway/commit/6215001b1d650ad865331661532bcc4f7bad6b40), [`f12f2b7`](https://github.com/graphql-hive/gateway/commit/f12f2b78163fbef797a42b5999a0b5a8ef6b2c98), [`8b7db06`](https://github.com/graphql-hive/gateway/commit/8b7db06887f5dec52d380bfc123dbf495cbe04ef), [`6215001`](https://github.com/graphql-hive/gateway/commit/6215001b1d650ad865331661532bcc4f7bad6b40), [`7dafdeb`](https://github.com/graphql-hive/gateway/commit/7dafdebc803e49373fe9d53997113483e512fdb0), [`9e4d81c`](https://github.com/graphql-hive/gateway/commit/9e4d81c2ad9e99d2195e3f2a021a30a9312cf980), [`f3caa12`](https://github.com/graphql-hive/gateway/commit/f3caa12a7ad50cdc03c82f2336f820e8ccbad55e), [`1ba0cf4`](https://github.com/graphql-hive/gateway/commit/1ba0cf4a6359e41a6ab16f940d8733d3ad9d800b), [`dfe6f58`](https://github.com/graphql-hive/gateway/commit/dfe6f58209afd27953676c5b51b8b9f07fc99671), [`ceb07a6`](https://github.com/graphql-hive/gateway/commit/ceb07a61f6f1c7ca345df2c23860950e5152288e), [`732c6f5`](https://github.com/graphql-hive/gateway/commit/732c6f5c82fdf6b730109fbc7c05c69da8ce6fb4), [`95484c2`](https://github.com/graphql-hive/gateway/commit/95484c2ca0cea1cd732df4bfe8ce45032ec31d42), [`7dafdeb`](https://github.com/graphql-hive/gateway/commit/7dafdebc803e49373fe9d53997113483e512fdb0), [`8b7db06`](https://github.com/graphql-hive/gateway/commit/8b7db06887f5dec52d380bfc123dbf495cbe04ef), [`6215001`](https://github.com/graphql-hive/gateway/commit/6215001b1d650ad865331661532bcc4f7bad6b40), [`cd9b7ce`](https://github.com/graphql-hive/gateway/commit/cd9b7ce551ec702c00b33e6c1b2cf68f0a6c82a3), [`95484c2`](https://github.com/graphql-hive/gateway/commit/95484c2ca0cea1cd732df4bfe8ce45032ec31d42), [`f052709`](https://github.com/graphql-hive/gateway/commit/f0527092e4942b4c97cb3272266f93f3200fac98), [`9bee8e9`](https://github.com/graphql-hive/gateway/commit/9bee8e9ff165c43591c0b20637b6d1f2a2cb9cc2), [`9b230f3`](https://github.com/graphql-hive/gateway/commit/9b230f35b47afbf3b253e4c21720e836c5a2a8d1), [`10a5887`](https://github.com/graphql-hive/gateway/commit/10a58873acde8734f05dfda455fe7b366861676b), [`2a56e5f`](https://github.com/graphql-hive/gateway/commit/2a56e5fd5a07f6784e8c2d0ad767d8c55710ada4), [`ae37c4a`](https://github.com/graphql-hive/gateway/commit/ae37c4a4189e3ea20f2ce0d24e2509d2053eb244), [`732c6f5`](https://github.com/graphql-hive/gateway/commit/732c6f5c82fdf6b730109fbc7c05c69da8ce6fb4), [`95484c2`](https://github.com/graphql-hive/gateway/commit/95484c2ca0cea1cd732df4bfe8ce45032ec31d42), [`dbb4fd9`](https://github.com/graphql-hive/gateway/commit/dbb4fd9287ff872de5cc9f18546987bd71232df5)]:
-  - @graphql-hive/gateway-runtime@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-hive/plugin-aws-sigv4@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/transport-ws@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-hive/plugin-deduplicate-request@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/transport-http-callback@1.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-mesh/transport-http@1.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-hive/importer@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-hive/pubsub@2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
-  - @graphql-hive/logger@1.0.1-alpha-b02daead998ce12ffde320b956dc6d8d1a199172
+  - @graphql-hive/gateway-runtime@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-hive/plugin-aws-sigv4@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/transport-ws@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-hive/plugin-deduplicate-request@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/transport-http-callback@1.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-mesh/transport-http@1.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-hive/importer@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-hive/pubsub@2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
+  - @graphql-hive/logger@1.0.1-alpha-d94711dad9603bf7cee45770805e1d9026d17e52
 
 ## 1.15.4
 

package/dist/bin.cjs

@@ -3,7 +3,7 @@
 require('dotenv/config');
 var module$1 = require('node:module');
 var logger = require('@graphql-hive/logger');
-var cli = require('./cli-DewWk4WC.cjs');
+var cli = require('./cli-CQdLYWjW.cjs');
 require('node:cluster');
 require('node:os');
 require('node:path');
@@ -17,8 +17,8 @@ require('node:url');
 require('node:fs');
 require('node:http');
 require('node:https');
-require('@opentelemetry/sdk-trace-base');
 require('@graphql-tools/utils');
+require('@opentelemetry/sdk-trace-base');
 require('@graphql-tools/code-file-loader');
 require('@graphql-tools/graphql-file-loader');
 require('@graphql-tools/load');

package/dist/bin.js

@@ -2,7 +2,7 @@
 import 'dotenv/config';
 import module from 'node:module';
 import { Logger } from '@graphql-hive/logger';
-import { e as enableModuleCachingIfPossible, h as handleNodeWarnings, r as run } from './cli-w5oUkqGz.js';
+import { e as enableModuleCachingIfPossible, h as handleNodeWarnings, r as run } from './cli-C8SAeNPg.js';
 import 'node:cluster';
 import 'node:os';
 import 'node:path';
@@ -16,8 +16,8 @@ import 'node:url';
 import 'node:fs';
 import 'node:http';
 import 'node:https';
-import '@opentelemetry/sdk-trace-base';
 import '@graphql-tools/utils';
+import '@opentelemetry/sdk-trace-base';
 import '@graphql-tools/code-file-loader';
 import '@graphql-tools/graphql-file-loader';
 import '@graphql-tools/load';

package/dist/{cli-w5oUkqGz.js → cli-C8SAeNPg.js}

@@ -13,8 +13,8 @@ import { pathToFileURL } from 'node:url';
 import { promises } from 'node:fs';
 import { createServer as createServer$1 } from 'node:http';
 import { createServer } from 'node:https';
+import { fakePromise, isValidPath, asArray } from '@graphql-tools/utils';
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base';
-import { isValidPath, asArray } from '@graphql-tools/utils';
 import { CodeFileLoader } from '@graphql-tools/code-file-loader';
 import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader';
 import { loadTypedefs } from '@graphql-tools/load';
@@ -488,40 +488,74 @@ function handleFork(log, config) {
 
 async function handleOpenTelemetryConfig(ctx, cliOpts) {
   const accessToken = cliOpts.hiveTraceAccessToken;
-  const endpoint = cliOpts.hiveTraceEndpoint ?? `https://api.graphql-hive.com/otel/v1/traces`;
+  const traceEndpoint = cliOpts.hiveTraceEndpoint;
   const target = cliOpts.hiveTarget;
   const openTelemetry = cliOpts.openTelemetry;
   const exporterType = cliOpts.openTelemetryExporterType ?? "otlp-http";
-  if (typeof openTelemetry === "string" || accessToken) {
-    const { openTelemetrySetup, HiveTracingSpanProcessor } = await import('@graphql-mesh/plugin-opentelemetry/setup');
-    const processors = [];
-    if (openTelemetry) {
-      const { OTLPTraceExporter } = await import(`@opentelemetry/exporter-trace-${exporterType}`);
-      processors.push(
-        new BatchSpanProcessor(new OTLPTraceExporter({ url: openTelemetry }))
-      );
-    }
-    if (accessToken) {
-      if (!target) {
-        ctx.log.error(
-          'Hive tracing needs a target. Please provide it through "--hive-target <target>"'
+  const log = ctx.log.child("[OpenTelemetry] ");
+  if (openTelemetry || accessToken) {
+    log.debug(
+      { openTelemetry, exporterType, target, traceEndpoint },
+      "Initializing OpenTelemetry SDK"
+    );
+    return fakePromise().then(async () => {
+      const { openTelemetrySetup, HiveTracingSpanProcessor, getEnvVar } = await import('@graphql-mesh/plugin-opentelemetry/setup');
+      const processors = [];
+      const logAttributes = {
+        traceEndpoints: [],
+        contextManager: false
+      };
+      let integrationName;
+      if (openTelemetry) {
+        const otelEndpoint = typeof openTelemetry === "string" ? openTelemetry : getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT", void 0);
+        log.debug({ exporterType, otelEndpoint }, "Setting up OTLP Exporter");
+        integrationName = "OpenTelemetry";
+        logAttributes.traceEndpoints.push({
+          url: otelEndpoint ?? null,
+          type: exporterType
+        });
+        log.debug({ type: exporterType }, "Loading OpenTelemetry exporter");
+        const { OTLPTraceExporter } = await import(`@opentelemetry/exporter-trace-${exporterType}`);
+        processors.push(
+          new BatchSpanProcessor(new OTLPTraceExporter({ url: otelEndpoint }))
         );
-        process.exit(1);
       }
-      ctx.log.debug("Hive tracing is enabled for endpont %s", endpoint);
-      processors.push(
-        new HiveTracingSpanProcessor({
-          accessToken,
-          target,
-          endpoint
-        })
-      );
-    }
-    openTelemetrySetup({
-      traces: { processors },
-      contextManager: await import('@opentelemetry/context-async-hooks').then((module) => new module.AsyncLocalStorageContextManager()).catch(() => null)
+      if (accessToken) {
+        log.debug({ target, traceEndpoint }, "Setting up Hive Tracing");
+        integrationName ??= "Hive Tracing";
+        if (!target) {
+          ctx.log.error(
+            'Hive tracing needs a target. Please provide it through "--hive-target <target>"'
+          );
+          process.exit(1);
+        }
+        logAttributes.traceEndpoints.push({
+          url: traceEndpoint,
+          type: "hive tracing",
+          target
+        });
+        processors.push(
+          new HiveTracingSpanProcessor({
+            accessToken,
+            target,
+            endpoint: traceEndpoint
+          })
+        );
+      }
+      log.debug("Trying to load AsyncLocalStorage based Context Manager");
+      const contextManager = await import('@opentelemetry/context-async-hooks').then((module) => {
+        logAttributes.contextManager = true;
+        return new module.AsyncLocalStorageContextManager();
+      }).catch(() => null);
+      openTelemetrySetup({
+        traces: { processors },
+        contextManager
+      });
+      log.info(logAttributes, `${integrationName} integration is enabled`);
+      return true;
     });
   }
+  return false;
 }
 
 function handleReportingConfig(ctx, loadedConfig, cliOpts) {
@@ -630,7 +664,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -716,7 +750,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -806,7 +840,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -854,7 +888,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -970,7 +1004,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -1088,7 +1122,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -1381,8 +1415,8 @@ let cli = new Command().configureHelp({
 ).addOption(
   new Option(
     "--hive-trace-endpoint <endpoint>",
-    `Hive registry trascing endpoint.`
-  ).env("HIVE_TRACE_ENDPOINT")
+    `Hive registry tracing endpoint.`
+  ).env("HIVE_TRACE_ENDPOINT").default(`https://api.graphql-hive.com/otel/v1/traces`)
 ).option(
   "--hive-persisted-documents-endpoint <endpoint>",
   '[EXPERIMENTAL] Hive CDN endpoint for fetching the persisted documents. Requires the "--hive-persisted-documents-token <token>" option'

package/dist/{cli-DewWk4WC.cjs → cli-CQdLYWjW.cjs}

@@ -15,8 +15,8 @@ var node_url = require('node:url');
 var node_fs = require('node:fs');
 var node_http = require('node:http');
 var node_https = require('node:https');
-var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var utils$1 = require('@graphql-tools/utils');
+var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var codeFileLoader = require('@graphql-tools/code-file-loader');
 var graphqlFileLoader = require('@graphql-tools/graphql-file-loader');
 var load = require('@graphql-tools/load');
@@ -495,40 +495,74 @@ function handleFork(log, config) {
 
 async function handleOpenTelemetryConfig(ctx, cliOpts) {
   const accessToken = cliOpts.hiveTraceAccessToken;
-  const endpoint = cliOpts.hiveTraceEndpoint ?? `https://api.graphql-hive.com/otel/v1/traces`;
+  const traceEndpoint = cliOpts.hiveTraceEndpoint;
   const target = cliOpts.hiveTarget;
   const openTelemetry = cliOpts.openTelemetry;
   const exporterType = cliOpts.openTelemetryExporterType ?? "otlp-http";
-  if (typeof openTelemetry === "string" || accessToken) {
-    const { openTelemetrySetup, HiveTracingSpanProcessor } = await import('@graphql-mesh/plugin-opentelemetry/setup');
-    const processors = [];
-    if (openTelemetry) {
-      const { OTLPTraceExporter } = await import(`@opentelemetry/exporter-trace-${exporterType}`);
-      processors.push(
-        new sdkTraceBase.BatchSpanProcessor(new OTLPTraceExporter({ url: openTelemetry }))
-      );
-    }
-    if (accessToken) {
-      if (!target) {
-        ctx.log.error(
-          'Hive tracing needs a target. Please provide it through "--hive-target <target>"'
+  const log = ctx.log.child("[OpenTelemetry] ");
+  if (openTelemetry || accessToken) {
+    log.debug(
+      { openTelemetry, exporterType, target, traceEndpoint },
+      "Initializing OpenTelemetry SDK"
+    );
+    return utils$1.fakePromise().then(async () => {
+      const { openTelemetrySetup, HiveTracingSpanProcessor, getEnvVar } = await import('@graphql-mesh/plugin-opentelemetry/setup');
+      const processors = [];
+      const logAttributes = {
+        traceEndpoints: [],
+        contextManager: false
+      };
+      let integrationName;
+      if (openTelemetry) {
+        const otelEndpoint = typeof openTelemetry === "string" ? openTelemetry : getEnvVar("OTEL_EXPORTER_OTLP_ENDPOINT", void 0);
+        log.debug({ exporterType, otelEndpoint }, "Setting up OTLP Exporter");
+        integrationName = "OpenTelemetry";
+        logAttributes.traceEndpoints.push({
+          url: otelEndpoint ?? null,
+          type: exporterType
+        });
+        log.debug({ type: exporterType }, "Loading OpenTelemetry exporter");
+        const { OTLPTraceExporter } = await import(`@opentelemetry/exporter-trace-${exporterType}`);
+        processors.push(
+          new sdkTraceBase.BatchSpanProcessor(new OTLPTraceExporter({ url: otelEndpoint }))
         );
-        process.exit(1);
       }
-      ctx.log.debug("Hive tracing is enabled for endpont %s", endpoint);
-      processors.push(
-        new HiveTracingSpanProcessor({
-          accessToken,
-          target,
-          endpoint
-        })
-      );
-    }
-    openTelemetrySetup({
-      traces: { processors },
-      contextManager: await import('@opentelemetry/context-async-hooks').then((module) => new module.AsyncLocalStorageContextManager()).catch(() => null)
+      if (accessToken) {
+        log.debug({ target, traceEndpoint }, "Setting up Hive Tracing");
+        integrationName ??= "Hive Tracing";
+        if (!target) {
+          ctx.log.error(
+            'Hive tracing needs a target. Please provide it through "--hive-target <target>"'
+          );
+          process.exit(1);
+        }
+        logAttributes.traceEndpoints.push({
+          url: traceEndpoint,
+          type: "hive tracing",
+          target
+        });
+        processors.push(
+          new HiveTracingSpanProcessor({
+            accessToken,
+            target,
+            endpoint: traceEndpoint
+          })
+        );
+      }
+      log.debug("Trying to load AsyncLocalStorage based Context Manager");
+      const contextManager = await import('@opentelemetry/context-async-hooks').then((module) => {
+        logAttributes.contextManager = true;
+        return new module.AsyncLocalStorageContextManager();
+      }).catch(() => null);
+      openTelemetrySetup({
+        traces: { processors },
+        contextManager
+      });
+      log.info(logAttributes, `${integrationName} integration is enabled`);
+      return true;
     });
   }
+  return false;
 }
 
 function handleReportingConfig(ctx, loadedConfig, cliOpts) {
@@ -637,7 +671,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -723,7 +757,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -813,7 +847,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -861,7 +895,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -977,7 +1011,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
-  await handleOpenTelemetryConfig(ctx, {
+  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
     openTelemetry: opentelemetry,
     openTelemetryExporterType: opentelemetryExporterType,
     hiveTarget,
@@ -1095,7 +1129,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
     {
       ...loadedConfig,
       ...opts,
-      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -1388,8 +1422,8 @@ let cli = new extraTypings.Command().configureHelp({
 ).addOption(
   new extraTypings.Option(
     "--hive-trace-endpoint <endpoint>",
-    `Hive registry trascing endpoint.`
-  ).env("HIVE_TRACE_ENDPOINT")
+    `Hive registry tracing endpoint.`
+  ).env("HIVE_TRACE_ENDPOINT").default(`https://api.graphql-hive.com/otel/v1/traces`)
 ).option(
   "--hive-persisted-documents-endpoint <endpoint>",
   '[EXPERIMENTAL] Hive CDN endpoint for fetching the persisted documents. Requires the "--hive-persisted-documents-token <token>" option'

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var cli = require('./cli-DewWk4WC.cjs');
+var cli = require('./cli-CQdLYWjW.cjs');
 var logger = require('@graphql-hive/logger');
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var pubsub = require('@graphql-hive/pubsub');
@@ -30,8 +30,8 @@ require('node:url');
 require('node:fs');
 require('node:http');
 require('node:https');
-require('@opentelemetry/sdk-trace-base');
 require('@graphql-tools/utils');
+require('@opentelemetry/sdk-trace-base');
 require('@graphql-tools/code-file-loader');
 require('@graphql-tools/graphql-file-loader');
 require('@graphql-tools/load');

package/dist/index.d.cts

@@ -276,7 +276,7 @@ declare let cli: Command<[], {
     hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
     hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint?: string | undefined;
+    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;
@@ -301,7 +301,7 @@ declare function run(userCtx: Partial<CLIContext>): Promise<Command<[], {
     hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
     hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint?: string | undefined;
+    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;

package/dist/index.d.ts

@@ -276,7 +276,7 @@ declare let cli: Command<[], {
     hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
     hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint?: string | undefined;
+    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;
@@ -301,7 +301,7 @@ declare function run(userCtx: Partial<CLIContext>): Promise<Command<[], {
     hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
     hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint?: string | undefined;
+    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;

package/dist/index.js

@@ -1,4 +1,4 @@
-export { b as defaultOptions, d as defineConfig, e as enableModuleCachingIfPossible, a as getBuiltinPluginsFromConfig, g as getCacheInstanceFromConfig, h as handleNodeWarnings, r as run } from './cli-w5oUkqGz.js';
+export { b as defaultOptions, d as defineConfig, e as enableModuleCachingIfPossible, a as getBuiltinPluginsFromConfig, g as getCacheInstanceFromConfig, h as handleNodeWarnings, r as run } from './cli-C8SAeNPg.js';
 export * from '@graphql-hive/logger';
 export * from '@graphql-hive/gateway-runtime';
 export { PubSub } from '@graphql-hive/pubsub';
@@ -29,8 +29,8 @@ import 'node:url';
 import 'node:fs';
 import 'node:http';
 import 'node:https';
-import '@opentelemetry/sdk-trace-base';
 import '@graphql-tools/utils';
+import '@opentelemetry/sdk-trace-base';
 import '@graphql-tools/code-file-loader';
 import '@graphql-tools/graphql-file-loader';
 import '@graphql-tools/load';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/gateway",
-  "version": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+  "version": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
   "type": "module",
   "repository": {
     "type": "git",
@@ -53,28 +53,28 @@
     "@escape.tech/graphql-armor-block-field-suggestions": "^3.0.0",
     "@escape.tech/graphql-armor-max-depth": "^2.4.0",
     "@escape.tech/graphql-armor-max-tokens": "^2.5.0",
-    "@graphql-hive/gateway-runtime": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-hive/importer": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-hive/logger": "1.0.1-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-hive/plugin-aws-sigv4": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-hive/plugin-deduplicate-request": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-hive/pubsub": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+    "@graphql-hive/gateway-runtime": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-hive/importer": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-hive/logger": "1.0.1-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-hive/plugin-aws-sigv4": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-hive/plugin-deduplicate-request": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-hive/pubsub": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
     "@graphql-mesh/cache-cfw-kv": "^0.105.5",
     "@graphql-mesh/cache-localforage": "^0.105.6",
     "@graphql-mesh/cache-redis": "^0.104.5",
     "@graphql-mesh/cache-upstash-redis": "^0.1.5",
     "@graphql-mesh/cross-helpers": "^0.4.10",
-    "@graphql-mesh/hmac-upstream-signature": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+    "@graphql-mesh/hmac-upstream-signature": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
     "@graphql-mesh/plugin-http-cache": "^0.105.6",
     "@graphql-mesh/plugin-jit": "^0.2.5",
-    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
     "@graphql-mesh/plugin-rate-limit": "^0.104.5",
     "@graphql-mesh/plugin-snapshot": "^0.104.5",
-    "@graphql-mesh/transport-http": "1.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
-    "@graphql-mesh/transport-ws": "2.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+    "@graphql-mesh/transport-http": "1.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
+    "@graphql-mesh/transport-ws": "2.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
     "@graphql-mesh/types": "^0.104.5",
     "@graphql-mesh/utils": "^0.104.5",
     "@graphql-tools/code-file-loader": "^8.1.15",
@@ -103,7 +103,7 @@
     "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@graphql-mesh/transport-common": "1.0.0-alpha-b02daead998ce12ffde320b956dc6d8d1a199172",
+    "@graphql-mesh/transport-common": "1.0.0-alpha-d94711dad9603bf7cee45770805e1d9026d17e52",
     "@graphql-mesh/transport-soap": "^0.10.6",
     "@graphql-tools/executor": "^1.4.7",
     "@rollup/plugin-commonjs": "^28.0.0",