From 2dcb1a67a12eb105be4e51e61bc7d9382b88738a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 21 Jul 2023 14:16:43 +0200
Subject: [PATCH 1/3] Add service name to the logs only on self-host

---
 packages/backend-core/src/logging/pino/logger.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts
index f2024db72b..7439755030 100644
--- a/packages/backend-core/src/logging/pino/logger.ts
+++ b/packages/backend-core/src/logging/pino/logger.ts
@@ -19,8 +19,14 @@ if (!env.DISABLE_PINO_LOGGER) {
         return { level: label.toUpperCase() }
       },
       bindings: () => {
-        return {
-          service: env.SERVICE_NAME,
+        if (env.SELF_HOSTED) {
+          // "service" is being injected in datadog using the pod names,
+          // so we should leave it blank to allow the default behaviour if it's not running self-hosted
+          return {
+            service: env.SERVICE_NAME,
+          }
+        } else {
+          return {}
         }
       },
     },

From 0ac639fe7aecf3372f6b26c02bcc6b87b3dd847f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 21 Jul 2023 14:26:57 +0200
Subject: [PATCH 2/3] Add default process.stdout if no dev

---
 packages/backend-core/src/logging/pino/logger.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts
index 7439755030..7d0c5f8daf 100644
--- a/packages/backend-core/src/logging/pino/logger.ts
+++ b/packages/backend-core/src/logging/pino/logger.ts
@@ -35,9 +35,9 @@ if (!env.DISABLE_PINO_LOGGER) {
 
   const destinations: pino.DestinationStream[] = []
 
-  if (env.isDev()) {
-    destinations.push(pinoPretty({ singleLine: true }))
-  }
+  destinations.push(
+    env.isDev() ? pinoPretty({ singleLine: true }) : process.stdout
+  )
 
   if (env.SELF_HOSTED) {
     destinations.push(localFileDestination())

From d168a0b902f91dbd0841cfc86b5f17b500accf95 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 21 Jul 2023 17:52:54 +0200
Subject: [PATCH 3/3] Honor level on logging

---
 .../backend-core/src/logging/pino/logger.ts   | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/packages/backend-core/src/logging/pino/logger.ts b/packages/backend-core/src/logging/pino/logger.ts
index 7d0c5f8daf..7c444a3a59 100644
--- a/packages/backend-core/src/logging/pino/logger.ts
+++ b/packages/backend-core/src/logging/pino/logger.ts
@@ -12,11 +12,12 @@ import { localFileDestination } from "../system"
 
 let pinoInstance: pino.Logger | undefined
 if (!env.DISABLE_PINO_LOGGER) {
+  const level = env.LOG_LEVEL
   const pinoOptions: LoggerOptions = {
-    level: env.LOG_LEVEL,
+    level,
     formatters: {
-      level: label => {
-        return { level: label.toUpperCase() }
+      level: level => {
+        return { level: level.toUpperCase() }
       },
       bindings: () => {
         if (env.SELF_HOSTED) {
@@ -33,14 +34,22 @@ if (!env.DISABLE_PINO_LOGGER) {
     timestamp: () => `,"timestamp":"${new Date(Date.now()).toISOString()}"`,
   }
 
-  const destinations: pino.DestinationStream[] = []
+  const destinations: pino.StreamEntry[] = []
 
   destinations.push(
-    env.isDev() ? pinoPretty({ singleLine: true }) : process.stdout
+    env.isDev()
+      ? {
+          stream: pinoPretty({ singleLine: true }),
+          level: level as pino.Level,
+        }
+      : { stream: process.stdout, level: level as pino.Level }
   )
 
   if (env.SELF_HOSTED) {
-    destinations.push(localFileDestination())
+    destinations.push({
+      stream: localFileDestination(),
+      level: level as pino.Level,
+    })
   }
 
   pinoInstance = destinations.length