@graphql-hive/plugin-opentelemetry 1.3.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed → 1.3.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/plugin-opentelemetry
 
-## 1.3.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed
+## 1.3.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7
 ### Minor Changes
 
 
@@ -9,16 +9,33 @@
 
 
 
-- [#1791](https://github.com/graphql-hive/gateway/pull/1791) [`890e234`](https://github.com/graphql-hive/gateway/commit/890e2341fd5496d95ff75411a0fd8c717d6639ed) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Added `@graphql-hive/plugin-opentelemetry/attributes` module entrypoint exposing graphql and hive
-  specific attributes. This was already exposed by the default entrypoint, but it now also has its own one.
+- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`bdb8517`](https://github.com/graphql-hive/gateway/commit/bdb8517788aa416d7de441d90f849b181c2d11d8) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Expose GraphQLError as OpenTelemetry Events.
   
-  This fixes an issue with some bundler (like vite) that doesn't support importing non existent `.js`
-  when only a `.d.ts` file exists.
+  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
 
-- Updated dependencies [[`15b9e50`](https://github.com/graphql-hive/gateway/commit/15b9e5037fa74f8c1a8e662e196268a88642c27d), [`abd350b`](https://github.com/graphql-hive/gateway/commit/abd350b913c8938cf173a4a5e25b3ba6c04016fc), [`a50d93a`](https://github.com/graphql-hive/gateway/commit/a50d93a0bc8f3c67de7449ad9102d3f3b60ea96a)]:
-  - @graphql-hive/gateway-runtime@2.5.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed
+
+
+- [#1636](https://github.com/graphql-hive/gateway/pull/1636) [`a71b9f0`](https://github.com/graphql-hive/gateway/commit/a71b9f0a80e0d3c30b40593d8f79547f349a34bd) 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`)
+- Updated dependencies [[`31fe4be`](https://github.com/graphql-hive/gateway/commit/31fe4be41532db18a66b30eeb9272a6e536d8a89), [`15b9e50`](https://github.com/graphql-hive/gateway/commit/15b9e5037fa74f8c1a8e662e196268a88642c27d), [`abd350b`](https://github.com/graphql-hive/gateway/commit/abd350b913c8938cf173a4a5e25b3ba6c04016fc), [`bdb8517`](https://github.com/graphql-hive/gateway/commit/bdb8517788aa416d7de441d90f849b181c2d11d8), [`a50d93a`](https://github.com/graphql-hive/gateway/commit/a50d93a0bc8f3c67de7449ad9102d3f3b60ea96a)]:
+  - @graphql-hive/gateway-runtime@2.5.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7
 
 ## 1.2.5
 ### 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,8 +1,7 @@
 'use strict';
 
-var plugin = require('./plugin-CqZ6vopT.cjs');
+var plugin = require('./plugin-BRkOARbT.cjs');
 var api = require('@opentelemetry/api');
-var attributes = require('./attributes.cjs');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 require('@graphql-hive/gateway-runtime');
 require('@graphql-mesh/utils');
@@ -15,19 +14,25 @@ require('graphql');
 
 
 
+exports.SEMATTRS_GRAPHQL_DOCUMENT = plugin.SEMATTRS_GRAPHQL_DOCUMENT;
+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", {
   enumerable: true,
   get: function () { return api.DiagLogLevel; }
 });
-exports.SEMATTRS_GRAPHQL_DOCUMENT = attributes.SEMATTRS_GRAPHQL_DOCUMENT;
-exports.SEMATTRS_GRAPHQL_OPERATION_NAME = attributes.SEMATTRS_GRAPHQL_OPERATION_NAME;
-exports.SEMATTRS_GRAPHQL_OPERATION_TYPE = attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE;
-exports.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = attributes.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES;
-exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = attributes.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME;
-exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
-exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
-exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = attributes.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;
 Object.defineProperty(exports, "ATTR_SERVICE_NAME", {
   enumerable: true,
   get: function () { return semanticConventions.ATTR_SERVICE_NAME; }

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 { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.cjs';
+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 { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.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,6 +1,5 @@
-export { u as useOpenTelemetry } from './plugin-Bp3r09vK.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-DXgE1GBh.js';
 export { DiagLogLevel as OpenTelemetryDiagLogLevel } from '@opentelemetry/api';
-export { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.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-mesh/utils';

package/dist/{plugin-CqZ6vopT.cjs → plugin-BRkOARbT.cjs}

@@ -3,14 +3,21 @@
 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');
 var transportCommon = require('@graphql-mesh/transport-common');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 var graphql = require('graphql');
-var attributes = require('./attributes.cjs');
+
+function useErrorCoordinate() {
+    return {
+        onExecute({ args }) {
+            args.schemaCoordinateInErrors = true;
+        },
+    };
+}
 
 class OtelContextStack {
   #root;
@@ -119,6 +126,21 @@ function getRetryInfo(executionRequest) {
   return executionRequest[RETRY_SYMBOL];
 }
 
+const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
+const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
+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";
+
 function createHttpSpan(input) {
   const { url, request, tracer } = input;
   const span = tracer.startSpan(
@@ -172,9 +194,9 @@ function setParamsAttributes(input) {
   if (!span) {
     return;
   }
-  span.setAttribute(attributes.SEMATTRS_GRAPHQL_DOCUMENT, params.query ?? "<undefined>");
+  span.setAttribute(SEMATTRS_GRAPHQL_DOCUMENT, params.query ?? "<undefined>");
   if (params.operationName) {
-    span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_NAME, params.operationName);
+    span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_NAME, params.operationName);
   }
 }
 const typeInfos = /* @__PURE__ */ new WeakMap();
@@ -196,13 +218,13 @@ function setDocumentAttributesOnOperationSpan(input) {
   const { ctx, document } = input;
   const span = api.trace.getSpan(ctx);
   if (span) {
-    span.setAttribute(attributes.SEMATTRS_GRAPHQL_DOCUMENT, transportCommon.defaultPrintFn(document));
+    span.setAttribute(SEMATTRS_GRAPHQL_DOCUMENT, transportCommon.defaultPrintFn(document));
     const operation = getOperationFromDocument(document, input.operationName);
     if (operation) {
-      span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
+      span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
       const operationName = operation.name?.value;
       if (operationName) {
-        span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
+        span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
         span.updateName(`graphql.operation ${operationName}`);
       }
     }
@@ -232,18 +254,38 @@ function setGraphQLParseAttributes(input) {
     return;
   }
   if (input.query) {
-    span.setAttribute(attributes.SEMATTRS_GRAPHQL_DOCUMENT, input.query);
+    span.setAttribute(SEMATTRS_GRAPHQL_DOCUMENT, input.query);
   }
   if (input.result instanceof Error) {
-    span.setAttribute(attributes.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);
     if (operation) {
-      span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
+      span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
       const operationName = operation.name?.value;
       if (operationName) {
-        span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
+        span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
       }
     }
   }
@@ -265,30 +307,43 @@ function setGraphQLValidateAttributes(input) {
   const operation = getOperationFromDocument(document, input.operationName);
   if (operation) {
     const operationName = operation.name?.value;
-    span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
+    span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
     if (operationName) {
-      span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
+      span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
     }
   }
   const errors = Array.isArray(result) ? result : [];
   if (result instanceof Error) {
     errors.push(result);
   }
-  if (errors.length > 0) {
-    span.setAttribute(attributes.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);
+  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);
+    const operationSpan = api.trace.getSpan(input.operationCtx);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        graphqlErrors,
+        "GraphQL Validation Error"
+      );
     }
-    span.setAttribute(attributes.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(
@@ -309,7 +364,7 @@ function setGraphQLExecutionAttributes(input) {
   if (operationSpan) {
     const hash = hashOperationFn?.({ ...args });
     if (hash) {
-      operationSpan.setAttribute(attributes.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH, hash);
+      operationSpan.setAttribute(SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH, hash);
     }
   }
   const span = api.trace.getSpan(ctx);
@@ -320,40 +375,37 @@ function setGraphQLExecutionAttributes(input) {
     args.document,
     args.operationName
   );
-  span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
+  span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_TYPE, operation.operation);
   const operationName = operation.name?.value;
   if (operationName) {
-    span.setAttribute(attributes.SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
+    span.setAttribute(SEMATTRS_GRAPHQL_OPERATION_NAME, operationName);
   }
 }
 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(
-      attributes.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(attributes.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(attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+    if (operationSpan) {
+      recordGraphqlErrors(
+        operationSpan,
+        result.errors,
+        "GraphQL Execution Error"
+      );
     }
   }
 }
@@ -366,12 +418,12 @@ function createSubgraphExecuteSpan(input) {
     `subgraph.execute (${input.subgraphName})`,
     {
       attributes: {
-        [attributes.SEMATTRS_GRAPHQL_OPERATION_NAME]: operation.name?.value,
-        [attributes.SEMATTRS_GRAPHQL_DOCUMENT]: transportCommon.defaultPrintFn(
+        [SEMATTRS_GRAPHQL_OPERATION_NAME]: operation.name?.value,
+        [SEMATTRS_GRAPHQL_DOCUMENT]: transportCommon.defaultPrintFn(
           input.executionRequest.document
         ),
-        [attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
-        [attributes.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
+        [SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
+        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
       },
       kind: api.SpanKind.CLIENT
     },
@@ -498,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;
@@ -632,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();
@@ -663,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(
@@ -718,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();
@@ -757,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;
@@ -794,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;
@@ -808,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();
@@ -833,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();
@@ -851,6 +969,9 @@ function useOpenTelemetry(options) {
           );
         }
       },
+      onPluginInit({ addPlugin }) {
+        addPlugin(useErrorCoordinate());
+      },
       onYogaInit({ yoga }) {
         pluginLogger ??= new gatewayRuntime.Logger({
           writers: [
@@ -943,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
@@ -963,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
@@ -986,6 +1109,7 @@ function useOpenTelemetry(options) {
             setGraphQLExecutionResultAttributes({
               ctx,
               result,
+              operationCtx: state.forOperation.otel.root,
               subgraphNames: state.forOperation.subgraphNames
             });
           }
@@ -1093,6 +1217,20 @@ function resolveTracesConfig(options, useContextManager, log) {
   return traces;
 }
 
+exports.SEMATTRS_GRAPHQL_DOCUMENT = SEMATTRS_GRAPHQL_DOCUMENT;
+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;
 exports.getEnvStr = getEnvStr;

package/dist/{plugin-Bp3r09vK.js → plugin-DXgE1GBh.js}

@@ -1,14 +1,21 @@
 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';
-import { SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME } from './attributes.js';
+
+function useErrorCoordinate() {
+    return {
+        onExecute({ args }) {
+            args.schemaCoordinateInErrors = true;
+        },
+    };
+}
 
 class OtelContextStack {
   #root;
@@ -117,6 +124,21 @@ function getRetryInfo(executionRequest) {
   return executionRequest[RETRY_SYMBOL];
 }
 
+const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
+const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
+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";
+
 function createHttpSpan(input) {
   const { url, request, tracer } = input;
   const span = tracer.startSpan(
@@ -233,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);
@@ -272,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"
+      );
+    }
+  }
+  if (exceptions.length > 0) {
+    for (const exception of exceptions) {
+      span.recordException(exception);
     }
-    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
   }
+  span.setStatus({
+    code: SpanStatusCode.ERROR,
+    message: "GraphQL Validation Error"
+  });
 }
 function createGraphQLExecuteSpan(input) {
   const span = input.tracer.startSpan(
@@ -325,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"
+      );
     }
   }
 }
@@ -496,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;
@@ -716,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();
@@ -849,6 +967,9 @@ function useOpenTelemetry(options) {
           );
         }
       },
+      onPluginInit({ addPlugin }) {
+        addPlugin(useErrorCoordinate());
+      },
       onYogaInit({ yoga }) {
         pluginLogger ??= new Logger({
           writers: [
@@ -941,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
@@ -961,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
@@ -984,6 +1107,7 @@ function useOpenTelemetry(options) {
             setGraphQLExecutionResultAttributes({
               ctx,
               result,
+              operationCtx: state.forOperation.otel.root,
               subgraphNames: state.forOperation.subgraphNames
             });
           }
@@ -1091,4 +1215,4 @@ function resolveTracesConfig(options, useContextManager, log) {
   return traces;
 }
 
-export { getEnvStr as a, diagLogLevelFromEnv as d, getEnvBool as g, 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/setup.cjs

@@ -6,9 +6,8 @@ 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-CqZ6vopT.cjs');
+var plugin = require('./plugin-BRkOARbT.cjs');
 var exporterTraceOtlpHttp = require('@opentelemetry/exporter-trace-otlp-http');
-var attributes = require('./attributes.cjs');
 var apiLogs = require('@opentelemetry/api-logs');
 var sdkLogs = require('@opentelemetry/sdk-logs');
 require('@graphql-hive/gateway-runtime');
@@ -105,15 +104,11 @@ class HiveTracingSpanProcessor {
     if (operationSpan === span) {
       return;
     }
-    if (SPANS_WITH_ERRORS.includes(span.name)) {
-      copyAttribute(span, operationSpan, attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES);
-      copyAttribute(span, operationSpan, attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT);
-    }
     if (span.name === "graphql.execute") {
       copyAttribute(
         span,
         operationSpan,
-        attributes.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES
+        plugin.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES
       );
     }
     const subgraphExecution = traceState.subgraphExecutions.get(spanId);
@@ -146,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;
@@ -225,10 +215,10 @@ function getContextForRequest(attributes) {
   return plugin.otelCtxForRequestId.get(attributes.requestId) ?? api.ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7';
 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}`
@@ -321,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(
@@ -457,14 +447,20 @@ Object.defineProperty(exports, "SEMATTRS_NET_HOST_NAME", {
   enumerable: true,
   get: function () { return semanticConventions.SEMATTRS_NET_HOST_NAME; }
 });
-exports.SEMATTRS_GRAPHQL_DOCUMENT = attributes.SEMATTRS_GRAPHQL_DOCUMENT;
-exports.SEMATTRS_GRAPHQL_OPERATION_NAME = attributes.SEMATTRS_GRAPHQL_OPERATION_NAME;
-exports.SEMATTRS_GRAPHQL_OPERATION_TYPE = attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE;
-exports.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = attributes.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES;
-exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = attributes.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME;
-exports.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES = attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
-exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
-exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = attributes.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;
+exports.SEMATTRS_GRAPHQL_DOCUMENT = plugin.SEMATTRS_GRAPHQL_DOCUMENT;
+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;
 exports.OpenTelemetryLogWriter = OpenTelemetryLogWriter;

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 { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.cjs';
+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 { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.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,10 +5,9 @@ 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 { o as otelCtxForRequestId, g as getEnvBool, d as diagLogLevelFromEnv, a as getEnvStr } from './plugin-Bp3r09vK.js';
+import { m as SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, o as otelCtxForRequestId, n as getEnvBool, p as diagLogLevelFromEnv, q as getEnvStr } from './plugin-DXgE1GBh.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-DXgE1GBh.js';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES } from './attributes.js';
-export { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH } from './attributes.js';
 import { SeverityNumber, logs } from '@opentelemetry/api-logs';
 import { BatchLogRecordProcessor, SimpleLogRecordProcessor, ConsoleLogRecordExporter, LoggerProvider } from '@opentelemetry/sdk-logs';
 import '@graphql-hive/gateway-runtime';
@@ -105,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,
@@ -146,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;
@@ -225,10 +215,10 @@ function getContextForRequest(attributes) {
   return otelCtxForRequestId.get(attributes.requestId) ?? ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7';
 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}`
@@ -321,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(
@@ -409,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.3.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed",
+  "version": "1.3.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7",
   "type": "module",
   "repository": {
     "type": "git",
@@ -49,16 +49,6 @@
         "default": "./dist/api.js"
       }
     },
-    "./attributes": {
-      "require": {
-        "types": "./dist/attributes.d.cts",
-        "default": "./dist/attributes.cjs"
-      },
-      "import": {
-        "types": "./dist/attributes.d.ts",
-        "default": "./dist/attributes.js"
-      }
-    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -73,12 +63,13 @@
   },
   "dependencies": {
     "@graphql-hive/core": "^0.18.0",
-    "@graphql-hive/gateway-runtime": "2.5.0-alpha-890e2341fd5496d95ff75411a0fd8c717d6639ed",
+    "@graphql-hive/gateway-runtime": "2.5.0-alpha-64ccb74c470e010e18f890a3fd4afc34094275a7",
     "@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",
@@ -99,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.4",
     "rimraf": "^6.1.0",
     "rollup": "^4.53.2",

package/dist/attributes.cjs

@@ -1,69 +0,0 @@
-'use strict';
-
-var semanticConventions = require('@opentelemetry/semantic-conventions');
-
-const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
-const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
-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_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
-const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
-
-Object.defineProperty(exports, "ATTR_SERVICE_NAME", {
-  enumerable: true,
-  get: function () { return semanticConventions.ATTR_SERVICE_NAME; }
-});
-Object.defineProperty(exports, "ATTR_SERVICE_VERSION", {
-  enumerable: true,
-  get: function () { return semanticConventions.ATTR_SERVICE_VERSION; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_CLIENT_IP", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_CLIENT_IP; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_HOST", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_HOST; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_METHOD", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_METHOD; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_ROUTE", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_ROUTE; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_SCHEME", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_SCHEME; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_SERVER_NAME", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_SERVER_NAME; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_STATUS_CODE", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_STATUS_CODE; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_URL", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_URL; }
-});
-Object.defineProperty(exports, "SEMATTRS_HTTP_USER_AGENT", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_HTTP_USER_AGENT; }
-});
-Object.defineProperty(exports, "SEMATTRS_NET_HOST_NAME", {
-  enumerable: true,
-  get: function () { return semanticConventions.SEMATTRS_NET_HOST_NAME; }
-});
-exports.SEMATTRS_GRAPHQL_DOCUMENT = SEMATTRS_GRAPHQL_DOCUMENT;
-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_CODES = SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
-exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
-exports.SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH = SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH;

package/dist/attributes.d.cts

@@ -1,12 +0,0 @@
-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';
-
-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, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH };

package/dist/attributes.d.ts

@@ -1,12 +0,0 @@
-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';
-
-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, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH };

package/dist/attributes.js

@@ -1,12 +0,0 @@
-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';
-
-const SEMATTRS_GRAPHQL_DOCUMENT = "graphql.document";
-const SEMATTRS_GRAPHQL_OPERATION_TYPE = "graphql.operation.type";
-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_GATEWAY_UPSTREAM_SUBGRAPH_NAME = "hive.gateway.upstream.subgraph.name";
-const SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES = "hive.gateway.operation.subgraph.names";
-
-export { SEMATTRS_GRAPHQL_DOCUMENT, SEMATTRS_GRAPHQL_OPERATION_NAME, SEMATTRS_GRAPHQL_OPERATION_TYPE, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GRAPHQL_OPERATION_HASH };