From 14eea7d6d27a9e5f445288c4c29aae68cf692920 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Fri, 21 Aug 2020 09:46:45 -0700
Subject: [PATCH] Add separate trace and verbosity env variables for this
 library

---
 packages/grpc-js/scripts/xds.sh |  2 +-
 packages/grpc-js/src/logging.ts | 33 ++++++++++++++++-----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh
index 64b9fafa..e1c59e8e 100755
--- a/packages/grpc-js/scripts/xds.sh
+++ b/packages/grpc-js/scripts/xds.sh
@@ -19,7 +19,7 @@ grpc/tools/run_tests/helper_scripts/prep_xds.sh
 #
 # TODO: remove "path_matching" and "header_matching" from --test_case after
 # they are added into "all".
-GRPC_TRACE=all GRPC_VERBOSITY=DEBUG \
+GRPC_NODE_TRACE=all GRPC_NODE_VERBOSITY=DEBUG \
   python3 grpc/tools/run_tests/run_xds_tests.py \
     --test_case="all" \
     --project_id=grpc-testing \
diff --git a/packages/grpc-js/src/logging.ts b/packages/grpc-js/src/logging.ts
index 91b4e8f0..1140e8d8 100644
--- a/packages/grpc-js/src/logging.ts
+++ b/packages/grpc-js/src/logging.ts
@@ -20,20 +20,20 @@ import { LogVerbosity } from './constants';
 let _logger: Partial<Console> = console;
 let _logVerbosity: LogVerbosity = LogVerbosity.ERROR;
 
-if (process.env.GRPC_VERBOSITY) {
-  switch (process.env.GRPC_VERBOSITY) {
-    case 'DEBUG':
-      _logVerbosity = LogVerbosity.DEBUG;
-      break;
-    case 'INFO':
-      _logVerbosity = LogVerbosity.INFO;
-      break;
-    case 'ERROR':
-      _logVerbosity = LogVerbosity.ERROR;
-      break;
-    default:
-    // Ignore any other values
-  }
+const verbosityString = process.env.GRPC_NODE_VERBOSITY ?? process.env.GRPC_VERBOSITY ?? '';
+
+switch (verbosityString) {
+  case 'DEBUG':
+    _logVerbosity = LogVerbosity.DEBUG;
+    break;
+  case 'INFO':
+    _logVerbosity = LogVerbosity.INFO;
+    break;
+  case 'ERROR':
+    _logVerbosity = LogVerbosity.ERROR;
+    break;
+  default:
+  // Ignore any other values
 }
 
 export const getLogger = (): Partial<Console> => {
@@ -55,9 +55,8 @@ export const log = (severity: LogVerbosity, ...args: any[]): void => {
   }
 };
 
-const enabledTracers = process.env.GRPC_TRACE
-  ? process.env.GRPC_TRACE.split(',')
-  : [];
+const tracersString = process.env.GRPC_NODE_TRACE ?? process.env.GRPC_TRACE ?? '';
+const enabledTracers = tracersString.split(',');
 const allEnabled = enabledTracers.includes('all');
 
 export function trace(