diff --git a/plugins/node/opentelemetry-instrumentation-graphql/package.json b/plugins/node/opentelemetry-instrumentation-graphql/package.json index bb0f814f91..b54bd35b5e 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/package.json +++ b/plugins/node/opentelemetry-instrumentation-graphql/package.json @@ -63,7 +63,6 @@ "typescript": "4.3.5" }, "dependencies": { - "@opentelemetry/instrumentation": "^0.27.0", - "@types/graphql": "14.5.0" + "@opentelemetry/instrumentation": "^0.27.0" } } diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts index 8804413a60..7e0700f6a6 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts @@ -24,7 +24,6 @@ import { safeExecuteInTheMiddle, } from '@opentelemetry/instrumentation'; import type * as graphqlTypes from 'graphql'; -import { GraphQLFieldResolver } from 'graphql/type/definition'; import { SpanNames } from './enum'; import { AttributeNames } from './enums/AttributeNames'; import { OTEL_GRAPHQL_DATA_SYMBOL } from './symbols'; @@ -164,7 +163,7 @@ export class GraphQLInstrumentation extends InstrumentationBase { } private _patchExecute( - defaultFieldResolved: GraphQLFieldResolver + defaultFieldResolved: graphqlTypes.GraphQLFieldResolver ): (original: executeType) => executeType { const instrumentation = this; return function execute(original) { diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts index 26265cc372..7f457dafcf 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts @@ -23,7 +23,6 @@ import { GraphQLFieldResolver, GraphQLTypeResolver, } from 'graphql/type/definition'; -import { GraphQLSchema } from 'graphql/type/schema'; import { OTEL_GRAPHQL_DATA_SYMBOL, OTEL_PATCHED_SYMBOL } from './symbols'; export const OPERATION_NOT_SUPPORTED = @@ -100,7 +99,7 @@ export type executeFunctionWithArgs = ( ) => PromiseOrValue; export interface OtelExecutionArgs { - schema: GraphQLSchema; + schema: graphqlTypes.GraphQLSchema; document: DocumentNode & ObjectWithGraphQLData; rootValue?: any; contextValue?: any & ObjectWithGraphQLData; diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts index 6edee1ea3e..052953a5e5 100644 --- a/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts +++ b/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts @@ -16,7 +16,6 @@ import type * as graphqlTypes from 'graphql'; import * as api from '@opentelemetry/api'; -import { GraphQLObjectType } from 'graphql/type/definition'; import { AllowedOperationTypes, SpanNames, TokenKind } from './enum'; import { AttributeNames } from './enums/AttributeNames'; import { OTEL_GRAPHQL_DATA_SYMBOL, OTEL_PATCHED_SYMBOL } from './symbols'; @@ -293,7 +292,7 @@ export function getSourceFromLocation( } export function wrapFields( - type: Maybe, + type: Maybe, tracer: api.Tracer, getConfig: () => GraphQLInstrumentationParsedConfig ): void {