Remove TODOs

open-telemetry · May 26, 2024 · 6138634 · 6138634
1 parent e106c9a
commit 6138634
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/packages/esbuild-plugin-node/src/config/main.ts b/packages/esbuild-plugin-node/src/config/main.ts
@@ -26,11 +26,7 @@ import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentation
 function getModuleDefinitions(
   instrumentation: Instrumentation
 ): InstrumentationModuleDefinition[] {
-  if (
-    // 'getModuleDefinitions' in instrumentation &&
-    // typeof instrumentation.getModuleDefinitions === 'function'
-    instrumentation instanceof InstrumentationBase
-  ) {
+  if (instrumentation instanceof InstrumentationBase) {
     return instrumentation.getModuleDefinitions() ?? [];
   }
 
@@ -71,7 +67,6 @@ export function getOtelPackageToInstrumentationConfig() {
         {
           oTelInstrumentationPackage:
             instrumentation.instrumentationName as keyof EsbuildInstrumentationConfigMap,
-          // TODO: Do we need to worry about minification/obfuscation messing with this class name?
           oTelInstrumentationClass: instrumentation.constructor.name,
           configGenerator,
         };

diff --git a/packages/esbuild-plugin-node/src/types.ts b/packages/esbuild-plugin-node/src/types.ts
@@ -42,9 +42,9 @@ export interface ModuleParams {
 }
 
 type _RemoveFunctions<T> = {
-  // TODO: Mabye:
-  // [P in keyof T as T[P] extends (...args: unknown[]) => unknown ? never : P]: T[P];
-  [P in keyof T as T[P] extends (...args: any) => any ? never : P]: T[P];
+  [P in keyof T as T[P] extends (...args: unknown[]) => unknown
+    ? never
+    : P]: T[P];
 };
 
 // _RemoveFunctions does not work on optional fields, so first make the type required then apply Partial to the result