feat: improvement on log and trace usage.

OTEL.md

@@ -51,17 +51,14 @@ const exporter = new JaegerExporter({
 
 7. Deploy the example to OpenShift local
 
-* Uncomment the `require('./tracing.js');` on `frontend/app.js`
-* Uncomment the `require('./tracing.js');` on `worker/app.js`
-
 ```
-$ oc create -f service.amqp.yaml
-$ cd frontend
-$ npm install
-$ npm run openshift
-$ cd ../worker
-$ npm install
-$ npm run openshift
+oc create -f service.amqp.yaml
+cd frontend
+npm install
+npm run openshift:enable:trace
+cd ../worker
+npm install
+npm run openshift:enable:trace
 ```
 
 8. When you login on Jaeger UI you can see the result like this:

frontend/app.js

@@ -18,7 +18,7 @@
  *
  */
 
-// require('./tracing.js');
+const logger = require('./logger.js');
 
 const path = require('path');
 const crypto = require('crypto');
@@ -34,7 +34,7 @@ let amqpConnectionBindings;
 try {
   amqpConnectionBindings = serviceBindings.getBinding('AMQP', 'rhea');
 } catch (err) {
-  console.log(err);
+  logger.error(err);
   amqpConnectionBindings = {
     host: process.env.MESSAGING_SERVICE_HOST || 'localhost',
     port: process.env.MESSAGING_SERVICE_PORT || 5672,
@@ -68,12 +68,12 @@ function sendRequests () {
 
     requestSender.send(message);
 
-    console.log(`${id}: Sent request ${JSON.stringify(message)}`);
+    logger.info(`${id}: Sent request ${JSON.stringify(message)}`);
   }
 }
 
 container.on('connection_open', event => {
-  console.log(
+  logger.info(
     `${id}: Connected to AMQP messaging service at ${amqpConnectionBindings.host}:${amqpConnectionBindings.port}`
   );
   requestSender = event.connection.open_sender('requests');
@@ -102,7 +102,7 @@ container.on('message', event => {
   if (event.receiver === responseReceiver) {
     const response = event.message;
 
-    console.log(`${id}: Received response ${response}`);
+    logger.info(`${id}: Received response ${response}`);
 
     responses[response.correlation_id] = {
       requestId: response.correlation_id,
@@ -113,10 +113,10 @@ container.on('message', event => {
 });
 
 container.on('error', err => {
-  console.log(err);
+  logger.info(err);
 });
 
-console.log(
+logger.info(
   `${id}: Attempting to connect to AMQP messaging service at ${amqpConnectionBindings.host}:${amqpConnectionBindings.port}`
 );
 container.connect(amqpConnectionBindings);

frontend/bin/www

@@ -23,14 +23,7 @@
 /**
  * Module dependencies.
  */
-const pinoDebug = require('pino-debug');
-const pino = require('pino');
-const logger = pino({
-  transport: {
-    target: 'pino-pretty'
-  }
-});
-pinoDebug(logger);
+const logger = require('../logger.js');
 
 const app = require('../app');
 const http = require('http');
@@ -92,10 +85,10 @@ function onError (error) {
   // handle specific listen errors with friendly messages
   switch (error.code) {
     case 'EACCES':
-      console.error(bind + ' requires elevated privileges');
+      logger.error(bind + ' requires elevated privileges');
       process.exit(1);
     case 'EADDRINUSE':
-      console.error(bind + ' is already in use');
+      logger.error(bind + ' is already in use');
       process.exit(1);
     default:
       throw error;

frontend/logger.js

@@ -0,0 +1,3 @@
+const pino = require('pino');
+
+module.exports = pino({});