@envelop/opentelemetry 4.0.0-alpha-4ba70ab.0 → 4.0.0-alpha-d0d0776.0

package/index.js

@@ -7,6 +7,27 @@ const opentelemetry = require('@opentelemetry/api');
 const tracing = require('@opentelemetry/tracing');
 const graphql = require('graphql');
 
+function _interopNamespace(e) {
+    if (e && e.__esModule) return e;
+    const n = Object.create(null);
+    if (e) {
+        for (const k in e) {
+            if (k !== 'default') {
+                const d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        }
+    }
+    n["default"] = e;
+    return Object.freeze(n);
+}
+
+const opentelemetry__namespace = /*#__PURE__*/_interopNamespace(opentelemetry);
+
+exports.AttributeName = void 0;
 (function (AttributeName) {
     AttributeName["EXECUTION_ERROR"] = "graphql.execute.error";
     AttributeName["EXECUTION_RESULT"] = "graphql.execute.result";
@@ -32,7 +53,7 @@ const useOpenTelemetry = (options, tracingProvider, spanKind = opentelemetry.Spa
             ? ({ info, context, args }) => {
                 if (context && typeof context === 'object' && context[tracingSpanSymbol]) {
                     tracer.getActiveSpanProcessor();
-                    const ctx = opentelemetry.trace.setSpan(opentelemetry.context.active(), context[tracingSpanSymbol]);
+                    const ctx = opentelemetry__namespace.trace.setSpan(opentelemetry__namespace.context.active(), context[tracingSpanSymbol]);
                     const { fieldName, returnType, parentType } = info;
                     const resolverSpan = tracer.startSpan(`${parentType.name}.${fieldName}`, {
                         attributes: {
@@ -58,14 +79,13 @@ const useOpenTelemetry = (options, tracingProvider, spanKind = opentelemetry.Spa
             }
             : undefined,
         onExecute({ args, extendContext }) {
-            var _a, _b;
             const executionSpan = tracer.startSpan(`${args.operationName || 'Anonymous Operation'}`, {
                 kind: spanKind,
                 attributes: {
                     ...spanAdditionalAttributes,
-                    [exports.AttributeName.EXECUTION_OPERATION_NAME]: (_a = args.operationName) !== null && _a !== void 0 ? _a : undefined,
+                    [exports.AttributeName.EXECUTION_OPERATION_NAME]: args.operationName ?? undefined,
                     [exports.AttributeName.EXECUTION_OPERATION_DOCUMENT]: graphql.print(args.document),
-                    ...(options.variables ? { [exports.AttributeName.EXECUTION_VARIABLES]: JSON.stringify((_b = args.variableValues) !== null && _b !== void 0 ? _b : {}) } : {}),
+                    ...(options.variables ? { [exports.AttributeName.EXECUTION_VARIABLES]: JSON.stringify(args.variableValues ?? {}) } : {}),
                 },
             });
             const resultCbs = {

package/index.mjs

@@ -1,5 +1,6 @@
 import { isAsyncIterable } from '@envelop/core';
-import { SpanKind, trace, context } from '@opentelemetry/api';
+import * as opentelemetry from '@opentelemetry/api';
+import { SpanKind } from '@opentelemetry/api';
 import { BasicTracerProvider, SimpleSpanProcessor, ConsoleSpanExporter } from '@opentelemetry/tracing';
 import { print } from 'graphql';
 
@@ -26,10 +27,10 @@ const useOpenTelemetry = (options, tracingProvider, spanKind = SpanKind.SERVER,
     const tracer = tracingProvider.getTracer(serviceName);
     return {
         onResolverCalled: options.resolvers
-            ? ({ info, context: context$1, args }) => {
-                if (context$1 && typeof context$1 === 'object' && context$1[tracingSpanSymbol]) {
+            ? ({ info, context, args }) => {
+                if (context && typeof context === 'object' && context[tracingSpanSymbol]) {
                     tracer.getActiveSpanProcessor();
-                    const ctx = trace.setSpan(context.active(), context$1[tracingSpanSymbol]);
+                    const ctx = opentelemetry.trace.setSpan(opentelemetry.context.active(), context[tracingSpanSymbol]);
                     const { fieldName, returnType, parentType } = info;
                     const resolverSpan = tracer.startSpan(`${parentType.name}.${fieldName}`, {
                         attributes: {
@@ -55,14 +56,13 @@ const useOpenTelemetry = (options, tracingProvider, spanKind = SpanKind.SERVER,
             }
             : undefined,
         onExecute({ args, extendContext }) {
-            var _a, _b;
             const executionSpan = tracer.startSpan(`${args.operationName || 'Anonymous Operation'}`, {
                 kind: spanKind,
                 attributes: {
                     ...spanAdditionalAttributes,
-                    [AttributeName.EXECUTION_OPERATION_NAME]: (_a = args.operationName) !== null && _a !== void 0 ? _a : undefined,
+                    [AttributeName.EXECUTION_OPERATION_NAME]: args.operationName ?? undefined,
                     [AttributeName.EXECUTION_OPERATION_DOCUMENT]: print(args.document),
-                    ...(options.variables ? { [AttributeName.EXECUTION_VARIABLES]: JSON.stringify((_b = args.variableValues) !== null && _b !== void 0 ? _b : {}) } : {}),
+                    ...(options.variables ? { [AttributeName.EXECUTION_VARIABLES]: JSON.stringify(args.variableValues ?? {}) } : {}),
                 },
             });
             const resultCbs = {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@envelop/opentelemetry",
-  "version": "4.0.0-alpha-4ba70ab.0",
+  "version": "4.0.0-alpha-d0d0776.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@envelop/core": "2.1.0-alpha-4ba70ab.0",
+    "@envelop/core": "3.0.0-alpha-d0d0776.0",
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
@@ -12,7 +12,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/dotansimha/envelop.git",
+    "url": "https://github.com/n1ru4l/envelop.git",
     "directory": "packages/plugins/opentelemetry"
   },
   "author": "Dotan Simha <dotansimha@gmail.com>",
@@ -25,12 +25,24 @@
   },
   "exports": {
     ".": {
-      "require": "./index.js",
-      "import": "./index.mjs"
+      "require": {
+        "default": "./index.js",
+        "types": "./index.d.ts"
+      },
+      "import": {
+        "default": "./index.mjs",
+        "types": "./index.d.ts"
+      }
     },
     "./*": {
-      "require": "./*.js",
-      "import": "./*.mjs"
+      "require": {
+        "default": "./*.js",
+        "types": "./*.d.ts"
+      },
+      "import": {
+        "default": "./*.mjs",
+        "types": "./*.d.ts"
+      }
     },
     "./package.json": "./package.json"
   }