Merge branch 'main' into tls-net-scoping

open-telemetry · Jan 15, 2023 · 9721bcd · 9721bcd
2 parents 5f59aa4 + 714e6c1
commit 9721bcd
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/metapackages/auto-instrumentations-node/src/utils.ts b/metapackages/auto-instrumentations-node/src/utils.ts
@@ -98,7 +98,7 @@ const InstrumentationMap = {
 type ConfigArg<T> = T extends new (...args: infer U) => unknown ? U[0] : never;
 export type InstrumentationConfigMap = {
   [Name in keyof typeof InstrumentationMap]?: ConfigArg<
-    typeof InstrumentationMap[Name]
+    (typeof InstrumentationMap)[Name]
   >;
 };
 

diff --git a/metapackages/auto-instrumentations-web/src/utils.ts b/metapackages/auto-instrumentations-web/src/utils.ts
@@ -34,7 +34,7 @@ const InstrumentationMap = {
 type ConfigArg<T> = T extends new (...args: infer U) => unknown ? U[0] : never;
 export type InstrumentationConfigMap = {
   [Name in keyof typeof InstrumentationMap]?: ConfigArg<
-    typeof InstrumentationMap[Name]
+    (typeof InstrumentationMap)[Name]
   >;
 };
 

diff --git a/plugins/node/instrumentation-dataloader/src/instrumentation.ts b/plugins/node/instrumentation-dataloader/src/instrumentation.ts
@@ -38,8 +38,8 @@ type DataloaderInternal = typeof Dataloader.prototype & {
   _batch: { spanLinks?: Link[] } | null;
 };
 
-type LoadFn = typeof Dataloader.prototype['load'];
-type LoadManyFn = typeof Dataloader.prototype['loadMany'];
+type LoadFn = (typeof Dataloader.prototype)['load'];
+type LoadManyFn = (typeof Dataloader.prototype)['loadMany'];
 
 export class DataloaderInstrumentation extends InstrumentationBase {
   constructor(config: DataloaderInstrumentationConfig = {}) {

diff --git a/plugins/node/instrumentation-fs/src/types.ts b/plugins/node/instrumentation-fs/src/types.ts
@@ -24,7 +24,7 @@ export type FunctionPropertyNames<T> = {
 export type FunctionProperties<T> = Pick<T, FunctionPropertyNames<T>>;
 
 export type FMember = FunctionPropertyNames<typeof fs>;
-export type FPMember = FunctionPropertyNames<typeof fs['promises']>;
+export type FPMember = FunctionPropertyNames<(typeof fs)['promises']>;
 
 export type CreateHook = (
   functionName: FMember | FPMember,

diff --git a/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts b/plugins/node/opentelemetry-instrumentation-graphql/src/internal-types.ts
@@ -18,8 +18,8 @@ import { InstrumentationConfig } from '@opentelemetry/instrumentation';
 import type * as graphqlTypes from 'graphql';
 import type * as api from '@opentelemetry/api';
 import type { PromiseOrValue } from 'graphql/jsutils/PromiseOrValue';
-import { DocumentNode } from 'graphql/language/ast';
-import {
+import type { DocumentNode } from 'graphql/language/ast';
+import type {
   GraphQLFieldResolver,
   GraphQLTypeResolver,
 } from 'graphql/type/definition';