chore: updated comments

instana · Aug 28, 2024 · 7bd987f · 7bd987f
1 parent 6678c21
commit 7bd987f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/packages/core/src/util/getPreloadFlags.js b/packages/core/src/util/getPreloadFlags.js
@@ -16,26 +16,28 @@ exports.getPreloadFlags = function getPreloadFlags() {
     for (let i = 0; i < optionArray.length; i++) {
       if (flags.some(flag => optionArray[i].includes(flag))) {
         relevantOptions.push(`${optionArray[i]} ${optionArray[i + 1]}`);
-        i++; // Skip the next element as it's already included
+        i++;
       }
     }
 
     return relevantOptions.join(', ');
   }
 
-  // Check process.env.NODE_OPTIONS
-  let nodeOptions = '';
-  if (process.env.NODE_OPTIONS) {
-    const nodeOptionsArray = process.env.NODE_OPTIONS.split(' ');
-    nodeOptions = extractOption(nodeOptionsArray);
-  }
+  try {
+    let nodeOptions = '';
+    if (process.env.NODE_OPTIONS) {
+      const nodeOptionsArray = process.env.NODE_OPTIONS.split(' ');
+      nodeOptions = extractOption(nodeOptionsArray);
+    }
 
-  // Check process.execArgv
-  let execArgs = '';
-  if (process.execArgv.length > 0) {
-    execArgs = extractOption(process.execArgv);
-  }
+    let execArgs = '';
+    if (process.execArgv.length > 0) {
+      execArgs = extractOption(process.execArgv);
+    }
 
-  const result = [nodeOptions, execArgs].filter(Boolean).join(', ') || 'noFlags';
-  return result;
+    const result = [nodeOptions, execArgs].filter(Boolean).join(', ') || 'noFlags';
+    return result;
+  } catch (error) {
+    return error;
+  }
 };
diff --git a/packages/core/test/util/getPreloadFlags_test.js b/packages/core/test/util/getPreloadFlags_test.js
@@ -9,11 +9,9 @@ const expect = require('chai').expect;
 const { getPreloadFlags } = require('../../src/util/getPreloadFlags');
 
 describe('util.getPreloadFlags', () => {
-  // Variables to store original values of NODE_OPTIONS and execArgv
   const originalNodeOptions = process.env.NODE_OPTIONS;
-  const originalExecArgv = process.execArgv.slice(); // Slice to copy the array
+  const originalExecArgv = process.execArgv.slice();
 
-  // Helper function to reset environment variables and execArgs
   const resetEnvironment = () => {
     process.env.NODE_OPTIONS = '';
     process.execArgv = [];
@@ -28,12 +26,11 @@ describe('util.getPreloadFlags', () => {
   });
 
   after(() => {
-    // Restore original NODE_OPTIONS and execArgv values after all tests
     process.env.NODE_OPTIONS = originalNodeOptions;
     process.execArgv = originalExecArgv;
   });
 
-  it('should return relevant flags from process.env.NODE_OPTIONS', () => {
+  it('should return relevant flags from NODE_OPTIONS', () => {
     process.env.NODE_OPTIONS =
       "INSTANA_DEBUG=true node --require '@instana/collector/src/immediate.js' ./dummy-app/src/index.js";
 
@@ -42,7 +39,7 @@ describe('util.getPreloadFlags', () => {
     expect(result).equal("--require '@instana/collector/src/immediate.js'");
   });
 
-  it('should return relevant flags from process.execArgv', () => {
+  it('should return relevant flags from execArgv', () => {
     process.execArgv = ['--require', '@instana/collector/src/immediate.js'];
 
     const result = getPreloadFlags();