Reuse objects

Author: drewcorlin1

packages/esbuild-plugin-node/src/config/index.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export { instrumentations, otelPackageToInstrumentationConfig } from './main';
+export { otelPackageToInstrumentationConfig } from './main';

packages/esbuild-plugin-node/src/config/main.ts

@@ -23,6 +23,16 @@ import {
 import { EsbuildInstrumentationConfigMap } from '../types';
 import { getNodeAutoInstrumentations } from '@opentelemetry/auto-instrumentations-node';
 
+const instrumentations = getNodeAutoInstrumentations();
+const instrumentationModuleDefinitionsByInstrumentationName =
+  Object.fromEntries(
+    instrumentations.map(i => [i.instrumentationName, getModuleDefinitions(i)])
+  );
+
+export const instrumentationModuleDefinitions = Object.values(
+  instrumentationModuleDefinitionsByInstrumentationName
+).flat();
+
 function getModuleDefinitions(
   instrumentation: Instrumentation
 ): InstrumentationModuleDefinition[] {
@@ -33,9 +43,6 @@ function getModuleDefinitions(
   return [];
 }
 
-export const instrumentations =
-  getNodeAutoInstrumentations().flatMap(getModuleDefinitions);
-
 function configGenerator<T extends { enabled?: boolean }>(
   config?: T
 ): string | undefined {
@@ -58,9 +65,11 @@ export function getOtelPackageToInstrumentationConfig() {
       ) => string | undefined;
     }
   > = {};
-  for (const instrumentation of getNodeAutoInstrumentations()) {
+  for (const instrumentation of instrumentations) {
     const instrumentationModuleDefinitions =
-      getModuleDefinitions(instrumentation);
+      instrumentationModuleDefinitionsByInstrumentationName[
+        instrumentation.instrumentationName
+      ];
 
     for (const instrumentationModuleDefinition of instrumentationModuleDefinitions) {
       otelPackageToInstrumentationConfig[instrumentationModuleDefinition.name] =

packages/esbuild-plugin-node/src/plugin.ts

@@ -21,7 +21,7 @@ import {
 } from './types';
 import { Plugin, PluginBuild } from 'esbuild';
 import {
-  instrumentations,
+  instrumentationModuleDefinitions,
   otelPackageToInstrumentationConfig,
 } from './config/main';
 
@@ -205,14 +205,14 @@ async function getInstrumentation({
   resolveDir: string;
   build: PluginBuild;
 }) {
-  for (const instrumentation of instrumentations) {
+  for (const instrumentationModuleDefinition of instrumentationModuleDefinitions) {
     const moduleWithPackage = `${extractedModule.package}/${extractedModule.path}`;
     const nameMatches =
-      instrumentation.name === path ||
-      instrumentation.name === moduleWithPackage;
+      instrumentationModuleDefinition.name === path ||
+      instrumentationModuleDefinition.name === moduleWithPackage;
 
     if (!nameMatches) {
-      const fileMatch = instrumentation.files.find(
+      const fileMatch = instrumentationModuleDefinition.files.find(
         file => file.name === path || file.name === moduleWithPackage
       );
       if (!fileMatch) continue;
@@ -230,11 +230,11 @@ async function getInstrumentation({
     const version = JSON.parse(packageJsonContents.toString()).version;
 
     if (
-      instrumentation.supportedVersions.some(supportedVersion =>
+      instrumentationModuleDefinition.supportedVersions.some(supportedVersion =>
         satisfies(version, supportedVersion)
       )
     ) {
-      return instrumentation;
+      return instrumentationModuleDefinition;
     }
   }
   return null;