From acb95f1056a2f5ff634dc925df4b34e91e18b1bf Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Fri, 24 Mar 2023 00:43:55 +0800
Subject: [PATCH 01/12] feat: intiial local logflare integration

---
 studio/.env                                   |   3 +-
 .../Settings/Logs/LogsQueryPanel.tsx          |   3 +-
 .../layouts/LogsLayout/LogsMenu.utils.ts      | 130 +++++++++---------
 .../NavigationBar/NavigationBar.utils.tsx     |  28 ++--
 studio/pages/api/constants.ts                 |   2 +-
 .../[ref]/analytics/endpoints/[name].ts       |  40 ++++++
 6 files changed, 122 insertions(+), 84 deletions(-)
 create mode 100644 studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts

diff --git a/studio/.env b/studio/.env
index 68180030ee1..de7b6e0e4c1 100644
--- a/studio/.env
+++ b/studio/.env
@@ -9,7 +9,8 @@ SUPABASE_PUBLIC_URL=http://localhost:8000
 SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
 SUPABASE_SERVICE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
 SENTRY_IGNORE_API_RESOLUTION_ERROR=1
-
+LOGFLARE_URL:http://localhost:54329
+LOGFLARE_API_KEY=api-key
 # TODO: evaluate these variables at runtime instead
 # https://nextjs.org/docs/basic-features/environment-variables#loading-environment-variables
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
diff --git a/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx b/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
index 3707cf06f8d..6151198cb49 100644
--- a/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
+++ b/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
@@ -14,6 +14,7 @@ import Link from 'next/link'
 import React from 'react'
 import { checkPermissions } from 'hooks'
 import { useProfileQuery } from 'data/profile/profile-query'
+import { IS_PLATFORM } from 'lib/constants'
 
 export interface LogsQueryPanelProps {
   templates?: LogTemplate[]
@@ -131,7 +132,7 @@ const LogsQueryPanel = ({
                 <Button type="default" onClick={onClear}>
                   Clear query
                 </Button>
-                {onSave && (
+                {IS_PLATFORM &&  onSave && (
                   <Tooltip.Root delayDuration={0}>
                     <Tooltip.Trigger>
                       <Button
diff --git a/studio/components/layouts/LogsLayout/LogsMenu.utils.ts b/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
index 26a7eaf0748..64920f230fb 100644
--- a/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
+++ b/studio/components/layouts/LogsLayout/LogsMenu.utils.ts
@@ -1,75 +1,75 @@
 import { Project } from 'types'
-import { ProductMenuGroup } from 'components/ui/ProductMenu/ProductMenu.types'
+import { ProductMenuGroup, ProductMenuGroupItem } from 'components/ui/ProductMenu/ProductMenu.types'
 import { IS_PLATFORM } from 'lib/constants'
 
 export const generateLogsMenu = (project?: Project): ProductMenuGroup[] => {
   const ref = project?.ref ?? 'default'
 
   return [
-    ...(IS_PLATFORM
-      ? [
-          {
-            title: 'Logs Explorer',
-            items: [
-              { key: 'explorer', name: 'Query', root: true },
-              { key: 'saved', name: 'Saved Queries' },
-              { key: 'recent', name: 'Recent Queries' },
-              { key: 'templates', name: 'Templates' },
-            ].map(({ key, name, root }) => ({
-              name,
-              key,
-              url: `/project/${ref}/logs/explorer${root ? '' : '/' + key}`,
+    {
+      title: 'Logs Explorer',
+      items: (
+        [
+          { key: 'explorer', name: 'Query', root: true },
+          IS_PLATFORM ? { key: 'saved', name: 'Saved Queries' } : null,
+          { key: 'recent', name: 'Recent Queries' },
+          { key: 'templates', name: 'Templates' },
+        ].filter((item) => item) as { name: string; key: string; root: boolean }[]
+      ).map(({ key, name, root }) => ({
+        name,
+        key,
+        url: `/project/${ref}/logs/explorer${root ? '' : '/' + key}`,
+        items: [],
+      })),
+    },
+    {
+      items: [
+        {
+          name: IS_PLATFORM ? 'API Edge Network' : 'Kong API',
+          key: 'edge-logs',
+          url: `/project/${ref}/logs/edge-logs`,
+          items: [],
+        },
+        {
+          name: 'Postgres',
+          key: 'postgres-logs',
+          url: `/project/${ref}/logs/postgres-logs`,
+          items: [],
+        },
+        {
+          name: 'PostgREST',
+          key: 'postgrest-logs',
+          url: `/project/${ref}/logs/postgrest-logs`,
+          items: [],
+        },
+        IS_PLATFORM
+          ? {
+              name: 'PgBouncer',
+              key: 'pgbouncer-logs',
+              url: `/project/${ref}/logs/pgbouncer-logs`,
               items: [],
-            })),
-          },
-          {
-            items: [
-              {
-                name: 'API Edge Network',
-                key: 'edge-logs',
-                url: `/project/${ref}/logs/edge-logs`,
-                items: [],
-              },
-              {
-                name: 'Postgres',
-                key: 'postgres-logs',
-                url: `/project/${ref}/logs/postgres-logs`,
-                items: [],
-              },
-              {
-                name: 'PostgREST',
-                key: 'postgrest-logs',
-                url: `/project/${ref}/logs/postgrest-logs`,
-                items: [],
-              },
-              {
-                name: 'PgBouncer',
-                key: 'pgbouncer-logs',
-                url: `/project/${ref}/logs/pgbouncer-logs`,
-                items: [],
-              },
-              {
-                name: 'Auth',
-                key: 'auth-logs',
-                url: `/project/${ref}/logs/auth-logs`,
-                items: [],
-              },
-              {
-                name: 'Storage',
-                key: 'storage-logs',
-                url: `/project/${ref}/logs/storage-logs`,
-                items: [],
-              },
-
-              {
-                name: 'Realtime',
-                key: 'realtime-logs',
-                url: `/project/${ref}/logs/realtime-logs`,
-                items: [],
-              },
-            ],
-          },
-        ]
-      : []),
+            }
+          : null,
+        ,
+        {
+          name: 'Auth',
+          key: 'auth-logs',
+          url: `/project/${ref}/logs/auth-logs`,
+          items: [],
+        },
+        {
+          name: 'Storage',
+          key: 'storage-logs',
+          url: `/project/${ref}/logs/storage-logs`,
+          items: [],
+        },
+        {
+          name: 'Realtime',
+          key: 'realtime-logs',
+          url: `/project/${ref}/logs/realtime-logs`,
+          items: [],
+        },
+      ].filter((item) => item) as ProductMenuGroupItem[],
+    },
   ]
 }
diff --git a/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx b/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
index 15c465e3fa5..bc052104c5a 100644
--- a/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
+++ b/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
@@ -139,22 +139,18 @@ export const generateOtherRoutes = (ref?: string, project?: ProjectBase): Route[
           },
         ]
       : []),
-    ...(IS_PLATFORM
-      ? [
-          {
-            key: 'logs',
-            label: 'Logs',
-            icon: <IconList size={18} strokeWidth={2} />,
-            link:
-              ref &&
-              (isProjectPaused
-                ? homeUrl
-                : isProjectBuilding
-                ? buildingUrl
-                : `/project/${ref}/logs/explorer`),
-          },
-        ]
-      : []),
+    {
+      key: 'logs',
+      label: 'Logs',
+      icon: <IconList size={18} strokeWidth={2} />,
+      link:
+        ref &&
+        (isProjectPaused
+          ? homeUrl
+          : isProjectBuilding
+          ? buildingUrl
+          : `/project/${ref}/logs/explorer`),
+    },
     {
       key: 'api',
       label: 'API Docs',
diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index 7d40e62c010..6d6613b1c49 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -1,5 +1,5 @@
 const PUBLIC_URL = new URL(process.env.SUPABASE_PUBLIC_URL || 'http://localhost:8000')
-
+export const PROJECT_ANALYTICS_URL = `${PUBLIC_URL.origin}/analytics/v1/`
 export const PROJECT_REST_URL = `${PUBLIC_URL.origin}/rest/v1/`
 export const PROJECT_ENDPOINT = PUBLIC_URL.host
 export const PROJECT_ENDPOINT_PROTOCOL = PUBLIC_URL.protocol.replace(':', '')
diff --git a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
new file mode 100644
index 00000000000..3eab72207ca
--- /dev/null
+++ b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
@@ -0,0 +1,40 @@
+import { NextApiRequest, NextApiResponse } from 'next'
+import apiWrapper from 'lib/api/apiWrapper'
+import { PROJECT_ANALYTICS_URL } from 'pages/api/constants'
+import { get } from 'lib/common/fetch'
+
+export default (req: NextApiRequest, res: NextApiResponse) => apiWrapper(req, res, handler)
+
+async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { method } = req
+
+  switch (method) {
+    case 'GET':
+      console.log(req)
+      const result = await proxyRequest(req)
+      return res.status(200).json(result)
+    default:
+      res.setHeader('Allow', ['GET'])
+      res.status(405).json({ data: null, error: { message: `Method ${method} Not Allowed` } })
+  }
+}
+
+const proxyRequest = async (req: NextApiRequest) => {
+  const { name, ...toForward } = req.query
+  const payload = { ...toForward, project_tier: 'ENTERPRISE' }
+  const search = '?' + new URLSearchParams(payload as any).toString()
+  const apiKey = process.env.LOGFLARE_API_KEY
+  console.log('api key', apiKey)
+  console.log('PROJECT_ANALYTICS_URL', PROJECT_ANALYTICS_URL)
+  const url = `${PROJECT_ANALYTICS_URL}api/endpoints/query/name/${name}${search}`
+  console.log('url', url)
+  const result = await get(url, {
+    headers: {
+      'x-api-key': apiKey,
+      'Content-Type': 'application/json',
+      Accept: 'application/json',
+    },
+  })
+  console.log('result', result)
+  return result
+}

From 179f2f0c567359559cbddf4467a1252e08eb4418 Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Mon, 27 Mar 2023 17:00:16 +0800
Subject: [PATCH 02/12] feat: add logflare api key to request calls

---
 docker/.env.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker/.env.example b/docker/.env.example
index 786316fdd96..130033409fc 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -78,3 +78,6 @@ SUPABASE_PUBLIC_URL=http://localhost:8000
 
 # Enable webp support
 IMGPROXY_ENABLE_WEBP_DETECTION=true
+
+# Configure Logflare API Calls
+LOGFLARE_API_KEY=api-key
\ No newline at end of file

From 881bfb98a712be93136103d6533714178eb6ddf6 Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Tue, 28 Mar 2023 01:15:13 +0800
Subject: [PATCH 03/12] feat: add handling for  missing env vars for logflare

---
 docker/.env.example                            |  3 ++-
 studio/.env                                    |  1 +
 .../[ref]/analytics/endpoints/[name].ts        | 18 ++++++++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/docker/.env.example b/docker/.env.example
index 130033409fc..6d101403b72 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -80,4 +80,5 @@ SUPABASE_PUBLIC_URL=http://localhost:8000
 IMGPROXY_ENABLE_WEBP_DETECTION=true
 
 # Configure Logflare API Calls
-LOGFLARE_API_KEY=api-key
\ No newline at end of file
+LOGFLARE_API_KEY=api-key
+LOGFLARE_URL=http://localhost:54328
\ No newline at end of file
diff --git a/studio/.env b/studio/.env
index de7b6e0e4c1..236f623b6f9 100644
--- a/studio/.env
+++ b/studio/.env
@@ -11,6 +11,7 @@ SUPABASE_SERVICE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6IC
 SENTRY_IGNORE_API_RESOLUTION_ERROR=1
 LOGFLARE_URL:http://localhost:54329
 LOGFLARE_API_KEY=api-key
+LOGFLARE_URL=http://localhost:54329
 # TODO: evaluate these variables at runtime instead
 # https://nextjs.org/docs/basic-features/environment-variables#loading-environment-variables
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
diff --git a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
index 3eab72207ca..0b297ec924b 100644
--- a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
+++ b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
@@ -10,9 +10,19 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 
   switch (method) {
     case 'GET':
-      console.log(req)
-      const result = await proxyRequest(req)
-      return res.status(200).json(result)
+      const missingEnvVars = [
+        process.env.LOGFLARE_API_KEY ? null : 'LOGFLARE_API_KEY',
+        process.env.LOGFLARE_URL ? null : 'LOGFLARE_URL',
+      ].filter((v) => v)
+      if (missingEnvVars.length == 0) {
+        const result = await proxyRequest(req)
+        return res.status(200).json(result)
+      } else {
+        return res
+          .status(500)
+          .json({ error: { message: `${missingEnvVars.join(', ')} env variables are not set` } })
+      }
+
     default:
       res.setHeader('Allow', ['GET'])
       res.status(405).json({ data: null, error: { message: `Method ${method} Not Allowed` } })
@@ -26,7 +36,7 @@ const proxyRequest = async (req: NextApiRequest) => {
   const apiKey = process.env.LOGFLARE_API_KEY
   console.log('api key', apiKey)
   console.log('PROJECT_ANALYTICS_URL', PROJECT_ANALYTICS_URL)
-  const url = `${PROJECT_ANALYTICS_URL}api/endpoints/query/name/${name}${search}`
+  const url = `${PROJECT_ANALYTICS_URL}endpoints/query/name/${name}${search}`
   console.log('url', url)
   const result = await get(url, {
     headers: {

From 6397c6124c1e71fc30954141b522ad9f958ccf83 Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Tue, 28 Mar 2023 01:15:41 +0800
Subject: [PATCH 04/12] feat: use LOGFLARE_URL to build analytics route for now

---
 studio/pages/api/constants.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index 6d6613b1c49..7a35be300fe 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -1,5 +1,8 @@
 const PUBLIC_URL = new URL(process.env.SUPABASE_PUBLIC_URL || 'http://localhost:8000')
-export const PROJECT_ANALYTICS_URL = `${PUBLIC_URL.origin}/analytics/v1/`
+
+// Use LOGFLARE_URL until analytics/v1/ routing is supported
+export const PROJECT_ANALYTICS_URL = `${process.env.LOGFLARE_URL}/api/`
+
 export const PROJECT_REST_URL = `${PUBLIC_URL.origin}/rest/v1/`
 export const PROJECT_ENDPOINT = PUBLIC_URL.host
 export const PROJECT_ENDPOINT_PROTOCOL = PUBLIC_URL.protocol.replace(':', '')
@@ -14,3 +17,4 @@ export const DEFAULT_PROJECT = {
   region: 'local',
   inserted_at: '2021-08-02T06:40:40.646Z',
 }
+  
\ No newline at end of file

From e3d510a726eb435d7696fb7aa40e8fdfd5b90345 Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Tue, 28 Mar 2023 02:23:07 +0800
Subject: [PATCH 05/12] feat: add flagging for local logs

---
 docker/.env.example                           |  5 +++-
 studio/.env                                   |  1 +
 .../Settings/Logs/Logs.constants.ts           |  3 ++
 .../NavigationBar/NavigationBar.utils.tsx     | 29 +++++++++++--------
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/docker/.env.example b/docker/.env.example
index 6d101403b72..2f2b3070e8d 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -81,4 +81,7 @@ IMGPROXY_ENABLE_WEBP_DETECTION=true
 
 # Configure Logflare API Calls
 LOGFLARE_API_KEY=api-key
-LOGFLARE_URL=http://localhost:54328
\ No newline at end of file
+LOGFLARE_URL=http://localhost:54328
+
+# Enable logging and observability in the UI
+NEXT_PUBLIC_ENABLE_LOGS=true
\ No newline at end of file
diff --git a/studio/.env b/studio/.env
index 236f623b6f9..adaf247319b 100644
--- a/studio/.env
+++ b/studio/.env
@@ -17,3 +17,4 @@ LOGFLARE_URL=http://localhost:54329
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
 NEXT_PUBLIC_GOTRUE_URL=$SUPABASE_PUBLIC_URL/auth/v1
 NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
+NEXT_PUBLIC_ENABLE_LOGS=true
\ No newline at end of file
diff --git a/studio/components/interfaces/Settings/Logs/Logs.constants.ts b/studio/components/interfaces/Settings/Logs/Logs.constants.ts
index e0e5c686ec2..c1cb707456d 100644
--- a/studio/components/interfaces/Settings/Logs/Logs.constants.ts
+++ b/studio/components/interfaces/Settings/Logs/Logs.constants.ts
@@ -1,4 +1,5 @@
 import dayjs from 'dayjs'
+import { IS_PLATFORM } from 'lib/constants'
 import { DatetimeHelper, FilterTableSet, LogTemplate } from '.'
 
 export const LOGS_EXPLORER_DOCS_URL =
@@ -665,3 +666,5 @@ export const TIER_QUERY_LIMITS: {
   TEAM: { text: '90 days', value: 90, unit: 'day', promptUpgrade: false },
   ENTERPRISE: { text: '90 days', value: 90, unit: 'day', promptUpgrade: false },
 }
+
+export const SHOW_O11Y = IS_PLATFORM ? true : process.env.NEXT_PUBLIC_ENABLE_LOGS == 'true'
diff --git a/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx b/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
index bc052104c5a..783e7b4aeb9 100644
--- a/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
+++ b/studio/components/layouts/ProjectLayout/NavigationBar/NavigationBar.utils.tsx
@@ -13,6 +13,7 @@ import SVG from 'react-inlinesvg'
 import { ProjectBase } from 'types'
 import { Route } from 'components/ui/ui.types'
 import { BASE_PATH, IS_PLATFORM, PROJECT_STATUS } from 'lib/constants'
+import { SHOW_O11Y } from 'components/interfaces/Settings/Logs'
 
 export const generateToolRoutes = (ref?: string, project?: ProjectBase): Route[] => {
   const isProjectBuilding = project?.status === PROJECT_STATUS.COMING_UP
@@ -139,18 +140,22 @@ export const generateOtherRoutes = (ref?: string, project?: ProjectBase): Route[
           },
         ]
       : []),
-    {
-      key: 'logs',
-      label: 'Logs',
-      icon: <IconList size={18} strokeWidth={2} />,
-      link:
-        ref &&
-        (isProjectPaused
-          ? homeUrl
-          : isProjectBuilding
-          ? buildingUrl
-          : `/project/${ref}/logs/explorer`),
-    },
+    ...(SHOW_O11Y
+      ? [
+          {
+            key: 'logs',
+            label: 'Logs',
+            icon: <IconList size={18} strokeWidth={2} />,
+            link:
+              ref &&
+              (isProjectPaused
+                ? homeUrl
+                : isProjectBuilding
+                ? buildingUrl
+                : `/project/${ref}/logs/explorer`),
+          },
+        ]
+      : []),
     {
       key: 'api',
       label: 'API Docs',

From 1babbee5cac58fa8914e5e52015158e4b3af964f Mon Sep 17 00:00:00 2001
From: TzeYiing <ty@tzeyiing.com>
Date: Wed, 29 Mar 2023 14:57:01 +0800
Subject: [PATCH 06/12] fix: typo in env var

---
 studio/.env | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/studio/.env b/studio/.env
index adaf247319b..f0c34edd84f 100644
--- a/studio/.env
+++ b/studio/.env
@@ -9,9 +9,8 @@ SUPABASE_PUBLIC_URL=http://localhost:8000
 SUPABASE_ANON_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJhbm9uIiwKICAgICJpc3MiOiAic3VwYWJhc2UtZGVtbyIsCiAgICAiaWF0IjogMTY0MTc2OTIwMCwKICAgICJleHAiOiAxNzk5NTM1NjAwCn0.dc_X5iR_VP_qT0zsiyj_I_OZ2T9FtRU2BBNWN8Bu4GE
 SUPABASE_SERVICE_KEY=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyAgCiAgICAicm9sZSI6ICJzZXJ2aWNlX3JvbGUiLAogICAgImlzcyI6ICJzdXBhYmFzZS1kZW1vIiwKICAgICJpYXQiOiAxNjQxNzY5MjAwLAogICAgImV4cCI6IDE3OTk1MzU2MDAKfQ.DaYlNEoUrrEn2Ig7tqibS-PHK5vgusbcbo7X36XVt4Q
 SENTRY_IGNORE_API_RESOLUTION_ERROR=1
-LOGFLARE_URL:http://localhost:54329
-LOGFLARE_API_KEY=api-key
 LOGFLARE_URL=http://localhost:54329
+LOGFLARE_API_KEY=api-key
 # TODO: evaluate these variables at runtime instead
 # https://nextjs.org/docs/basic-features/environment-variables#loading-environment-variables
 NEXT_PUBLIC_SITE_URL=http://localhost:3000

From b320c1991283dcb86d11bee01374195c824f7ead Mon Sep 17 00:00:00 2001
From: Ziinc <Ziinc@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:48:45 +0800
Subject: [PATCH 07/12] Update
 studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts

Co-authored-by: Han Qiao <sweatybridge@gmail.com>
---
 studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
index 0b297ec924b..5046dfeee02 100644
--- a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
+++ b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
@@ -34,8 +34,6 @@ const proxyRequest = async (req: NextApiRequest) => {
   const payload = { ...toForward, project_tier: 'ENTERPRISE' }
   const search = '?' + new URLSearchParams(payload as any).toString()
   const apiKey = process.env.LOGFLARE_API_KEY
-  console.log('api key', apiKey)
-  console.log('PROJECT_ANALYTICS_URL', PROJECT_ANALYTICS_URL)
   const url = `${PROJECT_ANALYTICS_URL}endpoints/query/name/${name}${search}`
   console.log('url', url)
   const result = await get(url, {

From b9bc2f3be058f197780a1f59c6d9c4f49339e2b5 Mon Sep 17 00:00:00 2001
From: Ziinc <Ziinc@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:49:20 +0800
Subject: [PATCH 08/12] Update studio/pages/api/constants.ts

Co-authored-by: Han Qiao <sweatybridge@gmail.com>
---
 studio/pages/api/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index 7a35be300fe..8517060a48c 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -17,4 +17,4 @@ export const DEFAULT_PROJECT = {
   region: 'local',
   inserted_at: '2021-08-02T06:40:40.646Z',
 }
-  
\ No newline at end of file
+ 
\ No newline at end of file

From e1fc202e562dcd99af5cde1e5fa5c0ce8c6bbbd8 Mon Sep 17 00:00:00 2001
From: Ziinc <Ziinc@users.noreply.github.com>
Date: Thu, 30 Mar 2023 09:54:45 +0800
Subject: [PATCH 09/12] Chore: Update .env.example

---
 docker/.env.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/.env.example b/docker/.env.example
index 2f2b3070e8d..ed0a1c8ad0f 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -81,7 +81,7 @@ IMGPROXY_ENABLE_WEBP_DETECTION=true
 
 # Configure Logflare API Calls
 LOGFLARE_API_KEY=api-key
-LOGFLARE_URL=http://localhost:54328
+LOGFLARE_URL=http://localhost:54329
 
 # Enable logging and observability in the UI
 NEXT_PUBLIC_ENABLE_LOGS=true
\ No newline at end of file

From ba2f1c5ebf9ce7883913b985640f5ffef740933d Mon Sep 17 00:00:00 2001
From: Han Qiao <sweatybridge@gmail.com>
Date: Thu, 30 Mar 2023 10:09:09 +0800
Subject: [PATCH 10/12] chore: add new line to end of files

---
 docker/.env.example           | 2 +-
 studio/.env                   | 2 +-
 studio/pages/api/constants.ts | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docker/.env.example b/docker/.env.example
index ed0a1c8ad0f..734367c90c4 100644
--- a/docker/.env.example
+++ b/docker/.env.example
@@ -84,4 +84,4 @@ LOGFLARE_API_KEY=api-key
 LOGFLARE_URL=http://localhost:54329
 
 # Enable logging and observability in the UI
-NEXT_PUBLIC_ENABLE_LOGS=true
\ No newline at end of file
+NEXT_PUBLIC_ENABLE_LOGS=true
diff --git a/studio/.env b/studio/.env
index f0c34edd84f..58f33ddf217 100644
--- a/studio/.env
+++ b/studio/.env
@@ -16,4 +16,4 @@ LOGFLARE_API_KEY=api-key
 NEXT_PUBLIC_SITE_URL=http://localhost:3000
 NEXT_PUBLIC_GOTRUE_URL=$SUPABASE_PUBLIC_URL/auth/v1
 NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
-NEXT_PUBLIC_ENABLE_LOGS=true
\ No newline at end of file
+NEXT_PUBLIC_ENABLE_LOGS=true
diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index 8517060a48c..c03f4640861 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -16,5 +16,4 @@ export const DEFAULT_PROJECT = {
   status: 'ACTIVE_HEALTHY',
   region: 'local',
   inserted_at: '2021-08-02T06:40:40.646Z',
-}
- 
\ No newline at end of file
+}
\ No newline at end of file

From 127ca904be90261228e12ed176faf3f070555df5 Mon Sep 17 00:00:00 2001
From: Han Qiao <sweatybridge@gmail.com>
Date: Thu, 30 Mar 2023 10:09:54 +0800
Subject: [PATCH 11/12] chore: new line eof

---
 studio/pages/api/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studio/pages/api/constants.ts b/studio/pages/api/constants.ts
index c03f4640861..e798f1e5693 100644
--- a/studio/pages/api/constants.ts
+++ b/studio/pages/api/constants.ts
@@ -16,4 +16,4 @@ export const DEFAULT_PROJECT = {
   status: 'ACTIVE_HEALTHY',
   region: 'local',
   inserted_at: '2021-08-02T06:40:40.646Z',
-}
\ No newline at end of file
+}

From 36f1e699cb7b799b035e5c65fc661f0a5982feda Mon Sep 17 00:00:00 2001
From: Ziinc <Ziinc@users.noreply.github.com>
Date: Thu, 30 Mar 2023 12:38:35 +0800
Subject: [PATCH 12/12] Chore:Update [name].ts, remove console logs

---
 studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
index 5046dfeee02..2b7ab5ec113 100644
--- a/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
+++ b/studio/pages/api/projects/[ref]/analytics/endpoints/[name].ts
@@ -35,7 +35,6 @@ const proxyRequest = async (req: NextApiRequest) => {
   const search = '?' + new URLSearchParams(payload as any).toString()
   const apiKey = process.env.LOGFLARE_API_KEY
   const url = `${PROJECT_ANALYTICS_URL}endpoints/query/name/${name}${search}`
-  console.log('url', url)
   const result = await get(url, {
     headers: {
       'x-api-key': apiKey,
@@ -43,6 +42,5 @@ const proxyRequest = async (req: NextApiRequest) => {
       Accept: 'application/json',
     },
   })
-  console.log('result', result)
   return result
 }