@graphql-hive/plugin-opentelemetry 1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489 → 1.3.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/plugin-opentelemetry
 
-## 1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489
+## 1.3.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9
 ### Minor Changes
 
 
@@ -8,21 +8,10 @@
 - [#1786](https://github.com/graphql-hive/gateway/pull/1786) [`abd350b`](https://github.com/graphql-hive/gateway/commit/abd350b913c8938cf173a4a5e25b3ba6c04016fc) Thanks [@ardatan](https://github.com/ardatan)! - Respect both \`graphql-client-name\` and \`x-graphql-client-name\` for client name header, and both \`graphql-client-version\` and \`x-graphql-client-version\` for client version header by default if not configured otherwise.
 
 
-
-- [#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.
-  
-  This fixes an issue with some bundler (like vite) that doesn't support importing non existent `.js`
-  when only a `.d.ts` file exists.
-
 ### Patch Changes
 
-
-
-- [#1791](https://github.com/graphql-hive/gateway/pull/1791) [`065c985`](https://github.com/graphql-hive/gateway/commit/065c98509976ecc326c425600bec35f256fe2316) Thanks [@EmrysMyrddin](https://github.com/EmrysMyrddin)! - Fix http span filter function that was not taken in account
-
 - 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-125a7b3091e929eb65f014c2f62b14b609016489
+  - @graphql-hive/gateway-runtime@2.5.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9
 
 ## 1.2.5
 ### Patch Changes

package/dist/attributes-mikIPKnv.d.ts

@@ -0,0 +1,10 @@
+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 };

package/dist/index.cjs

@@ -1,8 +1,7 @@
 'use strict';
 
-var plugin = require('./plugin-DqVaQukh.cjs');
+var plugin = require('./plugin-DOyRaHdT.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,23 +14,19 @@ 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_CODES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
+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;
-exports.SEMATTRS_HIVE_REQUEST_ID = attributes.SEMATTRS_HIVE_REQUEST_ID;
-exports.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION;
-exports.SEMATTRS_IS_HIVE_REQUEST = attributes.SEMATTRS_IS_HIVE_REQUEST;
-exports.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION;
 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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION } from './attributes.cjs';
+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 { 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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION } from './attributes.js';
+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 { 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-7AW98S14.js';
+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-CepZPqbb.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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION } 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-7AW98S14.js → plugin-CepZPqbb.js}

@@ -3,7 +3,6 @@ import { getHeadersObj } from '@graphql-mesh/utils';
 import { isAsyncIterable, getOperationASTFromDocument, fakePromise } from '@graphql-tools/utils';
 import { unfakePromise } from '@whatwg-node/promise-helpers';
 import { hive } from './api.js';
-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_IS_HIVE_SUBGRAPH_EXECUTION, SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_HIVE_REQUEST_ID } from './attributes.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';
@@ -117,6 +116,15 @@ 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_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(
@@ -132,8 +140,7 @@ function createHttpSpan(input) {
         [SEMATTRS_HTTP_CLIENT_IP]: request.headers.get("x-forwarded-for")?.split(",")[0],
         [SEMATTRS_HTTP_USER_AGENT]: request.headers.get("user-agent") || void 0,
         "hive.client.name": request.headers.get("graphql-client-name") || request.headers.get("x-graphql-client-name") || void 0,
-        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0,
-        [SEMATTRS_IS_HIVE_REQUEST]: true
+        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0
       },
       kind: SpanKind.SERVER
     },
@@ -160,10 +167,7 @@ function setResponseAttributes(ctx, response) {
 function createGraphQLSpan(input) {
   const span = input.tracer.startSpan(
     `graphql.operation`,
-    {
-      kind: SpanKind.INTERNAL,
-      attributes: { [SEMATTRS_IS_HIVE_GRAPHQL_OPERATION]: true }
-    },
+    { kind: SpanKind.INTERNAL },
     input.ctx
   );
   return trace.setSpan(input.ctx, span);
@@ -373,8 +377,7 @@ function createSubgraphExecuteSpan(input) {
           input.executionRequest.document
         ),
         [SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
-        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName,
-        [SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]: true
+        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
       },
       kind: SpanKind.CLIENT
     },
@@ -879,9 +882,6 @@ function useOpenTelemetry(options) {
             ]
           );
           if (typeof requestId === "string") {
-            const httpCtx = state.forRequest.otel?.root;
-            const httpSpan = httpCtx && trace.getSpan(httpCtx);
-            httpSpan?.setAttribute(SEMATTRS_HIVE_REQUEST_ID, requestId);
             otelCtxForRequestId.set(requestId, getContext(state));
           }
         }
@@ -1085,7 +1085,7 @@ function resolveTracesConfig(options, useContextManager, log) {
   }
   let traces = typeof options.traces === "object" ? options.traces : {};
   traces.spans ??= {};
-  if ((traces.spans.http ?? true) === true) {
+  if (traces.spans.http ?? true) {
     traces.spans = { ...traces.spans, http: defaultHttpFilter };
   }
   if (!useContextManager) {
@@ -1099,4 +1099,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_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 };

package/dist/{plugin-DqVaQukh.cjs → plugin-DOyRaHdT.cjs}

@@ -5,7 +5,6 @@ var utils$1 = require('@graphql-mesh/utils');
 var utils = require('@graphql-tools/utils');
 var promiseHelpers = require('@whatwg-node/promise-helpers');
 var api$1 = require('./api.cjs');
-var attributes = require('./attributes.cjs');
 var api = require('@opentelemetry/api');
 var core = require('@graphql-hive/core');
 var transportCommon = require('@graphql-mesh/transport-common');
@@ -119,6 +118,15 @@ 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_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(
@@ -134,8 +142,7 @@ function createHttpSpan(input) {
         [semanticConventions.SEMATTRS_HTTP_CLIENT_IP]: request.headers.get("x-forwarded-for")?.split(",")[0],
         [semanticConventions.SEMATTRS_HTTP_USER_AGENT]: request.headers.get("user-agent") || void 0,
         "hive.client.name": request.headers.get("graphql-client-name") || request.headers.get("x-graphql-client-name") || void 0,
-        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0,
-        [attributes.SEMATTRS_IS_HIVE_REQUEST]: true
+        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0
       },
       kind: api.SpanKind.SERVER
     },
@@ -162,10 +169,7 @@ function setResponseAttributes(ctx, response) {
 function createGraphQLSpan(input) {
   const span = input.tracer.startSpan(
     `graphql.operation`,
-    {
-      kind: api.SpanKind.INTERNAL,
-      attributes: { [attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION]: true }
-    },
+    { kind: api.SpanKind.INTERNAL },
     input.ctx
   );
   return api.trace.setSpan(input.ctx, span);
@@ -176,9 +180,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();
@@ -200,13 +204,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}`);
       }
     }
@@ -236,18 +240,18 @@ 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);
+    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, 1);
   } 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);
       }
     }
   }
@@ -269,9 +273,9 @@ 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 : [];
@@ -279,7 +283,7 @@ function setGraphQLValidateAttributes(input) {
     errors.push(result);
   }
   if (errors.length > 0) {
-    span.setAttribute(attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.length);
+    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.length);
     span.setStatus({
       code: api.SpanStatusCode.ERROR,
       message: result.map((e) => e.message).join(", ")
@@ -291,7 +295,7 @@ function setGraphQLValidateAttributes(input) {
       }
       span.recordException(error);
     }
-    span.setAttribute(attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+    span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
   }
 }
 function createGraphQLExecuteSpan(input) {
@@ -313,7 +317,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);
@@ -324,10 +328,10 @@ 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) {
@@ -338,13 +342,13 @@ function setGraphQLExecutionResultAttributes(input) {
   }
   if (input.subgraphNames?.length) {
     span.setAttribute(
-      attributes.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
+      SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES,
       input.subgraphNames
     );
   }
   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.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, result.errors.length);
     span.setStatus({
       code: api.SpanStatusCode.ERROR,
       message: result.errors.map((e) => e.message).join(", ")
@@ -357,7 +361,7 @@ function setGraphQLExecutionResultAttributes(input) {
       }
     }
     if (codes.length > 0) {
-      span.setAttribute(attributes.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
+      span.setAttribute(SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, codes);
     }
   }
 }
@@ -370,13 +374,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,
-        [attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]: true
+        [SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
+        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
       },
       kind: api.SpanKind.CLIENT
     },
@@ -881,9 +884,6 @@ function useOpenTelemetry(options) {
             ]
           );
           if (typeof requestId === "string") {
-            const httpCtx = state.forRequest.otel?.root;
-            const httpSpan = httpCtx && api.trace.getSpan(httpCtx);
-            httpSpan?.setAttribute(attributes.SEMATTRS_HIVE_REQUEST_ID, requestId);
             otelCtxForRequestId.set(requestId, getContext(state));
           }
         }
@@ -1087,7 +1087,7 @@ function resolveTracesConfig(options, useContextManager, log) {
   }
   let traces = typeof options.traces === "object" ? options.traces : {};
   traces.spans ??= {};
-  if ((traces.spans.http ?? true) === true) {
+  if (traces.spans.http ?? true) {
     traces.spans = { ...traces.spans, http: defaultHttpFilter };
   }
   if (!useContextManager) {
@@ -1101,6 +1101,14 @@ 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_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;
 exports.diagLogLevelFromEnv = diagLogLevelFromEnv;
 exports.getEnvBool = getEnvBool;
 exports.getEnvStr = getEnvStr;

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-DqVaQukh.cjs');
+var plugin = require('./plugin-DOyRaHdT.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');
@@ -58,6 +57,7 @@ class HiveTracingSpanProcessor {
       return;
     }
     if (isOperationSpan(span)) {
+      span.setAttribute("hive.graphql", true);
       traceState?.operationRoots.set(spanId, span);
       return;
     }
@@ -65,7 +65,7 @@ class HiveTracingSpanProcessor {
     if (operationRoot) {
       traceState.operationRoots.set(spanId, operationRoot);
     }
-    if (span.attributes[attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]) {
+    if (span.name.startsWith("subgraph.execute")) {
       traceState.subgraphExecutions.set(spanId, span);
       return;
     }
@@ -105,14 +105,14 @@ class HiveTracingSpanProcessor {
       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);
+      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,
         operationSpan,
-        attributes.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES
+        plugin.SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES
       );
     }
     const subgraphExecution = traceState.subgraphExecutions.get(spanId);
@@ -133,14 +133,18 @@ class HiveTracingSpanProcessor {
   }
 }
 function isHttpSpan(span) {
-  return !!span.attributes[attributes.SEMATTRS_IS_HIVE_REQUEST];
-}
-function isOperationSpan(span) {
-  return !!span.attributes[attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION];
+  return !!span.attributes[semanticConventions.SEMATTRS_HTTP_METHOD];
 }
 function copyAttribute(source, target, sourceAttrName, targetAttrName = sourceAttrName) {
   target.attributes[targetAttrName] = source.attributes[sourceAttrName];
 }
+function isOperationSpan(span) {
+  if (!span.name.startsWith("graphql.operation")) {
+    return false;
+  }
+  const followingChar = span.name.at(17);
+  return !followingChar || followingChar === " ";
+}
 const SPANS_WITH_ERRORS = [
   "graphql.parse",
   "graphql.validate",
@@ -220,7 +224,7 @@ function getContextForRequest(attributes) {
   return plugin.otelCtxForRequestId.get(attributes.requestId) ?? api.ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9';
 let initialized = false;
 function openTelemetrySetup(options) {
   const log = options.log || new logger.Logger();
@@ -452,18 +456,14 @@ 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_HIVE_REQUEST_ID = attributes.SEMATTRS_HIVE_REQUEST_ID;
-exports.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION;
-exports.SEMATTRS_IS_HIVE_REQUEST = attributes.SEMATTRS_IS_HIVE_REQUEST;
-exports.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION;
+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_CODES = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_CODES;
+exports.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT = plugin.SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT;
+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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION } from './attributes.cjs';
+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';
 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';

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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION } from './attributes.js';
+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';
 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';

package/dist/setup.js

@@ -3,12 +3,11 @@ import { context, ROOT_CONTEXT, DiagLogLevel, diag, trace, propagation } from '@
 import { hrTimeDuration, setGlobalErrorHandler, W3CBaggagePropagator, W3CTraceContextPropagator, CompositePropagator } from '@opentelemetry/core';
 import { resourceFromAttributes } from '@opentelemetry/resources';
 import { BatchSpanProcessor, SimpleSpanProcessor, ConsoleSpanExporter, BasicTracerProvider, ParentBasedSampler, AlwaysOnSampler, TraceIdRatioBasedSampler } from '@opentelemetry/sdk-trace-base';
-import { ATTR_SERVICE_VERSION, ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+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-7AW98S14.js';
+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-CepZPqbb.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-CepZPqbb.js';
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http';
-import { SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION, SEMATTRS_HIVE_GRAPHQL_ERROR_CODES, SEMATTRS_HIVE_GRAPHQL_ERROR_COUNT, SEMATTRS_HIVE_GATEWAY_OPERATION_SUBGRAPH_NAMES, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION } 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, SEMATTRS_HIVE_REQUEST_ID } from './attributes.js';
 import { SeverityNumber, logs } from '@opentelemetry/api-logs';
 import { BatchLogRecordProcessor, SimpleLogRecordProcessor, ConsoleLogRecordExporter, LoggerProvider } from '@opentelemetry/sdk-logs';
 import '@graphql-hive/gateway-runtime';
@@ -58,6 +57,7 @@ class HiveTracingSpanProcessor {
       return;
     }
     if (isOperationSpan(span)) {
+      span.setAttribute("hive.graphql", true);
       traceState?.operationRoots.set(spanId, span);
       return;
     }
@@ -65,7 +65,7 @@ class HiveTracingSpanProcessor {
     if (operationRoot) {
       traceState.operationRoots.set(spanId, operationRoot);
     }
-    if (span.attributes[SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]) {
+    if (span.name.startsWith("subgraph.execute")) {
       traceState.subgraphExecutions.set(spanId, span);
       return;
     }
@@ -133,14 +133,18 @@ class HiveTracingSpanProcessor {
   }
 }
 function isHttpSpan(span) {
-  return !!span.attributes[SEMATTRS_IS_HIVE_REQUEST];
-}
-function isOperationSpan(span) {
-  return !!span.attributes[SEMATTRS_IS_HIVE_GRAPHQL_OPERATION];
+  return !!span.attributes[SEMATTRS_HTTP_METHOD];
 }
 function copyAttribute(source, target, sourceAttrName, targetAttrName = sourceAttrName) {
   target.attributes[targetAttrName] = source.attributes[sourceAttrName];
 }
+function isOperationSpan(span) {
+  if (!span.name.startsWith("graphql.operation")) {
+    return false;
+  }
+  const followingChar = span.name.at(17);
+  return !followingChar || followingChar === " ";
+}
 const SPANS_WITH_ERRORS = [
   "graphql.parse",
   "graphql.validate",
@@ -220,7 +224,7 @@ function getContextForRequest(attributes) {
   return otelCtxForRequestId.get(attributes.requestId) ?? ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9';
 let initialized = false;
 function openTelemetrySetup(options) {
   const log = options.log || new Logger();
@@ -404,4 +408,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, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION, disable, getContextForRequest, hiveTracingSetup, openTelemetrySetup };
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/plugin-opentelemetry",
-  "version": "1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489",
+  "version": "1.3.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9",
   "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,7 +63,7 @@
   },
   "dependencies": {
     "@graphql-hive/core": "^0.18.0",
-    "@graphql-hive/gateway-runtime": "2.5.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489",
+    "@graphql-hive/gateway-runtime": "2.5.0-alpha-82a1d0b0875f7462be940c830599876cf95475b9",
     "@graphql-hive/logger": "^1.0.9",
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/transport-common": "^1.0.12",

package/dist/attributes.cjs

@@ -1,77 +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";
-const SEMATTRS_HIVE_REQUEST_ID = "hive.request.id";
-const SEMATTRS_IS_HIVE_REQUEST = "hive.request";
-const SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = "hive.graphql";
-const SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = "hive.upstream";
-
-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;
-exports.SEMATTRS_HIVE_REQUEST_ID = SEMATTRS_HIVE_REQUEST_ID;
-exports.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = SEMATTRS_IS_HIVE_GRAPHQL_OPERATION;
-exports.SEMATTRS_IS_HIVE_REQUEST = SEMATTRS_IS_HIVE_REQUEST;
-exports.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION;

package/dist/attributes.d.cts

@@ -1,16 +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";
-declare const SEMATTRS_HIVE_REQUEST_ID = "hive.request.id";
-declare const SEMATTRS_IS_HIVE_REQUEST = "hive.request";
-declare const SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = "hive.graphql";
-declare const SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = "hive.upstream";
-
-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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION };

package/dist/attributes.d.ts

@@ -1,16 +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";
-declare const SEMATTRS_HIVE_REQUEST_ID = "hive.request.id";
-declare const SEMATTRS_IS_HIVE_REQUEST = "hive.request";
-declare const SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = "hive.graphql";
-declare const SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = "hive.upstream";
-
-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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION };

package/dist/attributes.js

@@ -1,16 +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";
-const SEMATTRS_HIVE_REQUEST_ID = "hive.request.id";
-const SEMATTRS_IS_HIVE_REQUEST = "hive.request";
-const SEMATTRS_IS_HIVE_GRAPHQL_OPERATION = "hive.graphql";
-const SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION = "hive.upstream";
-
-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, SEMATTRS_HIVE_REQUEST_ID, SEMATTRS_IS_HIVE_GRAPHQL_OPERATION, SEMATTRS_IS_HIVE_REQUEST, SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION };