From 9f59ee821a98ad66d7193d88dca22894100006e7 Mon Sep 17 00:00:00 2001
From: Marcus Eide <eide@spotify.com>
Date: Wed, 2 Sep 2020 11:07:33 +0200
Subject: [PATCH 1/2] Add new log format

---
 packages/backend-common/package.json          |  3 +-
 .../backend-common/src/logging/formats.ts     | 35 +++++++++++++++++++
 .../backend-common/src/logging/rootLogger.ts  |  7 ++--
 3 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 packages/backend-common/src/logging/formats.ts

diff --git a/packages/backend-common/package.json b/packages/backend-common/package.json
index 92d301d7e3..248e638ead 100644
--- a/packages/backend-common/package.json
+++ b/packages/backend-common/package.json
@@ -46,7 +46,8 @@
     "prom-client": "^12.0.0",
     "selfsigned": "^1.10.7",
     "stoppable": "^1.1.0",
-    "winston": "^3.2.1"
+    "winston": "^3.2.1",
+    "logform": "^2.1.1"
   },
   "peerDependencies": {
     "pg-connection-string": "^2.3.0"
diff --git a/packages/backend-common/src/logging/formats.ts b/packages/backend-common/src/logging/formats.ts
new file mode 100644
index 0000000000..5f00448744
--- /dev/null
+++ b/packages/backend-common/src/logging/formats.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020 Spotify AB
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import * as winston from 'winston';
+import { TransformableInfo } from 'logform';
+
+const coloredTemplate = (info: TransformableInfo) => {
+  const { timestamp, level, message, plugin, service } = info;
+  const colorizer = winston.format.colorize();
+  const prefix = plugin || service;
+  const timestampColor = colorizer.colorize('timestamp', timestamp);
+  const prefixColor = colorizer.colorize('prefix', prefix);
+
+  return `${timestampColor} ${prefixColor} ${level} ${message}`;
+};
+
+export const coloredFormat = winston.format.combine(
+  winston.format.timestamp(),
+  winston.format.colorize({
+    colors: { timestamp: 'dim', prefix: 'blue' },
+  }),
+  winston.format.printf(coloredTemplate),
+);
diff --git a/packages/backend-common/src/logging/rootLogger.ts b/packages/backend-common/src/logging/rootLogger.ts
index fd2f3a1c8b..306ed23444 100644
--- a/packages/backend-common/src/logging/rootLogger.ts
+++ b/packages/backend-common/src/logging/rootLogger.ts
@@ -14,17 +14,14 @@
  * limitations under the License.
  */
 import * as winston from 'winston';
+import { coloredFormat } from './formats';
 
 let rootLogger: winston.Logger = winston.createLogger({
   level: process.env.LOG_LEVEL || 'info',
   format:
     process.env.NODE_ENV === 'production'
       ? winston.format.json()
-      : winston.format.combine(
-          winston.format.colorize(),
-          winston.format.timestamp(),
-          winston.format.simple(),
-        ),
+      : coloredFormat,
   defaultMeta: { service: 'backstage' },
   transports: [
     new winston.transports.Console({

From 7d8058a1ef0fab41a6801e8f3ecbf616098a2faf Mon Sep 17 00:00:00 2001
From: Marcus Eide <eide@spotify.com>
Date: Wed, 2 Sep 2020 11:08:40 +0200
Subject: [PATCH 2/2] Make http-proxy-middleware log to supplied logger

---
 plugins/proxy-backend/src/service/router.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/proxy-backend/src/service/router.ts b/plugins/proxy-backend/src/service/router.ts
index 5273b2c806..5c5e17b872 100644
--- a/plugins/proxy-backend/src/service/router.ts
+++ b/plugins/proxy-backend/src/service/router.ts
@@ -34,6 +34,7 @@ export interface RouterOptions {
 // given config.
 function buildMiddleware(
   pathPrefix: string,
+  logger: Logger,
   route: string,
   config: string | ProxyConfig,
 ): Proxy {
@@ -54,6 +55,9 @@ function buildMiddleware(
     fullConfig.changeOrigin = true;
   }
 
+  // Attach the logger to the proxy config
+  fullConfig.logProvider = () => logger;
+
   return createProxyMiddleware(fullConfig);
 }
 
@@ -66,7 +70,12 @@ export async function createRouter(
   Object.entries(proxyConfig).forEach(([route, proxyRouteConfig]) => {
     router.use(
       route,
-      buildMiddleware(options.pathPrefix, route, proxyRouteConfig),
+      buildMiddleware(
+        options.pathPrefix,
+        options.logger,
+        route,
+        proxyRouteConfig,
+      ),
     );
   });