@graphql-hive/plugin-opentelemetry 1.2.2-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8 → 1.3.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a

package/CHANGELOG.md

@@ -1,15 +1,42 @@
 # @graphql-hive/plugin-opentelemetry
 
-## 1.2.2-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8
+## 1.3.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a
+### Minor Changes
+
+
+
+- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`f19b9ef`](https://github.com/graphql-hive/gateway/commit/f19b9ef6994fbabefa85f1f9e2527ca79223fb6a) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Expose GraphQLError as OpenTelemetry Events.
+  
+  Errors contains in the result of a graphql operation are now reported as standalone OpenTelemetry
+  Events (name `graphql.error`) instead of OpenTelemetry Exceptions.
+  
+  This is aligned with the guidance of the Graphql OpenTelemetry working group.
+  
+  It allows to add more graphql specific attributes to errors reported in a response:
+  
+  - `message`: The error message
+  - `path`: The path in the operation document from which the error originated
+  - `locations`: The list of related locations in the document source
+  - `coordinate`: The schema coordinate of the resolver which is the source of the error
+  
+  This brings the experimental support of the `coordinate` error attribute in the Yoga Runtime. For
+  security reason, this attribute is purposefully not serialized, to avoid leaking schema information
+  to clients.
+
 ### Patch Changes
 
 
 
+- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`bff4e5b`](https://github.com/graphql-hive/gateway/commit/bff4e5b5189c0962b14de4b58f03e7cc6cfd3fdc) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - dependencies updates:
+  
+  - Added dependency [`@graphql-tools/executor@^1.4.9` ↗︎](https://www.npmjs.com/package/@graphql-tools/executor/v/1.4.9) (to `dependencies`)
+
+
 - [#1725](https://github.com/graphql-hive/gateway/pull/1725) [`0ded04f`](https://github.com/graphql-hive/gateway/commit/0ded04f56d9d9dea8c412e2e320fb89815108362) Thanks [@dependabot](https://github.com/apps/dependabot)! - dependencies updates:
   
   - Updated dependency [`@graphql-hive/core@^0.15.1` ↗︎](https://www.npmjs.com/package/@graphql-hive/core/v/0.15.1) (from `^0.13.2`, in `dependencies`)
-- Updated dependencies [[`0ded04f`](https://github.com/graphql-hive/gateway/commit/0ded04f56d9d9dea8c412e2e320fb89815108362)]:
-  - @graphql-hive/gateway-runtime@2.3.6-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8
+- Updated dependencies [[`cc0feba`](https://github.com/graphql-hive/gateway/commit/cc0feba56c0bf379a3d5aed326b3db1abf7c4681), [`0ded04f`](https://github.com/graphql-hive/gateway/commit/0ded04f56d9d9dea8c412e2e320fb89815108362), [`f19b9ef`](https://github.com/graphql-hive/gateway/commit/f19b9ef6994fbabefa85f1f9e2527ca79223fb6a)]:
+  - @graphql-hive/gateway-runtime@2.4.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a
 
 ## 1.2.1
 ### Patch Changes

package/dist/attributes-BjUFTXMN.d.ts

@@ -0,0 +1,16 @@
+declare const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
+declare const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
+declare const SEMATTRS_GRAPHQL_OPERATION_NAME = "graphql.operation.name";
+declare const SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = "hive.graphql.operation.hash";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = "hive.graphql.error.count";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = "hive.graphql.error.codes";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = "hive.graphql.error.coordinates";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = "hive.graphql.error.code";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = "hive.graphql.error.coordinate";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = "hive.graphql.error.path";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = "hive.graphql.error.message";
+declare const SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = "hive.graphql.error.locations";
+declare const SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
+declare const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
+
+export { SEMATTRS_GRAPHQL_DOCUMENT as S, SEMATTRS_GRAPHQL_OPERATION_TYPE as a, SEMATTRS_GRAPHQL_OPERATION_NAME as b, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH as c, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT as d, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES as e, SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES as f, SEMATTRS_HIVE_GRAPHQL_ERROR_CODE as g, SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE as h, SEMATTRS_HIVE_GRAPHQL_ERROR_PATH as i, SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE as j, SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS as k, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME as l, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES as m };

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var plugin = require('./plugin-BsCbZ1j2.cjs');
+var plugin = require('./plugin-uVxk_ok_.cjs');
 var api = require('@opentelemetry/api');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 require('@graphql-hive/gateway-runtime');
@@ -19,8 +19,14 @@ exports.SEMATTRS_GRAPHQL_OPERATION_NAME = plugin.SEMATTRS_GRAPHQL_OPERATION_NAME
 exports.SEMATTRS_GRAPHQL_OPERATION_TYPE = plugin.SEMATTRS_GRAPHQL_OPERATION_TYPE;
 exports.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = plugin.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES;
 exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = plugin.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODE;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_PATH;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES;
 exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = plugin.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;
 exports.useOpenTelemetry = plugin.useOpenTelemetry;
 Object.defineProperty(exports, "OpenTelemetryDiagLogLevel", {

package/dist/index.d.cts

@@ -1,6 +1,6 @@
 export { O as OpenTelemetryContextExtension, a as OpenTelemetryGatewayPluginOptions, b as OpenTelemetryPlugin, c as OpenTelemetryPluginUtils, u as useOpenTelemetry } from './plugin-BBy_tfA5.js';
 export { DiagLogLevel as OpenTelemetryDiagLogLevel } from '@opentelemetry/api';
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-mikIPKnv.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-BjUFTXMN.js';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
 import '@graphql-hive/gateway-runtime';
 import '@graphql-tools/utils';

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { O as OpenTelemetryContextExtension, a as OpenTelemetryGatewayPluginOptions, b as OpenTelemetryPlugin, c as OpenTelemetryPluginUtils, u as useOpenTelemetry } from './plugin-BBy_tfA5.js';
 export { DiagLogLevel as OpenTelemetryDiagLogLevel } from '@opentelemetry/api';
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-mikIPKnv.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-BjUFTXMN.js';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
 import '@graphql-hive/gateway-runtime';
 import '@graphql-tools/utils';

package/dist/index.js

@@ -1,4 +1,4 @@
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH, u as useOpenTelemetry } from './plugin-DSqlDQ_l.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH, u as useOpenTelemetry } from './plugin-CW1kfhP8.js';
 export { DiagLogLevel as OpenTelemetryDiagLogLevel } from '@opentelemetry/api';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
 import '@graphql-hive/gateway-runtime';

package/dist/{plugin-DSqlDQ_l.js → plugin-CW1kfhP8.js}

@@ -1,14 +1,22 @@
 import { isRetryExecutionRequest as isRetryExecutionRequest$1, getRetryInfo as getRetryInfo$1, Logger } from '@graphql-hive/gateway-runtime';
 import { getHeadersObj } from '@graphql-mesh/utils';
-import { isAsyncIterable, getOperationASTFromDocument, fakePromise } from '@graphql-tools/utils';
+import { isAsyncIterable, getOperationASTFromDocument, getSchemaCoordinate, fakePromise } from '@graphql-tools/utils';
 import { unfakePromise } from '@whatwg-node/promise-helpers';
 import { hive } from './api.js';
 import { trace, SpanStatusCode, context, ROOT_CONTEXT, SpanKind, DiagLogLevel, diag, propagation } from '@opentelemetry/api';
 import { hashOperation } from '@graphql-hive/core';
 import { defaultPrintFn } from '@graphql-mesh/transport-common';
-import { SEMATTRS_EXCEPTION_STACKTRACE, SEMATTRS_EXCEPTION_MESSAGE, SEMATTRS_EXCEPTION_TYPE, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL, SEMATTRS_NET_HOST_NAME, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_HTTP_CLIENT_IP } from '@opentelemetry/semantic-conventions';
+import { SEMATTRS_EXCEPTION_STACKTRACE, SEMATTRS_EXCEPTION_MESSAGE, SEMATTRS_EXCEPTION_TYPE, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_URL, SEMATTRS_NET_HOST_NAME, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_HTTP_CLIENT_IP, ATTR_EXCEPTION_STACKTRACE } from '@opentelemetry/semantic-conventions';
 import { printSchema, TypeInfo } from 'graphql';
 
+function useErrorCoordinate() {
+    return {
+        onExecute({ args }) {
+            args.schemaCoordinateInErrors = true;
+        },
+    };
+}
+
 class OtelContextStack {
   #root;
   #current;
@@ -122,6 +130,12 @@ const SEMATTRS_GRAPHQL_OPERATION_NAME = "graphql.operation.name";
 const SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = "hive.graphql.operation.hash";
 const SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = "hive.graphql.error.count";
 const SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = "hive.graphql.error.codes";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = "hive.graphql.error.coordinates";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = "hive.graphql.error.code";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = "hive.graphql.error.coordinate";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = "hive.graphql.error.path";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = "hive.graphql.error.message";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = "hive.graphql.error.locations";
 const SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
 const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
 
@@ -241,7 +255,27 @@ function setGraphQLParseAttributes(input) {
     span.setAttribute(SEMATTRS_GRAPHQL_DOCUMENT, input.query);
   }
   if (input.result instanceof Error) {
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, 1);
+    if (isGraphQLError(input.result)) {
+      span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, 1);
+      span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: "GraphQL Parse Error"
+      });
+      const operationSpan = trace.getSpan(input.operationCtx);
+      if (operationSpan) {
+        recordGraphqlErrors(
+          operationSpan,
+          [input.result],
+          "GraphQL Parse Error"
+        );
+      }
+    } else {
+      span.recordException(input.result);
+      span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: input.result.message
+      });
+    }
   } else {
     const document = input.result;
     const operation = getOperationFromDocument(document, input.operationName);
@@ -280,21 +314,34 @@ function setGraphQLValidateAttributes(input) {
   if (result instanceof Error) {
     errors.push(result);
   }
-  if (errors.length > 0) {
+  if (errors.length === 0) {
+    return;
+  }
+  const graphqlErrors = [];
+  const exceptions = [];
+  for (const error of errors) {
+    (isGraphQLError(error) ? graphqlErrors : exceptions).push(error);
+  }
+  if (graphqlErrors.length > 0) {
     span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.length);
-    span.setStatus({
-      code: SpanStatusCode.ERROR,
-      message: result.map((e) => e.message).join(", ")
-    });
-    const codes = [];
-    for (const error of result) {
-      if (error.extensions?.code) {
-        codes.push(`${error.extensions.code}`);
-      }
-      span.recordException(error);
+    const operationSpan = trace.getSpan(input.operationCtx);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        graphqlErrors,
+        "GraphQL Validation Error"
+      );
     }
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
   }
+  if (exceptions.length > 0) {
+    for (const exception of exceptions) {
+      span.recordException(exception);
+    }
+  }
+  span.setStatus({
+    code: SpanStatusCode.ERROR,
+    message: "GraphQL Validation Error"
+  });
 }
 function createGraphQLExecuteSpan(input) {
   const span = input.tracer.startSpan(
@@ -333,33 +380,30 @@ function setGraphQLExecutionAttributes(input) {
   }
 }
 function setGraphQLExecutionResultAttributes(input) {
-  const { ctx, result } = input;
+  const { ctx, operationCtx, result } = input;
   const span = trace.getSpan(ctx);
-  if (!span) {
-    return;
-  }
-  if (input.subgraphNames?.length) {
-    span.setAttribute(
-      SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
-      input.subgraphNames
-    );
+  if (span) {
+    if (input.subgraphNames?.length) {
+      span.setAttribute(
+        SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
+        input.subgraphNames
+      );
+    }
   }
+  const operationSpan = trace.getSpan(operationCtx);
   if (!isAsyncIterable(result) && // FIXME: Handle async iterable too
   result.errors && result.errors.length > 0) {
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.errors.length);
-    span.setStatus({
+    span?.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.errors.length);
+    span?.setStatus({
       code: SpanStatusCode.ERROR,
-      message: result.errors.map((e) => e.message).join(", ")
+      message: "GraphQL Execution Error"
     });
-    const codes = [];
-    for (const error of result.errors) {
-      span.recordException(error);
-      if (error.extensions?.["code"]) {
-        codes.push(`${error.extensions["code"]}`);
-      }
-    }
-    if (codes.length > 0) {
-      span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        result.errors,
+        "GraphQL Execution Error"
+      );
     }
   }
 }
@@ -504,6 +548,70 @@ const getOperationFromDocument = (document, operationName) => {
   operationNameMap.set(operationName ?? null, operation);
   return operation;
 };
+function recordGraphqlErrors(span, errors, message) {
+  const codes = [];
+  const schemaCoordinates = [];
+  span.setStatus({
+    code: SpanStatusCode.ERROR,
+    message: message ?? "GraphQL Error"
+  });
+  span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, errors.length);
+  for (const error of errors) {
+    const attributes = attributesFromGraphqlError(error);
+    if (attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE]) {
+      codes.push(attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE]);
+    }
+    if (attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE]) {
+      schemaCoordinates.push(
+        attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE]
+      );
+    }
+    span.addEvent("graphql.error", attributes);
+  }
+  if (codes.length > 0) {
+    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+  }
+  if (schemaCoordinates.length > 0) {
+    span.setAttribute(
+      SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES,
+      schemaCoordinates
+    );
+  }
+}
+function attributesFromGraphqlError(error) {
+  const attributes = {
+    [SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE]: error.message
+  };
+  if (error.path) {
+    attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_PATH] = error.path.map(
+      (p) => p.toString()
+    );
+  }
+  if (error.locations) {
+    attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS] = error.locations.map(
+      ({ line, column }) => `${line}:${column}`
+    );
+  }
+  if (error.extensions) {
+    const code = error.extensions?.["code"];
+    if (code) {
+      const codeStr = `${code}`;
+      attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE] = codeStr;
+    }
+    const schemaCoordinate = getSchemaCoordinate(error);
+    if (schemaCoordinate) {
+      attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE] = schemaCoordinate;
+    }
+    const originalError = error.extensions["originalError"];
+    if (originalError?.stack) {
+      attributes[ATTR_EXCEPTION_STACKTRACE] = originalError.stack;
+    }
+  }
+  return attributes;
+}
+function isGraphQLError(error) {
+  return !error.name || error.name === "GraphQLError";
+}
 
 function getEnvStr(key, opts = {}) {
   const globalThat = opts.globalThis ?? globalThis;
@@ -724,7 +832,9 @@ function useOpenTelemetry(options) {
           try {
             wrapped();
           } catch (err) {
-            registerException(forOperation.otel.current, err);
+            if (err instanceof Error && !isGraphQLError(err)) {
+              registerException(forOperation.otel.current, err);
+            }
             throw err;
           } finally {
             trace.getSpan(forOperation.otel.current)?.end();
@@ -857,6 +967,9 @@ function useOpenTelemetry(options) {
           );
         }
       },
+      onPluginInit({ addPlugin }) {
+        addPlugin(useErrorCoordinate());
+      },
       onYogaInit({ yoga }) {
         pluginLogger ??= new Logger({
           writers: [
@@ -949,6 +1062,7 @@ function useOpenTelemetry(options) {
         return ({ result }) => {
           setGraphQLParseAttributes({
             ctx: getContext(state),
+            operationCtx: state.forOperation.otel.root,
             operationName: gqlCtx.params.operationName,
             query: gqlCtx.params.query?.trim(),
             result
@@ -969,6 +1083,7 @@ function useOpenTelemetry(options) {
         return ({ result }) => {
           setGraphQLValidateAttributes({
             ctx: getContext(state),
+            operationCtx: state.forOperation.otel.root,
             result,
             document: params.documentAST,
             operationName: gqlCtx.params.operationName
@@ -992,6 +1107,7 @@ function useOpenTelemetry(options) {
             setGraphQLExecutionResultAttributes({
               ctx,
               result,
+              operationCtx: state.forOperation.otel.root,
               subgraphNames: state.forOperation.subgraphNames
             });
           }
@@ -1099,4 +1215,4 @@ function resolveTracesConfig(options, useContextManager, log) {
   return traces;
 }
 
-export { SEMATTRS_GRAPHQL_DOCUMENT as S, SEMATTRS_GRAPHQL_OPERATION_TYPE as a, SEMATTRS_GRAPHQL_OPERATION_NAME as b, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH as c, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT as d, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES as e, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME as f, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES as g, getEnvBool as h, diagLogLevelFromEnv as i, getEnvStr as j, otelCtxForRequestId as o, useOpenTelemetry as u };
+export { SEMATTRS_GRAPHQL_DOCUMENT as S, SEMATTRS_GRAPHQL_OPERATION_TYPE as a, SEMATTRS_GRAPHQL_OPERATION_NAME as b, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH as c, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT as d, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES as e, SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES as f, SEMATTRS_HIVE_GRAPHQL_ERROR_CODE as g, SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE as h, SEMATTRS_HIVE_GRAPHQL_ERROR_PATH as i, SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE as j, SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS as k, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME as l, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES as m, getEnvBool as n, otelCtxForRequestId as o, diagLogLevelFromEnv as p, getEnvStr as q, useOpenTelemetry as u };

package/dist/{plugin-BsCbZ1j2.cjs → plugin-uVxk_ok_.cjs}

@@ -3,7 +3,7 @@
 var gatewayRuntime = require('@graphql-hive/gateway-runtime');
 var utils$1 = require('@graphql-mesh/utils');
 var utils = require('@graphql-tools/utils');
-var promiseHelpers = require('@whatwg-node/promise-helpers');
+var require$$2 = require('@whatwg-node/promise-helpers');
 var api$1 = require('./api.cjs');
 var api = require('@opentelemetry/api');
 var core = require('@graphql-hive/core');
@@ -11,6 +11,14 @@ var transportCommon = require('@graphql-mesh/transport-common');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 var graphql = require('graphql');
 
+function useErrorCoordinate() {
+    return {
+        onExecute({ args }) {
+            args.schemaCoordinateInErrors = true;
+        },
+    };
+}
+
 class OtelContextStack {
   #root;
   #current;
@@ -124,6 +132,12 @@ const SEMATTRS_GRAPHQL_OPERATION_NAME = "graphql.operation.name";
 const SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = "hive.graphql.operation.hash";
 const SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = "hive.graphql.error.count";
 const SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = "hive.graphql.error.codes";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = "hive.graphql.error.coordinates";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = "hive.graphql.error.code";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = "hive.graphql.error.coordinate";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = "hive.graphql.error.path";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = "hive.graphql.error.message";
+const SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = "hive.graphql.error.locations";
 const SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
 const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
 
@@ -243,7 +257,27 @@ function setGraphQLParseAttributes(input) {
     span.setAttribute(SEMATTRS_GRAPHQL_DOCUMENT, input.query);
   }
   if (input.result instanceof Error) {
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, 1);
+    if (isGraphQLError(input.result)) {
+      span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, 1);
+      span.setStatus({
+        code: api.SpanStatusCode.ERROR,
+        message: "GraphQL Parse Error"
+      });
+      const operationSpan = api.trace.getSpan(input.operationCtx);
+      if (operationSpan) {
+        recordGraphqlErrors(
+          operationSpan,
+          [input.result],
+          "GraphQL Parse Error"
+        );
+      }
+    } else {
+      span.recordException(input.result);
+      span.setStatus({
+        code: api.SpanStatusCode.ERROR,
+        message: input.result.message
+      });
+    }
   } else {
     const document = input.result;
     const operation = getOperationFromDocument(document, input.operationName);
@@ -282,21 +316,34 @@ function setGraphQLValidateAttributes(input) {
   if (result instanceof Error) {
     errors.push(result);
   }
-  if (errors.length > 0) {
+  if (errors.length === 0) {
+    return;
+  }
+  const graphqlErrors = [];
+  const exceptions = [];
+  for (const error of errors) {
+    (isGraphQLError(error) ? graphqlErrors : exceptions).push(error);
+  }
+  if (graphqlErrors.length > 0) {
     span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.length);
-    span.setStatus({
-      code: api.SpanStatusCode.ERROR,
-      message: result.map((e) => e.message).join(", ")
-    });
-    const codes = [];
-    for (const error of result) {
-      if (error.extensions?.code) {
-        codes.push(`${error.extensions.code}`);
-      }
-      span.recordException(error);
+    const operationSpan = api.trace.getSpan(input.operationCtx);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        graphqlErrors,
+        "GraphQL Validation Error"
+      );
     }
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
   }
+  if (exceptions.length > 0) {
+    for (const exception of exceptions) {
+      span.recordException(exception);
+    }
+  }
+  span.setStatus({
+    code: api.SpanStatusCode.ERROR,
+    message: "GraphQL Validation Error"
+  });
 }
 function createGraphQLExecuteSpan(input) {
   const span = input.tracer.startSpan(
@@ -335,33 +382,30 @@ function setGraphQLExecutionAttributes(input) {
   }
 }
 function setGraphQLExecutionResultAttributes(input) {
-  const { ctx, result } = input;
+  const { ctx, operationCtx, result } = input;
   const span = api.trace.getSpan(ctx);
-  if (!span) {
-    return;
-  }
-  if (input.subgraphNames?.length) {
-    span.setAttribute(
-      SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
-      input.subgraphNames
-    );
+  if (span) {
+    if (input.subgraphNames?.length) {
+      span.setAttribute(
+        SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
+        input.subgraphNames
+      );
+    }
   }
+  const operationSpan = api.trace.getSpan(operationCtx);
   if (!utils.isAsyncIterable(result) && // FIXME: Handle async iterable too
   result.errors && result.errors.length > 0) {
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.errors.length);
-    span.setStatus({
+    span?.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.errors.length);
+    span?.setStatus({
       code: api.SpanStatusCode.ERROR,
-      message: result.errors.map((e) => e.message).join(", ")
+      message: "GraphQL Execution Error"
     });
-    const codes = [];
-    for (const error of result.errors) {
-      span.recordException(error);
-      if (error.extensions?.["code"]) {
-        codes.push(`${error.extensions["code"]}`);
-      }
-    }
-    if (codes.length > 0) {
-      span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        result.errors,
+        "GraphQL Execution Error"
+      );
     }
   }
 }
@@ -506,6 +550,70 @@ const getOperationFromDocument = (document, operationName) => {
   operationNameMap.set(operationName ?? null, operation);
   return operation;
 };
+function recordGraphqlErrors(span, errors, message) {
+  const codes = [];
+  const schemaCoordinates = [];
+  span.setStatus({
+    code: api.SpanStatusCode.ERROR,
+    message: message ?? "GraphQL Error"
+  });
+  span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, errors.length);
+  for (const error of errors) {
+    const attributes = attributesFromGraphqlError(error);
+    if (attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE]) {
+      codes.push(attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE]);
+    }
+    if (attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE]) {
+      schemaCoordinates.push(
+        attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE]
+      );
+    }
+    span.addEvent("graphql.error", attributes);
+  }
+  if (codes.length > 0) {
+    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+  }
+  if (schemaCoordinates.length > 0) {
+    span.setAttribute(
+      SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES,
+      schemaCoordinates
+    );
+  }
+}
+function attributesFromGraphqlError(error) {
+  const attributes = {
+    [SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE]: error.message
+  };
+  if (error.path) {
+    attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_PATH] = error.path.map(
+      (p) => p.toString()
+    );
+  }
+  if (error.locations) {
+    attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS] = error.locations.map(
+      ({ line, column }) => `${line}:${column}`
+    );
+  }
+  if (error.extensions) {
+    const code = error.extensions?.["code"];
+    if (code) {
+      const codeStr = `${code}`;
+      attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_CODE] = codeStr;
+    }
+    const schemaCoordinate = utils.getSchemaCoordinate(error);
+    if (schemaCoordinate) {
+      attributes[SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE] = schemaCoordinate;
+    }
+    const originalError = error.extensions["originalError"];
+    if (originalError?.stack) {
+      attributes[semanticConventions.ATTR_EXCEPTION_STACKTRACE] = originalError.stack;
+    }
+  }
+  return attributes;
+}
+function isGraphQLError(error) {
+  return !error.name || error.name === "GraphQLError";
+}
 
 function getEnvStr(key, opts = {}) {
   const globalThat = opts.globalThis ?? globalThis;
@@ -640,7 +748,7 @@ function useOpenTelemetry(options) {
       },
       instrumentation: {
         request({ state: { forRequest }, request }, wrapped) {
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             preparation$.then(() => {
               if (!traces || !shouldTrace(traces.spans?.http, { request, ignoredRequests })) {
                 return wrapped();
@@ -671,7 +779,7 @@ function useOpenTelemetry(options) {
           if (!traces || !isParentEnabled(parentState) || !shouldTrace(traces.spans?.graphql, { context: gqlCtx })) {
             return wrapped();
           }
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             preparation$.then(() => {
               const ctx = getContext(parentState);
               forOperation.otel = new OtelContextStack(
@@ -726,7 +834,9 @@ function useOpenTelemetry(options) {
           try {
             wrapped();
           } catch (err) {
-            registerException(forOperation.otel.current, err);
+            if (err instanceof Error && !isGraphQLError(err)) {
+              registerException(forOperation.otel.current, err);
+            }
             throw err;
           } finally {
             api.trace.getSpan(forOperation.otel.current)?.end();
@@ -765,7 +875,7 @@ function useOpenTelemetry(options) {
           if (useContextManager) {
             wrapped = api.context.bind(forOperation.otel.current, wrapped);
           }
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             utils.fakePromise().then(wrapped).catch((err) => {
               registerException(forOperation.otel.current, err);
               throw err;
@@ -802,7 +912,7 @@ function useOpenTelemetry(options) {
           if (useContextManager) {
             wrapped = api.context.bind(forSubgraphExecution.otel.current, wrapped);
           }
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             utils.fakePromise().then(wrapped).catch((err) => {
               registerException(forSubgraphExecution.otel.current, err);
               throw err;
@@ -816,7 +926,7 @@ function useOpenTelemetry(options) {
           if (gatewayRuntime.isRetryExecutionRequest(executionRequest)) {
             state = getState(gatewayRuntime.getRetryInfo(executionRequest));
           }
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             preparation$.then(() => {
               if (!traces || !isParentEnabled(state) || !shouldTrace(traces.spans?.upstreamFetch, { executionRequest })) {
                 return wrapped();
@@ -841,7 +951,7 @@ function useOpenTelemetry(options) {
           );
         },
         schema(_, wrapped) {
-          return promiseHelpers.unfakePromise(
+          return require$$2.unfakePromise(
             preparation$.then(() => {
               if (!traces || !shouldTrace(traces.spans?.schema, null)) {
                 return wrapped();
@@ -859,6 +969,9 @@ function useOpenTelemetry(options) {
           );
         }
       },
+      onPluginInit({ addPlugin }) {
+        addPlugin(useErrorCoordinate());
+      },
       onYogaInit({ yoga }) {
         pluginLogger ??= new gatewayRuntime.Logger({
           writers: [
@@ -951,6 +1064,7 @@ function useOpenTelemetry(options) {
         return ({ result }) => {
           setGraphQLParseAttributes({
             ctx: getContext(state),
+            operationCtx: state.forOperation.otel.root,
             operationName: gqlCtx.params.operationName,
             query: gqlCtx.params.query?.trim(),
             result
@@ -971,6 +1085,7 @@ function useOpenTelemetry(options) {
         return ({ result }) => {
           setGraphQLValidateAttributes({
             ctx: getContext(state),
+            operationCtx: state.forOperation.otel.root,
             result,
             document: params.documentAST,
             operationName: gqlCtx.params.operationName
@@ -994,6 +1109,7 @@ function useOpenTelemetry(options) {
             setGraphQLExecutionResultAttributes({
               ctx,
               result,
+              operationCtx: state.forOperation.otel.root,
               subgraphNames: state.forOperation.subgraphNames
             });
           }
@@ -1106,8 +1222,14 @@ exports.SEMATTRS_GRAPHQL_OPERATION_NAME = SEMATTRS_GRAPHQL_OPERATION_NAME;
 exports.SEMATTRS_GRAPHQL_OPERATION_TYPE = SEMATTRS_GRAPHQL_OPERATION_TYPE;
 exports.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES;
 exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = SEMATTRS_HIVE_GRAPHQL_ERROR_CODE;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = SEMATTRS_HIVE_GRAPHQL_ERROR_PATH;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES;
 exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;
 exports.diagLogLevelFromEnv = diagLogLevelFromEnv;
 exports.getEnvBool = getEnvBool;

package/dist/setup.cjs

@@ -6,7 +6,7 @@ var core = require('@opentelemetry/core');
 var resources = require('@opentelemetry/resources');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
-var plugin = require('./plugin-BsCbZ1j2.cjs');
+var plugin = require('./plugin-uVxk_ok_.cjs');
 var exporterTraceOtlpHttp = require('@opentelemetry/exporter-trace-otlp-http');
 var apiLogs = require('@opentelemetry/api-logs');
 var sdkLogs = require('@opentelemetry/sdk-logs');
@@ -104,10 +104,6 @@ class HiveTracingSpanProcessor {
     if (operationSpan === span) {
       return;
     }
-    if (SPANS_WITH_ERRORS.includes(span.name)) {
-      copyAttribute(span, operationSpan, plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES);
-      copyAttribute(span, operationSpan, plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT);
-    }
     if (span.name === "graphql.execute") {
       copyAttribute(
         span,
@@ -145,11 +141,6 @@ function isOperationSpan(span) {
   const followingChar = span.name.at(17);
   return !followingChar || followingChar === " ";
 }
-const SPANS_WITH_ERRORS = [
-  "graphql.parse",
-  "graphql.validate",
-  "graphql.execute"
-];
 
 class OpenTelemetryLogWriter {
   logger;
@@ -224,10 +215,10 @@ function getContextForRequest(attributes) {
   return plugin.otelCtxForRequestId.get(attributes.requestId) ?? api.ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.2.2-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a';
 let initialized = false;
 function openTelemetrySetup(options) {
-  const log = options.log || new logger.Logger();
+  const log = !options.log || typeof options.log === "string" ? new logger.Logger({ level: options.log }) : options.log;
   if (initialized) {
     log.error(
       `${initialized.name} integration has already been initialized by ${initialized.source}`
@@ -320,7 +311,7 @@ function openTelemetrySetup(options) {
   log.info(logAttributes, logMessage);
 }
 function hiveTracingSetup(options) {
-  const log = options.log || new logger.Logger();
+  const log = !options.log || typeof options.log === "string" ? new logger.Logger({ level: options.log }) : options.log;
   options.target ??= plugin.getEnvStr("HIVE_TARGET");
   if (!options.target) {
     throw new Error(
@@ -461,8 +452,14 @@ exports.SEMATTRS_GRAPHQL_OPERATION_NAME = plugin.SEMATTRS_GRAPHQL_OPERATION_NAME
 exports.SEMATTRS_GRAPHQL_OPERATION_TYPE = plugin.SEMATTRS_GRAPHQL_OPERATION_TYPE;
 exports.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = plugin.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES;
 exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = plugin.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODE;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
 exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_PATH = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_PATH;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES;
 exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = plugin.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;
 exports.HIVE_LOG_LEVEL_NUMBERS = HIVE_LOG_LEVEL_NUMBERS;
 exports.HiveTracingSpanProcessor = HiveTracingSpanProcessor;

package/dist/setup.d.cts

@@ -2,7 +2,7 @@ import { LogWriter, LogLevel, Attributes, Logger as Logger$1 } from '@graphql-hi
 import { Context, TracerProvider, ContextManager, TextMapPropagator } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import { BufferConfig, SpanProcessor, Span, SpanLimits, SpanExporter, Sampler, GeneralLimits } from '@opentelemetry/sdk-trace-base';
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-mikIPKnv.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-BjUFTXMN.js';
 import { Logger, SeverityNumber } from '@opentelemetry/api-logs';
 import { LoggerProvider, LogRecordLimits, LogRecordProcessor, LogRecordExporter } from '@opentelemetry/sdk-logs';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
@@ -152,7 +152,7 @@ type BaseOptions = {
      * The Logger to be used by this utility.
      * A child of this logger will be used for OTEL diag API, unless `configureDiagLogger` is false
      */
-    log?: Logger$1;
+    log?: Logger$1 | false | LogLevel;
     /**
      * Configure Opentelemetry `diag` API to use Gateway's logger.
      *

package/dist/setup.d.ts

@@ -2,7 +2,7 @@ import { LogWriter, LogLevel, Attributes, Logger as Logger$1 } from '@graphql-hi
 import { Context, TracerProvider, ContextManager, TextMapPropagator } from '@opentelemetry/api';
 import { Resource } from '@opentelemetry/resources';
 import { BufferConfig, SpanProcessor, Span, SpanLimits, SpanExporter, Sampler, GeneralLimits } from '@opentelemetry/sdk-trace-base';
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-mikIPKnv.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes-BjUFTXMN.js';
 import { Logger, SeverityNumber } from '@opentelemetry/api-logs';
 import { LoggerProvider, LogRecordLimits, LogRecordProcessor, LogRecordExporter } from '@opentelemetry/sdk-logs';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
@@ -152,7 +152,7 @@ type BaseOptions = {
      * The Logger to be used by this utility.
      * A child of this logger will be used for OTEL diag API, unless `configureDiagLogger` is false
      */
-    log?: Logger$1;
+    log?: Logger$1 | false | LogLevel;
     /**
      * Configure Opentelemetry `diag` API to use Gateway's logger.
      *

package/dist/setup.js

@@ -5,8 +5,8 @@ import { resourceFromAttributes } from '@opentelemetry/resources';
 import { BatchSpanProcessor, SimpleSpanProcessor, ConsoleSpanExporter, BasicTracerProvider, ParentBasedSampler, AlwaysOnSampler, TraceIdRatioBasedSampler } from '@opentelemetry/sdk-trace-base';
 import { SEMATTRS_HTTP_METHOD, ATTR_SERVICE_VERSION, ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
 export { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION, SEMATTRS_HTTP_CLIENT_IP, SEMATTRS_HTTP_HOST, SEMATTRS_HTTP_METHOD, SEMATTRS_HTTP_ROUTE, SEMATTRS_HTTP_SCHEME, SEMATTRS_HTTP_SERVER_NAME, SEMATTRS_HTTP_STATUS_CODE, SEMATTRS_HTTP_URL, SEMATTRS_HTTP_USER_AGENT, SEMATTRS_NET_HOST_NAME } from '@opentelemetry/semantic-conventions';
-import { e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, g as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, o as otelCtxForRequestId, h as getEnvBool, i as diagLogLevelFromEnv, j as getEnvStr } from './plugin-DSqlDQ_l.js';
-export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, f as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './plugin-DSqlDQ_l.js';
+import { m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, o as otelCtxForRequestId, n as getEnvBool, p as diagLogLevelFromEnv, q as getEnvStr } from './plugin-CW1kfhP8.js';
+export { S as SEMATTRS_GRAPHQL_DOCUMENT, b as SEMATTRS_GRAPHQL_OPERATION_NAME, a as SEMATTRS_GRAPHQL_OPERATION_TYPE, l as SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, g as SEMATTRS_HIVE_GRAPHQL_ERROR_CODE, e as SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, d as SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, k as SEMATTRS_HIVE_GRAPHQL_ERROR_LOCATIONS, j as SEMATTRS_HIVE_GRAPHQL_ERROR_MESSAGE, i as SEMATTRS_HIVE_GRAPHQL_ERROR_PATH, h as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATE, f as SEMATTRS_HIVE_GRAPHQL_ERROR_SCHEMA_COORDINATES, c as SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './plugin-CW1kfhP8.js';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
 import { SeverityNumber, logs } from '@opentelemetry/api-logs';
 import { BatchLogRecordProcessor, SimpleLogRecordProcessor, ConsoleLogRecordExporter, LoggerProvider } from '@opentelemetry/sdk-logs';
@@ -104,10 +104,6 @@ class HiveTracingSpanProcessor {
     if (operationSpan === span) {
       return;
     }
-    if (SPANS_WITH_ERRORS.includes(span.name)) {
-      copyAttribute(span, operationSpan, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES);
-      copyAttribute(span, operationSpan, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT);
-    }
     if (span.name === "graphql.execute") {
       copyAttribute(
         span,
@@ -145,11 +141,6 @@ function isOperationSpan(span) {
   const followingChar = span.name.at(17);
   return !followingChar || followingChar === " ";
 }
-const SPANS_WITH_ERRORS = [
-  "graphql.parse",
-  "graphql.validate",
-  "graphql.execute"
-];
 
 class OpenTelemetryLogWriter {
   logger;
@@ -224,10 +215,10 @@ function getContextForRequest(attributes) {
   return otelCtxForRequestId.get(attributes.requestId) ?? ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.2.2-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a';
 let initialized = false;
 function openTelemetrySetup(options) {
-  const log = options.log || new Logger();
+  const log = !options.log || typeof options.log === "string" ? new Logger({ level: options.log }) : options.log;
   if (initialized) {
     log.error(
       `${initialized.name} integration has already been initialized by ${initialized.source}`
@@ -320,7 +311,7 @@ function openTelemetrySetup(options) {
   log.info(logAttributes, logMessage);
 }
 function hiveTracingSetup(options) {
-  const log = options.log || new Logger();
+  const log = !options.log || typeof options.log === "string" ? new Logger({ level: options.log }) : options.log;
   options.target ??= getEnvStr("HIVE_TARGET");
   if (!options.target) {
     throw new Error(
@@ -408,4 +399,4 @@ function disable() {
   initialized = false;
 }
 
-export { HIVE_LOG_LEVEL_NUMBERS, HiveTracingSpanProcessor, OpenTelemetryLogWriter, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, disable, getContextForRequest, hiveTracingSetup, openTelemetrySetup };
+export { HIVE_LOG_LEVEL_NUMBERS, HiveTracingSpanProcessor, OpenTelemetryLogWriter, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, disable, getContextForRequest, hiveTracingSetup, openTelemetrySetup };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/plugin-opentelemetry",
-  "version": "1.2.2-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8",
+  "version": "1.3.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a",
   "type": "module",
   "repository": {
     "type": "git",
@@ -63,12 +63,13 @@
   },
   "dependencies": {
     "@graphql-hive/core": "^0.15.1",
-    "@graphql-hive/gateway-runtime": "2.3.6-rc-70ab4bd21a7f4dd67d993b256d03184f5f6129d8",
+    "@graphql-hive/gateway-runtime": "2.4.0-alpha-10edca19a47a0212f09bb75e24751faa4186544a",
     "@graphql-hive/logger": "^1.0.9",
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/transport-common": "^1.0.12",
     "@graphql-mesh/types": "^0.104.16",
     "@graphql-mesh/utils": "^0.104.16",
+    "@graphql-tools/executor": "^1.4.9",
     "@graphql-tools/utils": "^10.10.3",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/api-logs": "^0.208.0",
@@ -89,7 +90,7 @@
   "devDependencies": {
     "@whatwg-node/server": "^0.10.17",
     "graphql": "^16.12.0",
-    "graphql-yoga": "^5.16.2",
+    "graphql-yoga": "^5.17.0",
     "pkgroll": "2.21.3",
     "rimraf": "^6.1.0",
     "rollup": "^4.53.2",

package/dist/attributes-mikIPKnv.d.ts

@@ -1,10 +0,0 @@
-declare const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
-declare const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
-declare const SEMATTRS_GRAPHQL_OPERATION_NAME = "graphql.operation.name";
-declare const SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = "hive.graphql.operation.hash";
-declare const SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = "hive.graphql.error.count";
-declare const SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = "hive.graphql.error.codes";
-declare const SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
-declare const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
-
-export { SEMATTRS_GRAPHQL_DOCUMENT as S, SEMATTRS_GRAPHQL_OPERATION_TYPE as a, SEMATTRS_GRAPHQL_OPERATION_NAME as b, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH as c, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT as d, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES as e, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME as f, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES as g };