@envelop/opentelemetry 3.5.1-alpha-20220824165935-4720f031 → 3.6.0

package/README.md

@@ -15,15 +15,10 @@ yarn add @envelop/opentelemetry
 By default, this plugin prints the collected telemetry to the console:
 
 ```ts
-import { parse, validate, execute, subscribe } from 'graphql'
 import { envelop } from '@envelop/core'
 import { useOpenTelemetry } from '@envelop/opentelemetry'
 
 const getEnveloped = envelop({
-  parse,
-  validate,
-  execute,
-  subscribe,
   plugins: [
     // ... other plugins ...
     useOpenTelemetry({
@@ -38,7 +33,6 @@ const getEnveloped = envelop({
 If you wish to use custom tracer/exporter, create it and pass it. This example integrates Jaeger tracer:
 
 ```ts
-import { parse, validate, execute, subscribe } from 'graphql'
 import { envelop } from '@envelop/core'
 import { useOpenTelemetry } from '@envelop/opentelemetry'
 import { JaegerExporter } from '@opentelemetry/exporter-jaeger'
@@ -53,10 +47,6 @@ provider.addSpanProcessor(new SimpleSpanProcessor(exporter))
 provider.register()
 
 const getEnveloped = envelop({
-  parse,
-  validate,
-  execute,
-  subscribe,
   plugins: [
     // ... other plugins ...
     useOpenTelemetry(

package/cjs/index.js

@@ -7,7 +7,6 @@ const api_1 = require("@opentelemetry/api");
 const opentelemetry = tslib_1.__importStar(require("@opentelemetry/api"));
 const tracing_1 = require("@opentelemetry/tracing");
 const graphql_1 = require("graphql");
-const traced_schema_js_1 = require("./traced-schema.js");
 var AttributeName;
 (function (AttributeName) {
     AttributeName["EXECUTION_ERROR"] = "graphql.execute.error";
@@ -30,9 +29,6 @@ const useOpenTelemetry = (options, tracingProvider, spanKind = api_1.SpanKind.SE
     }
     const tracer = tracingProvider.getTracer(serviceName);
     return {
-        onSchemaChange: async ({ schema }) => {
-            (0, traced_schema_js_1.prepareTracedSchema)(schema);
-        },
         onResolverCalled: options.resolvers
             ? ({ info, context, args }) => {
                 if (context && typeof context === 'object' && context[tracingSpanSymbol]) {

package/esm/index.js

@@ -3,7 +3,6 @@ import { SpanKind } from '@opentelemetry/api';
 import * as opentelemetry from '@opentelemetry/api';
 import { BasicTracerProvider, ConsoleSpanExporter, SimpleSpanProcessor } from '@opentelemetry/tracing';
 import { print } from 'graphql';
-import { prepareTracedSchema } from './traced-schema.js';
 export var AttributeName;
 (function (AttributeName) {
     AttributeName["EXECUTION_ERROR"] = "graphql.execute.error";
@@ -26,9 +25,6 @@ export const useOpenTelemetry = (options, tracingProvider, spanKind = SpanKind.S
     }
     const tracer = tracingProvider.getTracer(serviceName);
     return {
-        onSchemaChange: async ({ schema }) => {
-            prepareTracedSchema(schema);
-        },
         onResolverCalled: options.resolvers
             ? ({ info, context, args }) => {
                 if (context && typeof context === 'object' && context[tracingSpanSymbol]) {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@envelop/opentelemetry",
-  "version": "3.5.1-alpha-20220824165935-4720f031",
+  "version": "3.6.0",
   "sideEffects": false,
   "peerDependencies": {
-    "@envelop/types": "2.3.2-alpha-20220824165935-4720f031",
-    "@envelop/core": "2.5.1-alpha-20220824165935-4720f031",
+    "@envelop/core": "^2.6.0",
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.0.0",
-    "@opentelemetry/tracing": "^0.24.0"
+    "@opentelemetry/tracing": "^0.24.0",
+    "tslib": "^2.4.0"
   },
   "repository": {
     "type": "git",

package/cjs/traced-schema.js

@@ -1,68 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareTracedSchema = void 0;
-const graphql_1 = require("graphql");
-const core_1 = require("@envelop/core");
-const trackedSchemaSymbol = Symbol('TRACKED_SCHEMA');
-function prepareTracedSchema(schema) {
-    if (!schema || schema[trackedSchemaSymbol]) {
-        return;
-    }
-    schema[trackedSchemaSymbol] = true;
-    const entries = Object.values(schema.getTypeMap());
-    for (const type of entries) {
-        if (!(0, graphql_1.isIntrospectionType)(type) && (0, graphql_1.isObjectType)(type)) {
-            const fields = Object.values(type.getFields());
-            for (const field of fields) {
-                let resolverFn = (field.resolve || graphql_1.defaultFieldResolver);
-                field.resolve = async (root, args, context, info) => {
-                    if (context && context[core_1.resolversHooksSymbol]) {
-                        const hooks = context[core_1.resolversHooksSymbol];
-                        const afterCalls = [];
-                        for (const hook of hooks) {
-                            const afterFn = await hook({
-                                root,
-                                args,
-                                context,
-                                info,
-                                resolverFn,
-                                replaceResolverFn: newFn => {
-                                    resolverFn = newFn;
-                                },
-                            });
-                            afterFn && afterCalls.push(afterFn);
-                        }
-                        try {
-                            let result = await resolverFn(root, args, context, info);
-                            for (const afterFn of afterCalls) {
-                                afterFn({
-                                    result,
-                                    setResult: newResult => {
-                                        result = newResult;
-                                    },
-                                });
-                            }
-                            return result;
-                        }
-                        catch (e) {
-                            let resultErr = e;
-                            for (const afterFn of afterCalls) {
-                                afterFn({
-                                    result: resultErr,
-                                    setResult: newResult => {
-                                        resultErr = newResult;
-                                    },
-                                });
-                            }
-                            throw resultErr;
-                        }
-                    }
-                    else {
-                        return resolverFn(root, args, context, info);
-                    }
-                };
-            }
-        }
-    }
-}
-exports.prepareTracedSchema = prepareTracedSchema;

package/esm/traced-schema.js

@@ -1,64 +0,0 @@
-import { defaultFieldResolver, isIntrospectionType, isObjectType } from 'graphql';
-import { resolversHooksSymbol } from '@envelop/core';
-const trackedSchemaSymbol = Symbol('TRACKED_SCHEMA');
-export function prepareTracedSchema(schema) {
-    if (!schema || schema[trackedSchemaSymbol]) {
-        return;
-    }
-    schema[trackedSchemaSymbol] = true;
-    const entries = Object.values(schema.getTypeMap());
-    for (const type of entries) {
-        if (!isIntrospectionType(type) && isObjectType(type)) {
-            const fields = Object.values(type.getFields());
-            for (const field of fields) {
-                let resolverFn = (field.resolve || defaultFieldResolver);
-                field.resolve = async (root, args, context, info) => {
-                    if (context && context[resolversHooksSymbol]) {
-                        const hooks = context[resolversHooksSymbol];
-                        const afterCalls = [];
-                        for (const hook of hooks) {
-                            const afterFn = await hook({
-                                root,
-                                args,
-                                context,
-                                info,
-                                resolverFn,
-                                replaceResolverFn: newFn => {
-                                    resolverFn = newFn;
-                                },
-                            });
-                            afterFn && afterCalls.push(afterFn);
-                        }
-                        try {
-                            let result = await resolverFn(root, args, context, info);
-                            for (const afterFn of afterCalls) {
-                                afterFn({
-                                    result,
-                                    setResult: newResult => {
-                                        result = newResult;
-                                    },
-                                });
-                            }
-                            return result;
-                        }
-                        catch (e) {
-                            let resultErr = e;
-                            for (const afterFn of afterCalls) {
-                                afterFn({
-                                    result: resultErr,
-                                    setResult: newResult => {
-                                        resultErr = newResult;
-                                    },
-                                });
-                            }
-                            throw resultErr;
-                        }
-                    }
-                    else {
-                        return resolverFn(root, args, context, info);
-                    }
-                };
-            }
-        }
-    }
-}

package/typings/traced-schema.d.cts

@@ -1,2 +0,0 @@
-import { GraphQLSchema } from 'graphql';
-export declare function prepareTracedSchema(schema: GraphQLSchema | null | undefined): void;

package/typings/traced-schema.d.ts

@@ -1,2 +0,0 @@
-import { GraphQLSchema } from 'graphql';
-export declare function prepareTracedSchema(schema: GraphQLSchema | null | undefined): void;