@graphql-hive/gateway 2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505 → 2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/gateway
 
-## 2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
+## 2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
 
 ### Major Changes
 
@@ -44,10 +44,6 @@
   - Added dependency [`@opentelemetry/api-logs@^0.202.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/api-logs/v/0.202.0) (to `dependencies`)
   - Added dependency [`@opentelemetry/sdk-logs@^0.202.0` ↗︎](https://www.npmjs.com/package/@opentelemetry/sdk-logs/v/0.202.0) (to `dependencies`)
 
-- [#1300](https://github.com/graphql-hive/gateway/pull/1300) [`1ba0cf4`](https://github.com/graphql-hive/gateway/commit/1ba0cf4a6359e41a6ab16f940d8733d3ad9d800b) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - dependencies updates:
-  - Added dependency [`@opentelemetry/context-async-hooks@^2.0.1` ↗︎](https://www.npmjs.com/package/@opentelemetry/context-async-hooks/v/2.0.1) (to `dependencies`)
-  - Added dependency [`@opentelemetry/sdk-trace-base@^2.0.1` ↗︎](https://www.npmjs.com/package/@opentelemetry/sdk-trace-base/v/2.0.1) (to `dependencies`)
-
 - [#1318](https://github.com/graphql-hive/gateway/pull/1318) [`7dafdeb`](https://github.com/graphql-hive/gateway/commit/7dafdebc803e49373fe9d53997113483e512fdb0) Thanks [@enisdenjo](https://github.com/enisdenjo)! - dependencies updates:
   - Updated dependency [`@graphql-yoga/render-graphiql@^5.15.1` ↗︎](https://www.npmjs.com/package/@graphql-yoga/render-graphiql/v/5.15.1) (from `^5.13.5`, in `dependencies`)
   - Updated dependency [`graphql-yoga@^5.15.1` ↗︎](https://www.npmjs.com/package/graphql-yoga/v/5.15.1) (from `^5.13.5`, in `dependencies`)
@@ -74,20 +70,20 @@
   - Added dependency [`@opentelemetry/sdk-metrics@^2.0.1` ↗︎](https://www.npmjs.com/package/@opentelemetry/sdk-metrics/v/2.0.1) (to `dependencies`)
   - 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-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-hive/plugin-aws-sigv4@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/transport-ws@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-hive/plugin-deduplicate-request@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/transport-http-callback@1.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-mesh/transport-http@1.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-hive/importer@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-hive/pubsub@2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
-  - @graphql-hive/logger@1.0.1-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505
+- 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), [`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), [`2f0d8ad`](https://github.com/graphql-hive/gateway/commit/2f0d8ad6467b44aa072d2b5a0102ed255462c05a), [`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), [`2f0d8ad`](https://github.com/graphql-hive/gateway/commit/2f0d8ad6467b44aa072d2b5a0102ed255462c05a), [`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-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-hive/plugin-aws-sigv4@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/plugin-jwt-auth@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/plugin-opentelemetry@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/plugin-prometheus@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/transport-ws@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/hmac-upstream-signature@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-hive/plugin-deduplicate-request@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/transport-http-callback@1.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-mesh/transport-http@1.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-hive/importer@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-hive/pubsub@2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
+  - @graphql-hive/logger@1.0.1-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5
 
 ## 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-CQdLYWjW.cjs');
+var cli = require('./cli-BQ10GobO.cjs');
 require('node:cluster');
 require('node:os');
 require('node:path');
@@ -18,7 +18,6 @@ require('node:fs');
 require('node:http');
 require('node:https');
 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-C8SAeNPg.js';
+import { e as enableModuleCachingIfPossible, h as handleNodeWarnings, r as run } from './cli-CpJrCTMy.js';
 import 'node:cluster';
 import 'node:os';
 import 'node:path';
@@ -17,7 +17,6 @@ import 'node:fs';
 import 'node:http';
 import 'node:https';
 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-CQdLYWjW.cjs → cli-BQ10GobO.cjs}

@@ -16,7 +16,6 @@ var node_fs = require('node:fs');
 var node_http = require('node:http');
 var node_https = require('node:https');
 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');
@@ -493,83 +492,11 @@ function handleFork(log, config) {
   return false;
 }
 
-async function handleOpenTelemetryConfig(ctx, cliOpts) {
-  const accessToken = cliOpts.hiveTraceAccessToken;
-  const traceEndpoint = cliOpts.hiveTraceEndpoint;
-  const target = cliOpts.hiveTarget;
-  const openTelemetry = cliOpts.openTelemetry;
-  const exporterType = cliOpts.openTelemetryExporterType ?? "otlp-http";
-  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 }))
-        );
-      }
-      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) {
   const confOpts = {
     ...loadedConfig.reporting?.type === "hive" ? {
       hiveRegistryToken: loadedConfig.reporting.token,
-      hiveTarget: loadedConfig.reporting.target,
+      hiveUsageTarget: loadedConfig.reporting.target,
       hiveUsageAccessToken: loadedConfig.reporting.token
     } : {},
     ...loadedConfig.reporting?.type === "graphos" ? {
@@ -577,45 +504,32 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       apolloKey: loadedConfig.reporting.apiKey
     } : {}
   };
-  const opts = {
-    ...confOpts,
-    ...cliOpts,
-    hiveTarget: (
-      // cli arguments always take precedence over config
-      confOpts.hiveTarget ?? cliOpts.hiveTarget ?? cliOpts.hiveUsageTarget
-    )
-  };
+  const opts = { ...confOpts, ...cliOpts };
   if (cliOpts.hiveRegistryToken && cliOpts.hiveUsageAccessToken) {
     ctx.log.error(
       'Cannot use "--hive-registry-token" with "--hive-usage-access-token". Please use "--hive-usage-target" and "--hive-usage-access-token" or the config instead.'
     );
     process.exit(1);
   }
-  if (cliOpts.hiveUsageTarget && cliOpts.hiveTarget) {
-    ctx.log.error(
-      'Cannot use "--hive-usage-target" with "--hive-target". Please only use "--hive-target"'
-    );
-    process.exit(1);
-  }
-  if (cliOpts.hiveRegistryToken && opts.hiveTarget) {
+  if (cliOpts.hiveRegistryToken && opts.hiveUsageTarget) {
     ctx.log.error(
       'Cannot use "--hive-registry-token" with a target. Please use "--hive-usage-target" and "--hive-usage-access-token" or the config instead.'
     );
     process.exit(1);
   }
-  if (opts.hiveTarget && !opts.hiveAccessToken && !opts.hiveUsageAccessToken && !opts.hiveTraceAccessToken) {
+  if (opts.hiveUsageTarget && !opts.hiveUsageAccessToken) {
     ctx.log.error(
-      'Hive usage target needs an access token. Please provide it through "--hive-access-token <token>", or specific "--hive-usage-access-token <token>" and "--hive-trace-access-token" options, or the config.'
+      'Hive usage target needs an access token. Please provide it through the "--hive-usage-access-token <token>" option or the config.'
     );
     process.exit(1);
   }
-  if ((opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveTraceAccessToken) && !opts.hiveTarget) {
+  if (opts.hiveUsageAccessToken && !opts.hiveUsageTarget) {
     ctx.log.error(
-      'Hive access token needs a target. Please provide it through the "--hive-target <target>" option or the config.'
+      'Hive usage access token needs a target. Please provide it through the "--hive-usage-target <target>" option or the config.'
     );
     process.exit(1);
   }
-  const hiveUsageAccessToken = opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveRegistryToken;
+  const hiveUsageAccessToken = opts.hiveUsageAccessToken || opts.hiveRegistryToken;
   if (hiveUsageAccessToken) {
     if (opts.hiveUsageTarget) {
       ctx.log.info("Configuring Hive usage reporting");
@@ -626,7 +540,7 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       ...loadedConfig.reporting,
       type: "hive",
       token: hiveUsageAccessToken,
-      target: opts.hiveTarget
+      target: opts.hiveUsageTarget
     };
   }
   if (opts.apolloKey) {
@@ -654,30 +568,17 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   "path to the GraphQL schema file or a url from where to pull the schema"
 ).action(async function proxy(endpoint) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     hiveCdnEndpoint,
     hiveCdnKey,
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     maskedErrors,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -731,11 +632,8 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
     // proxy can only do reporting to hive registry
     apolloGraphRef: void 0,
     apolloKey: void 0
@@ -756,8 +654,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -832,28 +729,15 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   'path to the subgraph schema file or a url from where to pull the subgraph schema (default: "subgraph.graphql")'
 ).action(async function subgraph(schemaPathOrUrl) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     maskedErrors,
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -869,11 +753,8 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
     // subgraph can only do reporting to hive registry
     apolloGraphRef: void 0,
     apolloKey: void 0
@@ -894,8 +775,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -989,17 +869,11 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ).env("APOLLO_SCHEMA_CONFIG_DELIVERY_ENDPOINT")
 ).action(async function supergraph(schemaPathOrUrl) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     hiveCdnEndpoint,
     hiveCdnKey,
     hiveRegistryToken,
     hiveUsageTarget,
-    hiveTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     maskedErrors,
     apolloGraphRef,
     apolloKey,
@@ -1011,13 +885,6 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -1103,9 +970,6 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
-    hiveTarget,
-    hiveAccessToken,
-    hiveTraceAccessToken,
     hiveRegistryToken,
     hiveUsageTarget,
     hiveUsageAccessToken,
@@ -1128,8 +992,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -1379,57 +1242,27 @@ let cli = new extraTypings.Command().configureHelp({
   // see here https://github.com/tj/commander.js/blob/970ecae402b253de691e6a9066fea22f38fe7431/lib/command.js#L655
   // @ts-expect-error
   null
-).addOption(
-  new extraTypings.Option(
-    "--opentelemetry [exporter-endpoint]",
-    `Enable OpenTelemetry integration with an exporter using this option's value as endpoint. By default, it uses OTLP HTTP, use "--opentelemetry-exporter-type" to change the default.`
-  ).env("OPENTELEMETRY")
-).addOption(
-  new extraTypings.Option(
-    "--opentelemetry-exporter-type <type>",
-    `OpenTelemetry exporter type to use when setting up OpenTelemetry integration. Requires "--opentelemetry" to set the endpoint.`
-  ).choices(["otlp-http", "otlp-grpc"]).default("otlp-http").env("OPENTELEMETRY_EXPORTER_TYPE")
 ).addOption(
   new extraTypings.Option(
     "--hive-registry-token <token>",
-    '[DEPRECATED: please use "--hive-target" and "--hive-access-token"] Hive registry token for usage metrics reporting'
+    '[DEPRECATED: please use "--hive-usage-target" and "--hive-usage-access-token"] Hive registry token for usage metrics reporting'
   ).env("HIVE_REGISTRY_TOKEN")
 ).addOption(
   new extraTypings.Option(
     "--hive-usage-target <target>",
-    "[DEPRECATED] please use --hive-target instead."
+    'Hive registry target to which the usage data should be reported to. requires the "--hive-usage-access-token <token>" option'
   ).env("HIVE_USAGE_TARGET")
-).addOption(
-  new extraTypings.Option(
-    "--hive-target <target>",
-    'Hive registry target to which the usage and tracing data should be reported to. Requires either "--hive-access-token <token>", "--hive-usage-access-token <token>" or "--hive-trace-access-token" option'
-  ).env("HIVE_TARGET")
-).addOption(
-  new extraTypings.Option(
-    "--hive-access-token <token>",
-    'Hive registry access token for usage metrics reporting and tracing. Enables both usage reporting and tracing. Requires the "--hive-target <target>" option'
-  ).env("HIVE_ACCESS_TOKEN")
 ).addOption(
   new extraTypings.Option(
     "--hive-usage-access-token <token>",
-    `Hive registry access token for usage reporting. Enables Hive usage report. Requires the "--hive-target <target>" option. It can't be used together with "--hive-access-token"`
+    'Hive registry access token for usage metrics reporting. requires the "--hive-usage-target <target>" option'
   ).env("HIVE_USAGE_ACCESS_TOKEN")
-).addOption(
-  new extraTypings.Option(
-    "--hive-trace-access-token <token>",
-    `Hive registry access token for tracing. Enables Hive tracing. Requires the "--hive-target <target>" option. It can't be used together with "--hive-access-token"`
-  ).env("HIVE_TRACE_ACCESS_TOKEN")
-).addOption(
-  new extraTypings.Option(
-    "--hive-trace-endpoint <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'
+  '[EXPERIMENTAL] Hive CDN endpoint for fetching the persisted documents. requires the "--hive-persisted-documents-token <token>" option'
 ).option(
   "--hive-persisted-documents-token <token>",
-  '[EXPERIMENTAL] Hive persisted documents CDN endpoint token. Requires the "--hive-persisted-documents-endpoint <endpoint>" option'
+  '[EXPERIMENTAL] Hive persisted documents CDN endpoint token. requires the "--hive-persisted-documents-endpoint <endpoint>" option'
 ).addOption(
   new extraTypings.Option(
     "--hive-cdn-endpoint <endpoint>",

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

@@ -13,8 +13,7 @@ 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';
@@ -486,83 +485,11 @@ function handleFork(log, config) {
   return false;
 }
 
-async function handleOpenTelemetryConfig(ctx, cliOpts) {
-  const accessToken = cliOpts.hiveTraceAccessToken;
-  const traceEndpoint = cliOpts.hiveTraceEndpoint;
-  const target = cliOpts.hiveTarget;
-  const openTelemetry = cliOpts.openTelemetry;
-  const exporterType = cliOpts.openTelemetryExporterType ?? "otlp-http";
-  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 }))
-        );
-      }
-      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) {
   const confOpts = {
     ...loadedConfig.reporting?.type === "hive" ? {
       hiveRegistryToken: loadedConfig.reporting.token,
-      hiveTarget: loadedConfig.reporting.target,
+      hiveUsageTarget: loadedConfig.reporting.target,
       hiveUsageAccessToken: loadedConfig.reporting.token
     } : {},
     ...loadedConfig.reporting?.type === "graphos" ? {
@@ -570,45 +497,32 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       apolloKey: loadedConfig.reporting.apiKey
     } : {}
   };
-  const opts = {
-    ...confOpts,
-    ...cliOpts,
-    hiveTarget: (
-      // cli arguments always take precedence over config
-      confOpts.hiveTarget ?? cliOpts.hiveTarget ?? cliOpts.hiveUsageTarget
-    )
-  };
+  const opts = { ...confOpts, ...cliOpts };
   if (cliOpts.hiveRegistryToken && cliOpts.hiveUsageAccessToken) {
     ctx.log.error(
       'Cannot use "--hive-registry-token" with "--hive-usage-access-token". Please use "--hive-usage-target" and "--hive-usage-access-token" or the config instead.'
     );
     process.exit(1);
   }
-  if (cliOpts.hiveUsageTarget && cliOpts.hiveTarget) {
-    ctx.log.error(
-      'Cannot use "--hive-usage-target" with "--hive-target". Please only use "--hive-target"'
-    );
-    process.exit(1);
-  }
-  if (cliOpts.hiveRegistryToken && opts.hiveTarget) {
+  if (cliOpts.hiveRegistryToken && opts.hiveUsageTarget) {
     ctx.log.error(
       'Cannot use "--hive-registry-token" with a target. Please use "--hive-usage-target" and "--hive-usage-access-token" or the config instead.'
     );
     process.exit(1);
   }
-  if (opts.hiveTarget && !opts.hiveAccessToken && !opts.hiveUsageAccessToken && !opts.hiveTraceAccessToken) {
+  if (opts.hiveUsageTarget && !opts.hiveUsageAccessToken) {
     ctx.log.error(
-      'Hive usage target needs an access token. Please provide it through "--hive-access-token <token>", or specific "--hive-usage-access-token <token>" and "--hive-trace-access-token" options, or the config.'
+      'Hive usage target needs an access token. Please provide it through the "--hive-usage-access-token <token>" option or the config.'
     );
     process.exit(1);
   }
-  if ((opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveTraceAccessToken) && !opts.hiveTarget) {
+  if (opts.hiveUsageAccessToken && !opts.hiveUsageTarget) {
     ctx.log.error(
-      'Hive access token needs a target. Please provide it through the "--hive-target <target>" option or the config.'
+      'Hive usage access token needs a target. Please provide it through the "--hive-usage-target <target>" option or the config.'
     );
     process.exit(1);
   }
-  const hiveUsageAccessToken = opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveRegistryToken;
+  const hiveUsageAccessToken = opts.hiveUsageAccessToken || opts.hiveRegistryToken;
   if (hiveUsageAccessToken) {
     if (opts.hiveUsageTarget) {
       ctx.log.info("Configuring Hive usage reporting");
@@ -619,7 +533,7 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       ...loadedConfig.reporting,
       type: "hive",
       token: hiveUsageAccessToken,
-      target: opts.hiveTarget
+      target: opts.hiveUsageTarget
     };
   }
   if (opts.apolloKey) {
@@ -647,30 +561,17 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   "path to the GraphQL schema file or a url from where to pull the schema"
 ).action(async function proxy(endpoint) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     hiveCdnEndpoint,
     hiveCdnKey,
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     maskedErrors,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -724,11 +625,8 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
     // proxy can only do reporting to hive registry
     apolloGraphRef: void 0,
     apolloKey: void 0
@@ -749,8 +647,7 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -825,28 +722,15 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   'path to the subgraph schema file or a url from where to pull the subgraph schema (default: "subgraph.graphql")'
 ).action(async function subgraph(schemaPathOrUrl) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     maskedErrors,
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -862,11 +746,8 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
     hiveRegistryToken,
-    hiveTarget,
     hiveUsageTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
     // subgraph can only do reporting to hive registry
     apolloGraphRef: void 0,
     apolloKey: void 0
@@ -887,8 +768,7 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -982,17 +862,11 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ).env("APOLLO_SCHEMA_CONFIG_DELIVERY_ENDPOINT")
 ).action(async function supergraph(schemaPathOrUrl) {
   const {
-    opentelemetry,
-    opentelemetryExporterType,
     hiveCdnEndpoint,
     hiveCdnKey,
     hiveRegistryToken,
     hiveUsageTarget,
-    hiveTarget,
-    hiveAccessToken,
     hiveUsageAccessToken,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint,
     maskedErrors,
     apolloGraphRef,
     apolloKey,
@@ -1004,13 +878,6 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
-  const openTelemetryEnabledByCLI = await handleOpenTelemetryConfig(ctx, {
-    openTelemetry: opentelemetry,
-    openTelemetryExporterType: opentelemetryExporterType,
-    hiveTarget,
-    hiveTraceAccessToken,
-    hiveTraceEndpoint
-  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -1096,9 +963,6 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
-    hiveTarget,
-    hiveAccessToken,
-    hiveTraceAccessToken,
     hiveRegistryToken,
     hiveUsageTarget,
     hiveUsageAccessToken,
@@ -1121,8 +985,7 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts,
-      openTelemetry: openTelemetryEnabledByCLI ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
+      ...opts
     },
     {
       log: ctx.log,
@@ -1372,57 +1235,27 @@ let cli = new Command().configureHelp({
   // see here https://github.com/tj/commander.js/blob/970ecae402b253de691e6a9066fea22f38fe7431/lib/command.js#L655
   // @ts-expect-error
   null
-).addOption(
-  new Option(
-    "--opentelemetry [exporter-endpoint]",
-    `Enable OpenTelemetry integration with an exporter using this option's value as endpoint. By default, it uses OTLP HTTP, use "--opentelemetry-exporter-type" to change the default.`
-  ).env("OPENTELEMETRY")
-).addOption(
-  new Option(
-    "--opentelemetry-exporter-type <type>",
-    `OpenTelemetry exporter type to use when setting up OpenTelemetry integration. Requires "--opentelemetry" to set the endpoint.`
-  ).choices(["otlp-http", "otlp-grpc"]).default("otlp-http").env("OPENTELEMETRY_EXPORTER_TYPE")
 ).addOption(
   new Option(
     "--hive-registry-token <token>",
-    '[DEPRECATED: please use "--hive-target" and "--hive-access-token"] Hive registry token for usage metrics reporting'
+    '[DEPRECATED: please use "--hive-usage-target" and "--hive-usage-access-token"] Hive registry token for usage metrics reporting'
   ).env("HIVE_REGISTRY_TOKEN")
 ).addOption(
   new Option(
     "--hive-usage-target <target>",
-    "[DEPRECATED] please use --hive-target instead."
+    'Hive registry target to which the usage data should be reported to. requires the "--hive-usage-access-token <token>" option'
   ).env("HIVE_USAGE_TARGET")
-).addOption(
-  new Option(
-    "--hive-target <target>",
-    'Hive registry target to which the usage and tracing data should be reported to. Requires either "--hive-access-token <token>", "--hive-usage-access-token <token>" or "--hive-trace-access-token" option'
-  ).env("HIVE_TARGET")
-).addOption(
-  new Option(
-    "--hive-access-token <token>",
-    'Hive registry access token for usage metrics reporting and tracing. Enables both usage reporting and tracing. Requires the "--hive-target <target>" option'
-  ).env("HIVE_ACCESS_TOKEN")
 ).addOption(
   new Option(
     "--hive-usage-access-token <token>",
-    `Hive registry access token for usage reporting. Enables Hive usage report. Requires the "--hive-target <target>" option. It can't be used together with "--hive-access-token"`
+    'Hive registry access token for usage metrics reporting. requires the "--hive-usage-target <target>" option'
   ).env("HIVE_USAGE_ACCESS_TOKEN")
-).addOption(
-  new Option(
-    "--hive-trace-access-token <token>",
-    `Hive registry access token for tracing. Enables Hive tracing. Requires the "--hive-target <target>" option. It can't be used together with "--hive-access-token"`
-  ).env("HIVE_TRACE_ACCESS_TOKEN")
-).addOption(
-  new Option(
-    "--hive-trace-endpoint <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'
+  '[EXPERIMENTAL] Hive CDN endpoint for fetching the persisted documents. requires the "--hive-persisted-documents-token <token>" option'
 ).option(
   "--hive-persisted-documents-token <token>",
-  '[EXPERIMENTAL] Hive persisted documents CDN endpoint token. Requires the "--hive-persisted-documents-endpoint <endpoint>" option'
+  '[EXPERIMENTAL] Hive persisted documents CDN endpoint token. requires the "--hive-persisted-documents-endpoint <endpoint>" option'
 ).addOption(
   new Option(
     "--hive-cdn-endpoint <endpoint>",

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var cli = require('./cli-CQdLYWjW.cjs');
+var cli = require('./cli-BQ10GobO.cjs');
 var logger = require('@graphql-hive/logger');
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var pubsub = require('@graphql-hive/pubsub');
@@ -31,7 +31,6 @@ require('node:fs');
 require('node:http');
 require('node:https');
 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

@@ -268,15 +268,9 @@ declare let cli: Command<[], {
     port?: number | undefined;
     polling?: number | undefined;
     maskedErrors: string | boolean | string[] | [];
-    opentelemetry?: string | true | undefined;
-    opentelemetryExporterType: "otlp-http" | "otlp-grpc";
     hiveRegistryToken?: string | undefined;
     hiveUsageTarget?: string | undefined;
-    hiveTarget?: string | undefined;
-    hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
-    hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;
@@ -293,15 +287,9 @@ declare function run(userCtx: Partial<CLIContext>): Promise<Command<[], {
     port?: number | undefined;
     polling?: number | undefined;
     maskedErrors: string | boolean | string[] | [];
-    opentelemetry?: string | true | undefined;
-    opentelemetryExporterType: "otlp-http" | "otlp-grpc";
     hiveRegistryToken?: string | undefined;
     hiveUsageTarget?: string | undefined;
-    hiveTarget?: string | undefined;
-    hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
-    hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;

package/dist/index.d.ts

@@ -268,15 +268,9 @@ declare let cli: Command<[], {
     port?: number | undefined;
     polling?: number | undefined;
     maskedErrors: string | boolean | string[] | [];
-    opentelemetry?: string | true | undefined;
-    opentelemetryExporterType: "otlp-http" | "otlp-grpc";
     hiveRegistryToken?: string | undefined;
     hiveUsageTarget?: string | undefined;
-    hiveTarget?: string | undefined;
-    hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
-    hiveTraceAccessToken?: string | undefined;
-    hiveTraceEndpoint: string;
     hivePersistedDocumentsEndpoint?: string | undefined;
     hivePersistedDocumentsToken?: string | undefined;
     hiveCdnEndpoint?: string | undefined;
@@ -293,15 +287,9 @@ declare function run(userCtx: Partial<CLIContext>): Promise<Command<[], {
     port?: number | undefined;
     polling?: number | undefined;
     maskedErrors: string | boolean | string[] | [];
-    opentelemetry?: string | true | undefined;
-    opentelemetryExporterType: "otlp-http" | "otlp-grpc";
     hiveRegistryToken?: string | undefined;
     hiveUsageTarget?: string | undefined;
-    hiveTarget?: string | undefined;
-    hiveAccessToken?: string | undefined;
     hiveUsageAccessToken?: string | undefined;
-    hiveTraceAccessToken?: 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-C8SAeNPg.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-CpJrCTMy.js';
 export * from '@graphql-hive/logger';
 export * from '@graphql-hive/gateway-runtime';
 export { PubSub } from '@graphql-hive/pubsub';
@@ -30,7 +30,6 @@ import 'node:fs';
 import 'node:http';
 import 'node:https';
 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-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+  "version": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
   "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-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-hive/importer": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-hive/logger": "1.0.1-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-hive/plugin-aws-sigv4": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-hive/plugin-deduplicate-request": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-hive/pubsub": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+    "@graphql-hive/gateway-runtime": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-hive/importer": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-hive/logger": "1.0.1-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-hive/plugin-aws-sigv4": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-hive/plugin-deduplicate-request": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-hive/pubsub": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
     "@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-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+    "@graphql-mesh/hmac-upstream-signature": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
     "@graphql-mesh/plugin-http-cache": "^0.105.6",
     "@graphql-mesh/plugin-jit": "^0.2.5",
-    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+    "@graphql-mesh/plugin-jwt-auth": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-mesh/plugin-opentelemetry": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-mesh/plugin-prometheus": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
     "@graphql-mesh/plugin-rate-limit": "^0.104.5",
     "@graphql-mesh/plugin-snapshot": "^0.104.5",
-    "@graphql-mesh/transport-http": "1.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
-    "@graphql-mesh/transport-ws": "2.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+    "@graphql-mesh/transport-http": "1.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-mesh/transport-http-callback": "1.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
+    "@graphql-mesh/transport-ws": "2.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
     "@graphql-mesh/types": "^0.104.5",
     "@graphql-mesh/utils": "^0.104.5",
     "@graphql-tools/code-file-loader": "^8.1.15",
@@ -84,7 +84,6 @@
     "@graphql-yoga/render-graphiql": "^5.15.1",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.202.0",
-    "@opentelemetry/context-async-hooks": "^2.0.1",
     "@opentelemetry/context-zone": "^2.0.1",
     "@opentelemetry/core": "^2.0.1",
     "@opentelemetry/exporter-jaeger": "^2.0.1",
@@ -94,7 +93,6 @@
     "@opentelemetry/sampler-jaeger-remote": "^0.202.0",
     "@opentelemetry/sdk-logs": "^0.202.0",
     "@opentelemetry/sdk-metrics": "^2.0.1",
-    "@opentelemetry/sdk-trace-base": "^2.0.1",
     "commander": "^13.1.0",
     "dotenv": "^17.2.0",
     "graphql-ws": "^6.0.4",
@@ -103,7 +101,7 @@
     "ws": "^8.18.3"
   },
   "devDependencies": {
-    "@graphql-mesh/transport-common": "1.0.0-alpha-f1546e2bd2aa67d07cc1374edf43ea898bf5b505",
+    "@graphql-mesh/transport-common": "1.0.0-alpha-6c3626db73cf3cea88b05a477f5a1b2f8b1e45f5",
     "@graphql-mesh/transport-soap": "^0.10.6",
     "@graphql-tools/executor": "^1.4.7",
     "@rollup/plugin-commonjs": "^28.0.0",