Removed environment info collector service.

niemyjski · niemyjski · commit 839092788469 · 2021-05-21T08:41:35.000-05:00
diff --git a/packages/core/src/configuration/Configuration.ts b/packages/core/src/configuration/Configuration.ts
@@ -10,7 +10,6 @@ import { EventPluginContext } from "../plugins/EventPluginContext.js";
 import { IEventPlugin } from "../plugins/IEventPlugin.js";
 import { DefaultEventQueue } from "../queue/DefaultEventQueue.js";
 import { IEventQueue } from "../queue/IEventQueue.js";
-import { IEnvironmentInfoCollector } from "../services/IEnvironmentInfoCollector.js";
 import { IErrorParser } from "../services/IErrorParser.js";
 import { ISubmissionClient } from "../submission/ISubmissionClient.js";
 import { guid } from "../Utils.js";
@@ -58,7 +57,6 @@ export class Configuration {
   public enabled: boolean = true;
 
   public services: {
-    environmentInfoCollector?: IEnvironmentInfoCollector,
     errorParser?: IErrorParser,
     lastReferenceIdManager: ILastReferenceIdManager,
     log: ILog,
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -27,7 +27,6 @@ export type {
 
 export { ConfigurationDefaultsPlugin } from "./plugins/default/ConfigurationDefaultsPlugin.js";
 export { DuplicateCheckerPlugin } from "./plugins/default/DuplicateCheckerPlugin.js";
-export { EnvironmentInfoPlugin } from "./plugins/default/EnvironmentInfoPlugin.js";
 export { ErrorPlugin } from "./plugins/default/ErrorPlugin.js";
 export { EventExclusionPlugin } from "./plugins/default/EventExclusionPlugin.js";
 export { HeartbeatPlugin } from "./plugins/default/HeartbeatPlugin.js";
@@ -42,7 +41,6 @@ export type { IEventPlugin } from "./plugins/IEventPlugin.js";
 export { DefaultEventQueue } from "./queue/DefaultEventQueue.js";
 export type { IEventQueue } from "./queue/IEventQueue.js";
 
-export type { IEnvironmentInfoCollector } from "./services/IEnvironmentInfoCollector.js";
 export type { IErrorParser } from "./services/IErrorParser.js";
 
 export { InMemoryStorage } from "./storage/InMemoryStorage.js";
diff --git a/packages/core/src/plugins/EventPluginManager.ts b/packages/core/src/plugins/EventPluginManager.ts
@@ -1,7 +1,6 @@
 import { Configuration } from "../configuration/Configuration.js";
 import { ConfigurationDefaultsPlugin } from "./default/ConfigurationDefaultsPlugin.js";
 import { DuplicateCheckerPlugin } from "./default/DuplicateCheckerPlugin.js";
-import { EnvironmentInfoPlugin } from "./default/EnvironmentInfoPlugin.js";
 import { ErrorPlugin } from "./default/ErrorPlugin.js";
 import { EventExclusionPlugin } from "./default/EventExclusionPlugin.js";
 import { SubmissionMethodPlugin } from "./default/SubmissionMethodPlugin.js";
@@ -61,7 +60,6 @@ export class EventPluginManager {
     config.addPlugin(new ErrorPlugin());
     config.addPlugin(new DuplicateCheckerPlugin());
     config.addPlugin(new EventExclusionPlugin());
-    config.addPlugin(new EnvironmentInfoPlugin());
     config.addPlugin(new SubmissionMethodPlugin());
   }
 }
diff --git a/packages/core/src/plugins/default/EnvironmentInfoPlugin.ts b/packages/core/src/plugins/default/EnvironmentInfoPlugin.ts
diff --git a/packages/core/src/services/IEnvironmentInfoCollector.ts b/packages/core/src/services/IEnvironmentInfoCollector.ts
diff --git a/packages/node/src/NodeExceptionlessClient.ts b/packages/node/src/NodeExceptionlessClient.ts
@@ -3,11 +3,11 @@ import {
   ExceptionlessClient
 } from "@exceptionless/core";
 
+import { NodeEnvironmentInfoPlugin } from "./plugins/NodeEnvironmentInfoPlugin.js";
 import { NodeGlobalHandlerPlugin } from "./plugins/NodeGlobalHandlerPlugin.js";
 import { NodeLifeCyclePlugin } from "./plugins/NodeLifeCyclePlugin.js";
 import { NodeRequestInfoPlugin } from "./plugins/NodeRequestInfoPlugin.js";
 import { NodeWrapFunctions } from "./plugins/NodeWrapFunctions.js";
-import { NodeEnvironmentInfoCollector } from "./services/NodeEnvironmentInfoCollector.js";
 import { NodeErrorParser } from "./services/NodeErrorParser.js";
 import { NodeFileStorage } from "./storage/NodeFileStorage.js";
 import { NodeFetchSubmissionClient } from "./submission/NodeFetchSubmissionClient.js";
@@ -18,10 +18,10 @@ export class NodeExceptionlessClient extends ExceptionlessClient {
 
     if (configurationOrApiKey) {
       config.services.storage = new NodeFileStorage();
-      config.services.environmentInfoCollector = new NodeEnvironmentInfoCollector();
       config.services.errorParser = new NodeErrorParser();
       config.services.submissionClient = new NodeFetchSubmissionClient(config);
 
+      config.addPlugin(new NodeEnvironmentInfoPlugin());
       config.addPlugin(new NodeGlobalHandlerPlugin());
       config.addPlugin(new NodeLifeCyclePlugin());
       config.addPlugin(new NodeRequestInfoPlugin());
diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts
@@ -1,8 +1,8 @@
+export { NodeEnvironmentInfoPlugin } from "./plugins/NodeEnvironmentInfoPlugin.js";
 export { NodeGlobalHandlerPlugin } from "./plugins/NodeGlobalHandlerPlugin.js";
 export { NodeLifeCyclePlugin } from "./plugins/NodeLifeCyclePlugin.js";
 export { NodeRequestInfoPlugin } from "./plugins/NodeRequestInfoPlugin.js";
 export { NodeWrapFunctions } from "./plugins/NodeWrapFunctions.js";
-export { NodeEnvironmentInfoCollector } from "./services/NodeEnvironmentInfoCollector.js";
 export { NodeErrorParser } from "./services/NodeErrorParser.js";
 export { NodeFileStorage } from "./storage/NodeFileStorage.js";
 export { NodeFetchSubmissionClient } from "./submission/NodeFetchSubmissionClient.js";
diff --git a/packages/node/src/plugins/NodeEnvironmentInfoPlugin.ts b/packages/node/src/plugins/NodeEnvironmentInfoPlugin.ts
@@ -1,4 +1,10 @@
-import { argv, memoryUsage, pid, title, version } from "process";
+import {
+  argv,
+  memoryUsage,
+  pid,
+  title,
+  version
+} from "process";
 
 import {
   arch,
@@ -7,7 +13,6 @@ import {
   freemem,
   hostname,
   loadavg,
-  NetworkInterfaceInfo,
   networkInterfaces,
   platform,
   release,
@@ -20,11 +25,27 @@ import {
 import {
   EnvironmentInfo,
   EventPluginContext,
-  IEnvironmentInfoCollector,
+  IEventPlugin,
+  KnownEventDataKeys
 } from "@exceptionless/core";
 
-export class NodeEnvironmentInfoCollector implements IEnvironmentInfoCollector {
-  public getEnvironmentInfo(context: EventPluginContext): EnvironmentInfo {
+export class NodeEnvironmentInfoPlugin implements IEventPlugin {
+  public priority: number = 80;
+  public name: string = "NodeEnvironmentInfoPlugin";
+
+  public run(context: EventPluginContext): Promise<void> {
+    // PERF: Ensure module info is cached and rework below statement.
+    if (!context.event.data[KnownEventDataKeys.EnvironmentInfo]) {
+      const environmentInfo: EnvironmentInfo = this.getEnvironmentInfo(context);
+      if (environmentInfo) {
+        context.event.data[KnownEventDataKeys.EnvironmentInfo] = environmentInfo;
+      }
+    }
+
+    return Promise.resolve();
+  }
+
+  private getEnvironmentInfo(context: EventPluginContext): EnvironmentInfo {
     function getIpAddresses(): string {
       const ips: string[] = [];
 
