@graphql-hive/plugin-opentelemetry 1.3.0-alpha-065c98509976ecc326c425600bec35f256fe2316 → 1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @graphql-hive/plugin-opentelemetry
 
-## 1.3.0-alpha-065c98509976ecc326c425600bec35f256fe2316
+## 1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489
 ### Minor Changes
 
 
@@ -22,7 +22,7 @@
 - [#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-065c98509976ecc326c425600bec35f256fe2316
+  - @graphql-hive/gateway-runtime@2.5.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489
 
 ## 1.2.5
 ### Patch Changes

package/dist/attributes.cjs

@@ -10,6 +10,10 @@ 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,
@@ -67,3 +71,7 @@ exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = SEMATTRS_HIVE_GATEWAY_UPS
 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

@@ -8,5 +8,9 @@ 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 };
+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

@@ -8,5 +8,9 @@ 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 };
+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

@@ -8,5 +8,9 @@ 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 };
+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/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var plugin = require('./plugin-Cfs14cSY.cjs');
+var plugin = require('./plugin-DqVaQukh.cjs');
 var api = require('@opentelemetry/api');
 var attributes = require('./attributes.cjs');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
@@ -28,6 +28,10 @@ exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = attributes.SEMATTRS_HIVE_
 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 } from './attributes.cjs';
+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 { 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 { 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-tools/utils';

package/dist/index.js

@@ -1,6 +1,6 @@
-export { u as useOpenTelemetry } from './plugin-Byr8hRBY.js';
+export { u as useOpenTelemetry } from './plugin-7AW98S14.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 { 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-Byr8hRBY.js → plugin-7AW98S14.js}

@@ -3,12 +3,12 @@ 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';
 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 { 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';
 
 class OtelContextStack {
   #root;
@@ -132,7 +132,8 @@ 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
+        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0,
+        [SEMATTRS_IS_HIVE_REQUEST]: true
       },
       kind: SpanKind.SERVER
     },
@@ -159,7 +160,10 @@ function setResponseAttributes(ctx, response) {
 function createGraphQLSpan(input) {
   const span = input.tracer.startSpan(
     `graphql.operation`,
-    { kind: SpanKind.INTERNAL },
+    {
+      kind: SpanKind.INTERNAL,
+      attributes: { [SEMATTRS_IS_HIVE_GRAPHQL_OPERATION]: true }
+    },
     input.ctx
   );
   return trace.setSpan(input.ctx, span);
@@ -369,7 +373,8 @@ function createSubgraphExecuteSpan(input) {
           input.executionRequest.document
         ),
         [SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
-        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
+        [SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName,
+        [SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]: true
       },
       kind: SpanKind.CLIENT
     },
@@ -874,6 +879,9 @@ 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));
           }
         }

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

@@ -5,12 +5,12 @@ 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');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
 var graphql = require('graphql');
-var attributes = require('./attributes.cjs');
 
 class OtelContextStack {
   #root;
@@ -134,7 +134,8 @@ 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
+        "hive.client.version": request.headers.get("graphql-client-version") || request.headers.get("x-graphql-client-version") || void 0,
+        [attributes.SEMATTRS_IS_HIVE_REQUEST]: true
       },
       kind: api.SpanKind.SERVER
     },
@@ -161,7 +162,10 @@ function setResponseAttributes(ctx, response) {
 function createGraphQLSpan(input) {
   const span = input.tracer.startSpan(
     `graphql.operation`,
-    { kind: api.SpanKind.INTERNAL },
+    {
+      kind: api.SpanKind.INTERNAL,
+      attributes: { [attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION]: true }
+    },
     input.ctx
   );
   return api.trace.setSpan(input.ctx, span);
@@ -371,7 +375,8 @@ function createSubgraphExecuteSpan(input) {
           input.executionRequest.document
         ),
         [attributes.SEMATTRS_GRAPHQL_OPERATION_TYPE]: operation.operation,
-        [attributes.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName
+        [attributes.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME]: input.subgraphName,
+        [attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]: true
       },
       kind: api.SpanKind.CLIENT
     },
@@ -876,6 +881,9 @@ 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));
           }
         }

package/dist/setup.cjs

@@ -6,7 +6,7 @@ var core = require('@opentelemetry/core');
 var resources = require('@opentelemetry/resources');
 var sdkTraceBase = require('@opentelemetry/sdk-trace-base');
 var semanticConventions = require('@opentelemetry/semantic-conventions');
-var plugin = require('./plugin-Cfs14cSY.cjs');
+var plugin = require('./plugin-DqVaQukh.cjs');
 var exporterTraceOtlpHttp = require('@opentelemetry/exporter-trace-otlp-http');
 var attributes = require('./attributes.cjs');
 var apiLogs = require('@opentelemetry/api-logs');
@@ -58,7 +58,6 @@ class HiveTracingSpanProcessor {
       return;
     }
     if (isOperationSpan(span)) {
-      span.setAttribute("hive.graphql", true);
       traceState?.operationRoots.set(spanId, span);
       return;
     }
@@ -66,7 +65,7 @@ class HiveTracingSpanProcessor {
     if (operationRoot) {
       traceState.operationRoots.set(spanId, operationRoot);
     }
-    if (span.name.startsWith("subgraph.execute")) {
+    if (span.attributes[attributes.SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]) {
       traceState.subgraphExecutions.set(spanId, span);
       return;
     }
@@ -134,18 +133,14 @@ class HiveTracingSpanProcessor {
   }
 }
 function isHttpSpan(span) {
-  return !!span.attributes[semanticConventions.SEMATTRS_HTTP_METHOD];
+  return !!span.attributes[attributes.SEMATTRS_IS_HIVE_REQUEST];
+}
+function isOperationSpan(span) {
+  return !!span.attributes[attributes.SEMATTRS_IS_HIVE_GRAPHQL_OPERATION];
 }
 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",
@@ -225,7 +220,7 @@ function getContextForRequest(attributes) {
   return plugin.otelCtxForRequestId.get(attributes.requestId) ?? api.ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-065c98509976ecc326c425600bec35f256fe2316';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489';
 let initialized = false;
 function openTelemetrySetup(options) {
   const log = options.log || new logger.Logger();
@@ -465,6 +460,10 @@ exports.SEMATTRS_HIVE_GATEWAY_UPSTREAM_SUBGRAPH_NAME = attributes.SEMATTRS_HIVE_
 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.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 { 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';
 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 } from './attributes.js';
+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';
 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,12 @@ 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 { SEMATTRS_HTTP_METHOD, ATTR_SERVICE_VERSION, ATTR_SERVICE_NAME } from '@opentelemetry/semantic-conventions';
+import { 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-Byr8hRBY.js';
+import { o as otelCtxForRequestId, g as getEnvBool, d as diagLogLevelFromEnv, a as getEnvStr } from './plugin-7AW98S14.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 { 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,7 +58,6 @@ class HiveTracingSpanProcessor {
       return;
     }
     if (isOperationSpan(span)) {
-      span.setAttribute("hive.graphql", true);
       traceState?.operationRoots.set(spanId, span);
       return;
     }
@@ -66,7 +65,7 @@ class HiveTracingSpanProcessor {
     if (operationRoot) {
       traceState.operationRoots.set(spanId, operationRoot);
     }
-    if (span.name.startsWith("subgraph.execute")) {
+    if (span.attributes[SEMATTRS_IS_HIVE_SUBGRAPH_EXECUTION]) {
       traceState.subgraphExecutions.set(spanId, span);
       return;
     }
@@ -134,18 +133,14 @@ class HiveTracingSpanProcessor {
   }
 }
 function isHttpSpan(span) {
-  return !!span.attributes[SEMATTRS_HTTP_METHOD];
+  return !!span.attributes[SEMATTRS_IS_HIVE_REQUEST];
+}
+function isOperationSpan(span) {
+  return !!span.attributes[SEMATTRS_IS_HIVE_GRAPHQL_OPERATION];
 }
 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",
@@ -225,7 +220,7 @@ function getContextForRequest(attributes) {
   return otelCtxForRequestId.get(attributes.requestId) ?? ROOT_CONTEXT;
 }
 
-globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-065c98509976ecc326c425600bec35f256fe2316';
+globalThis.__OTEL_PLUGIN_VERSION__ = '1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489';
 let initialized = false;
 function openTelemetrySetup(options) {
   const log = options.log || new Logger();
@@ -409,4 +404,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, 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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-hive/plugin-opentelemetry",
-  "version": "1.3.0-alpha-065c98509976ecc326c425600bec35f256fe2316",
+  "version": "1.3.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489",
   "type": "module",
   "repository": {
     "type": "git",
@@ -73,7 +73,7 @@
   },
   "dependencies": {
     "@graphql-hive/core": "^0.18.0",
-    "@graphql-hive/gateway-runtime": "2.5.0-alpha-065c98509976ecc326c425600bec35f256fe2316",
+    "@graphql-hive/gateway-runtime": "2.5.0-alpha-125a7b3091e929eb65f014c2f62b14b609016489",
     "@graphql-hive/logger": "^1.0.9",
     "@graphql-mesh/cross-helpers": "^0.4.10",
     "@graphql-mesh/transport-common": "^1.0.12",