fix: graphql v16 type shenanigans

open-telemetry · May 9, 2022 · 19acc6e · 19acc6e
1 parent a8cad77
commit 19acc6e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/instrumentation.ts
@@ -307,8 +307,8 @@ export class GraphQLInstrumentation extends InstrumentationBase {
         schema: graphqlTypes.GraphQLSchema,
         documentAST: graphqlTypes.DocumentNode,
         rules?: ReadonlyArray<graphqlTypes.ValidationRule>,
-        typeInfo?: graphqlTypes.TypeInfo,
-        options?: { maxErrors?: number }
+        options?: { maxErrors?: number },
+        typeInfo?: graphqlTypes.TypeInfo
       ): ReadonlyArray<graphqlTypes.GraphQLError> {
         return instrumentation._validate(
           this,
@@ -373,8 +373,8 @@ export class GraphQLInstrumentation extends InstrumentationBase {
             schema,
             documentAST,
             rules,
-            typeInfo,
-            options
+            options,
+            typeInfo
           );
         },
         (err, errors) => {

diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/types.ts
@@ -120,8 +120,8 @@ export type validateType = (
   schema: graphqlTypes.GraphQLSchema,
   documentAST: graphqlTypes.DocumentNode,
   rules?: ReadonlyArray<graphqlTypes.ValidationRule>,
+  options?: { maxErrors?: number },
   typeInfo?: graphqlTypes.TypeInfo,
-  options?: { maxErrors?: number }
 ) => ReadonlyArray<graphqlTypes.GraphQLError>;
 
 export interface GraphQLField {

diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/utils.ts
@@ -387,7 +387,7 @@ export function wrapFieldResolver<TSource = any, TContext = any, TArgs = any>(
             >
         >(
           () => {
-            return fieldResolver.call(this, source, args, contextValue, info);
+            return fieldResolver.call(this, source, args, contextValue, info) as any;
           },
           err => {
             if (shouldEndSpan) {
@@ -421,7 +421,7 @@ async function safeExecuteInTheMiddleAsync<T>(
   try {
     result = await execute();
   } catch (e) {
-    error = e;
+    error = e as Error;
   } finally {
     onFinish(error, result);
     if (error && !preventThrowingError) {

diff --git a/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts b/plugins/node/opentelemetry-instrumentation-graphql/test/graphql.test.ts
@@ -1043,7 +1043,7 @@ describe('graphql', () => {
 
   describe('responseHook', () => {
     let spans: ReadableSpan[];
-    let graphqlResult: graphqlTypes.ExecutionResult;
+    let graphqlResult: graphqlTypes.ExecutionResult<{books: unknown[]}>;
     const dataAttributeName = 'graphql_data';
 
     afterEach(() => {