Add common logging to poller

nielm · Dec 12, 2023 · de90fb8 · de90fb8
1 parent 5f1c459
commit de90fb8
Show file tree

Hide file tree

Showing 12 changed files with 157 additions and 160 deletions.
diff --git a/src/index.js b/src/index.js
@@ -17,6 +17,7 @@ const pollerCore = require('./poller/poller-core');
 const scalerCore = require('./scaler/scaler-core');
 const poller = require('./poller');
 const scaler = require('./scaler');
+const {logger} = require('./autoscaler-common/logger');
 const yaml = require('js-yaml');
 const fs = require('fs/promises');
 
@@ -27,8 +28,7 @@ async function main() {
   const DEFAULT_CONFIG_LOCATION =
       '/etc/autoscaler-config/autoscaler-config.yaml';
 
-  scalerCore.log(
-      `Autoscaler unified poller+scaler job started`, {severity: 'INFO'});
+  logger.info(`Autoscaler unified poller+scaler job started`);
 
   let configLocation = DEFAULT_CONFIG_LOCATION;
 
@@ -41,9 +41,9 @@ async function main() {
 
   if (process.env.AUTOSCALER_CONFIG) {
     configLocation = process.env.AUTOSCALER_CONFIG;
-    scalerCore.log(`Using custom config location ${configLocation}`);
+    logger.debug(`Using custom config location ${configLocation}`);
   } else {
-    pollerCore.log(`Using default config location ${configLocation}`);
+    logger.debug(`Using default config location ${configLocation}`);
   }
 
   try {
@@ -54,9 +54,9 @@ async function main() {
       await scalerCore.scaleSpannerInstanceLocal(spanner);
     }
   } catch (err) {
-    scalerCore.log(
-        'Error in unified poller/scaler wrapper:',
-        {severity: 'ERROR', payload: err});
+    logger.error({
+      message: 'Error in unified poller/scaler wrapper:',
+      err: err});
   }
 }
 

diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/poller/index.js b/src/poller/index.js
@@ -16,6 +16,7 @@
 const pollerCore = require('poller-core');
 const yaml = require('js-yaml');
 const fs = require('fs/promises');
+const {logger} = require('../autoscaler-common/logger');
 
 /**
  * Startup function
@@ -24,7 +25,7 @@ async function main() {
   const DEFAULT_CONFIG_LOCATION =
       '/etc/autoscaler-config/autoscaler-config.yaml';
 
-  pollerCore.log(`Autoscaler Poller job started`, {severity: 'INFO'});
+  logger.info(`Autoscaler Poller job started`);
 
   let configLocation = DEFAULT_CONFIG_LOCATION;
 
@@ -37,18 +38,19 @@ async function main() {
 
   if (process.env.AUTOSCALER_CONFIG) {
     configLocation = process.env.AUTOSCALER_CONFIG;
-    pollerCore.log(`Using custom config location ${configLocation}`);
+    logger.debug(`Using custom config location ${configLocation}`);
   } else {
-    pollerCore.log(`Using default config location ${configLocation}`);
+    logger.debug(`Using default config location ${configLocation}`);
   }
 
   try {
     const config = await fs.readFile(configLocation, {encoding: 'utf8'});
     await pollerCore.checkSpannerScaleMetricsJSON(
         JSON.stringify(yaml.load(config)));
   } catch (err) {
-    pollerCore.log(
-        'Error in Poller wrapper:', {severity: 'ERROR', payload: err});
+    logger.error({
+      message: 'Error in Poller wrapper:',
+      err: err});
   }
 }
 

diff --git a/src/poller/package-lock.json b/src/poller/package-lock.json
diff --git a/src/poller/package.json b/src/poller/package.json
@@ -6,9 +6,10 @@
     "dependencies": {
         "js-yaml": "^4.1.0",
         "poller-core": "file:poller-core",
-        "run": "^1.4.0"
+        "run": "^1.4.0",
+        "autoscaler-common": "file:../autoscaler-common"
     },
     "scripts": {
-        "start": "node -e \"require('./index').autoscalerMain()\""
+        "start": "node -e \"require('./index').main()\""
     }
 }