@graphql-hive/gateway 2.0.0-alpha-a57076229f707b5b888a8b1877e893388fcd67d6 → 2.0.0-alpha-be69ab8fa8cf618e4bf67dad92091aff852be2a4

package/dist/{cli-BQ10GobO.cjs → cli-Be2W1qf0.cjs}

@@ -15,6 +15,7 @@ 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 codeFileLoader = require('@graphql-tools/code-file-loader');
 var graphqlFileLoader = require('@graphql-tools/graphql-file-loader');
@@ -492,11 +493,46 @@ function handleFork(log, config) {
   return false;
 }
 
+async function handleOpenTelemetryConfig(ctx, cliOpts) {
+  const accessToken = cliOpts.hiveTraceAccessToken;
+  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>"'
+        );
+        process.exit(1);
+      }
+      processors.push(
+        new HiveTracingSpanProcessor({
+          accessToken,
+          target
+        })
+      );
+    }
+    openTelemetrySetup({
+      traces: { processors },
+      contextManager: await import('@opentelemetry/context-async-hooks').then((module) => new module.AsyncLocalStorageContextManager()).catch(() => null)
+    });
+  }
+}
+
 function handleReportingConfig(ctx, loadedConfig, cliOpts) {
   const confOpts = {
     ...loadedConfig.reporting?.type === "hive" ? {
       hiveRegistryToken: loadedConfig.reporting.token,
-      hiveUsageTarget: loadedConfig.reporting.target,
+      hiveTarget: loadedConfig.reporting.target,
       hiveUsageAccessToken: loadedConfig.reporting.token
     } : {},
     ...loadedConfig.reporting?.type === "graphos" ? {
@@ -504,32 +540,42 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       apolloKey: loadedConfig.reporting.apiKey
     } : {}
   };
-  const opts = { ...confOpts, ...cliOpts };
+  const opts = {
+    ...confOpts,
+    ...cliOpts,
+    hiveTarget: cliOpts.hiveTarget ?? cliOpts.hiveUsageTarget ?? confOpts.hiveTarget
+  };
   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.hiveRegistryToken && opts.hiveUsageTarget) {
+  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) {
     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.hiveUsageTarget && !opts.hiveUsageAccessToken) {
+  if (opts.hiveTarget && !opts.hiveAccessToken && !opts.hiveUsageAccessToken && !opts.hiveTraceAccessToken) {
     ctx.log.error(
-      'Hive usage target needs an access token. Please provide it through the "--hive-usage-access-token <token>" option or the config.'
+      '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.'
     );
     process.exit(1);
   }
-  if (opts.hiveUsageAccessToken && !opts.hiveUsageTarget) {
+  if ((opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveTraceAccessToken) && !opts.hiveUsageTarget) {
     ctx.log.error(
-      'Hive usage access token needs a target. Please provide it through the "--hive-usage-target <target>" option or the config.'
+      'Hive access token needs a target. Please provide it through the "--hive-target <target>" option or the config.'
     );
     process.exit(1);
   }
-  const hiveUsageAccessToken = opts.hiveUsageAccessToken || opts.hiveRegistryToken;
+  const hiveUsageAccessToken = opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveRegistryToken;
   if (hiveUsageAccessToken) {
     if (opts.hiveUsageTarget) {
       ctx.log.info("Configuring Hive usage reporting");
@@ -540,7 +586,7 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       ...loadedConfig.reporting,
       type: "hive",
       token: hiveUsageAccessToken,
-      target: opts.hiveUsageTarget
+      target: opts.hiveTarget
     };
   }
   if (opts.apolloKey) {
@@ -568,17 +614,28 @@ 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,
     maskedErrors,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -632,8 +689,11 @@ 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
@@ -654,7 +714,8 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -729,15 +790,26 @@ 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,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -753,8 +825,11 @@ 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
@@ -775,7 +850,8 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -869,11 +945,16 @@ 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,
     maskedErrors,
     apolloGraphRef,
     apolloKey,
@@ -885,6 +966,12 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -970,6 +1057,9 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
+    hiveTarget,
+    hiveAccessToken,
+    hiveTraceAccessToken,
     hiveRegistryToken,
     hiveUsageTarget,
     hiveUsageAccessToken,
@@ -992,7 +1082,8 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -1242,27 +1333,52 @@ 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-usage-target" and "--hive-usage-access-token"] Hive registry token for usage metrics reporting'
+    '[DEPRECATED: please use "--hive-target" and "--hive-access-token"] Hive registry token for usage metrics reporting'
   ).env("HIVE_REGISTRY_TOKEN")
 ).addOption(
   new extraTypings.Option(
     "--hive-usage-target <target>",
-    'Hive registry target to which the usage data should be reported to. requires the "--hive-usage-access-token <token>" option'
+    "[DEPRECATED] please use --hive-target instead."
   ).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 metrics reporting. requires the "--hive-usage-target <target>" option'
+    `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"`
   ).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")
 ).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-CpJrCTMy.js → cli-eXE2psgp.js}

@@ -13,6 +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 { 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';
@@ -485,11 +486,46 @@ function handleFork(log, config) {
   return false;
 }
 
+async function handleOpenTelemetryConfig(ctx, cliOpts) {
+  const accessToken = cliOpts.hiveTraceAccessToken;
+  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>"'
+        );
+        process.exit(1);
+      }
+      processors.push(
+        new HiveTracingSpanProcessor({
+          accessToken,
+          target
+        })
+      );
+    }
+    openTelemetrySetup({
+      traces: { processors },
+      contextManager: await import('@opentelemetry/context-async-hooks').then((module) => new module.AsyncLocalStorageContextManager()).catch(() => null)
+    });
+  }
+}
+
 function handleReportingConfig(ctx, loadedConfig, cliOpts) {
   const confOpts = {
     ...loadedConfig.reporting?.type === "hive" ? {
       hiveRegistryToken: loadedConfig.reporting.token,
-      hiveUsageTarget: loadedConfig.reporting.target,
+      hiveTarget: loadedConfig.reporting.target,
       hiveUsageAccessToken: loadedConfig.reporting.token
     } : {},
     ...loadedConfig.reporting?.type === "graphos" ? {
@@ -497,32 +533,42 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       apolloKey: loadedConfig.reporting.apiKey
     } : {}
   };
-  const opts = { ...confOpts, ...cliOpts };
+  const opts = {
+    ...confOpts,
+    ...cliOpts,
+    hiveTarget: cliOpts.hiveTarget ?? cliOpts.hiveUsageTarget ?? confOpts.hiveTarget
+  };
   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.hiveRegistryToken && opts.hiveUsageTarget) {
+  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) {
     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.hiveUsageTarget && !opts.hiveUsageAccessToken) {
+  if (opts.hiveTarget && !opts.hiveAccessToken && !opts.hiveUsageAccessToken && !opts.hiveTraceAccessToken) {
     ctx.log.error(
-      'Hive usage target needs an access token. Please provide it through the "--hive-usage-access-token <token>" option or the config.'
+      '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.'
     );
     process.exit(1);
   }
-  if (opts.hiveUsageAccessToken && !opts.hiveUsageTarget) {
+  if ((opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveTraceAccessToken) && !opts.hiveUsageTarget) {
     ctx.log.error(
-      'Hive usage access token needs a target. Please provide it through the "--hive-usage-target <target>" option or the config.'
+      'Hive access token needs a target. Please provide it through the "--hive-target <target>" option or the config.'
     );
     process.exit(1);
   }
-  const hiveUsageAccessToken = opts.hiveUsageAccessToken || opts.hiveRegistryToken;
+  const hiveUsageAccessToken = opts.hiveAccessToken || opts.hiveUsageAccessToken || opts.hiveRegistryToken;
   if (hiveUsageAccessToken) {
     if (opts.hiveUsageTarget) {
       ctx.log.info("Configuring Hive usage reporting");
@@ -533,7 +579,7 @@ function handleReportingConfig(ctx, loadedConfig, cliOpts) {
       ...loadedConfig.reporting,
       type: "hive",
       token: hiveUsageAccessToken,
-      target: opts.hiveUsageTarget
+      target: opts.hiveTarget
     };
   }
   if (opts.apolloKey) {
@@ -561,17 +607,28 @@ 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,
     maskedErrors,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} in proxy mode`);
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -625,8 +682,11 @@ 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
@@ -647,7 +707,8 @@ const addCommand$2 = (ctx, cli) => cli.command("proxy").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -722,15 +783,26 @@ 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,
     hivePersistedDocumentsEndpoint,
     hivePersistedDocumentsToken,
     ...opts
   } = this.optsWithGlobals();
   ctx.log.info(`Starting ${ctx.productName} ${ctx.version} as subgraph`);
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -746,8 +818,11 @@ 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
@@ -768,7 +843,8 @@ const addCommand$1 = (ctx, cli) => cli.command("subgraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -862,11 +938,16 @@ 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,
     maskedErrors,
     apolloGraphRef,
     apolloKey,
@@ -878,6 +959,12 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   ctx.log.info(
     `Starting ${ctx.productName} ${ctx.version} with supergraph`
   );
+  await handleOpenTelemetryConfig(ctx, {
+    openTelemetry: opentelemetry,
+    openTelemetryExporterType: opentelemetryExporterType,
+    hiveTarget,
+    hiveTraceAccessToken
+  });
   const loadedConfig = await loadConfig({
     log: ctx.log,
     configPath: opts.configPath,
@@ -963,6 +1050,9 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   }
   const registryConfig = {};
   const reporting = handleReportingConfig(ctx, loadedConfig, {
+    hiveTarget,
+    hiveAccessToken,
+    hiveTraceAccessToken,
     hiveRegistryToken,
     hiveUsageTarget,
     hiveUsageAccessToken,
@@ -985,7 +1075,8 @@ const addCommand = (ctx, cli) => cli.command("supergraph").description(
   const builtinPlugins = await getBuiltinPluginsFromConfig(
     {
       ...loadedConfig,
-      ...opts
+      ...opts,
+      openTelemetry: opentelemetry ? { ...loadedConfig.openTelemetry, traces: true } : loadedConfig.openTelemetry
     },
     {
       log: ctx.log,
@@ -1235,27 +1326,52 @@ 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-usage-target" and "--hive-usage-access-token"] Hive registry token for usage metrics reporting'
+    '[DEPRECATED: please use "--hive-target" and "--hive-access-token"] Hive registry token for usage metrics reporting'
   ).env("HIVE_REGISTRY_TOKEN")
 ).addOption(
   new Option(
     "--hive-usage-target <target>",
-    'Hive registry target to which the usage data should be reported to. requires the "--hive-usage-access-token <token>" option'
+    "[DEPRECATED] please use --hive-target instead."
   ).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 metrics reporting. requires the "--hive-usage-target <target>" option'
+    `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"`
   ).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")
 ).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-BQ10GobO.cjs');
+var cli = require('./cli-Be2W1qf0.cjs');
 var logger = require('@graphql-hive/logger');
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var pubsub = require('@graphql-hive/pubsub');
@@ -30,6 +30,7 @@ require('node:url');
 require('node:fs');
 require('node:http');
 require('node:https');
+require('@opentelemetry/sdk-trace-base');
 require('@graphql-tools/utils');
 require('@graphql-tools/code-file-loader');
 require('@graphql-tools/graphql-file-loader');