From ba9f7f42d2bfa45ed27aed0129d44d982ec459d6 Mon Sep 17 00:00:00 2001 From: Kio! <im@kio.moe> Date: Thu, 19 Dec 2024 17:30:22 +0000 Subject: [PATCH 1/5] Add Release version to sentry logging --- packages/backend/src/boot/master.ts | 3 +++ packages/backend/src/boot/worker.ts | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index 3559816e96..db80dc367a 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -90,6 +90,9 @@ export async function masterMain() { maxBreadcrumbs: 0, + // Set release version + release: "Sharkey@" + meta.version, + ...config.sentryForBackend.options, }); } diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 5d4a15b29f..0461484782 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -30,6 +30,9 @@ export async function workerMain() { maxBreadcrumbs: 0, + // Set release version + release: "Sharkey@" + meta.version, + ...config.sentryForBackend.options, }); } -- GitLab From 990388141c79ad455d912b23a1be8c6c6d264bb7 Mon Sep 17 00:00:00 2001 From: Kio! <im@kio.moe> Date: Thu, 19 Dec 2024 19:01:14 +0000 Subject: [PATCH 2/5] Add Meta, oops --- packages/backend/src/boot/worker.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 0461484782..890c0e7683 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -9,6 +9,7 @@ import { nodeProfilingIntegration } from '@sentry/profiling-node'; import { envOption } from '@/env.js'; import { loadConfig } from '@/config.js'; import { jobQueue, server } from './common.js'; +const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8')); /** * Init worker process -- GitLab From cdc11df562f3f8729ac51e785028ed66e2715eef Mon Sep 17 00:00:00 2001 From: Kio! <im@kio.moe> Date: Thu, 19 Dec 2024 19:07:04 +0000 Subject: [PATCH 3/5] Add missing imports before Dakkar can mention it --- packages/backend/src/boot/worker.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 890c0e7683..647ccbccc5 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -9,6 +9,9 @@ import { nodeProfilingIntegration } from '@sentry/profiling-node'; import { envOption } from '@/env.js'; import { loadConfig } from '@/config.js'; import { jobQueue, server } from './common.js'; +import * as fs from 'node:fs'; +const _filename = fileURLToPath(import.meta.url); +const _dirname = dirname(_filename); const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../../built/meta.json`, 'utf-8')); /** -- GitLab From 0bb61fef7b265bdb219abc1f89ceae8712d1620f Mon Sep 17 00:00:00 2001 From: Kio! <im@kio.moe> Date: Thu, 19 Dec 2024 19:11:52 +0000 Subject: [PATCH 4/5] Update file worker.ts --- packages/backend/src/boot/worker.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 647ccbccc5..400083851a 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -9,6 +9,7 @@ import { nodeProfilingIntegration } from '@sentry/profiling-node'; import { envOption } from '@/env.js'; import { loadConfig } from '@/config.js'; import { jobQueue, server } from './common.js'; +import { fileURLToPath } from 'node:url'; import * as fs from 'node:fs'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); -- GitLab From 903b2be13250e1381b7d29bf4e1cd468b9e84095 Mon Sep 17 00:00:00 2001 From: Kio! <im@kio.moe> Date: Thu, 19 Dec 2024 19:20:57 +0000 Subject: [PATCH 5/5] Update file worker.ts --- packages/backend/src/boot/worker.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 400083851a..494e7c8c10 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -10,6 +10,7 @@ import { envOption } from '@/env.js'; import { loadConfig } from '@/config.js'; import { jobQueue, server } from './common.js'; import { fileURLToPath } from 'node:url'; +import { dirname } from 'node:path'; import * as fs from 'node:fs'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); -- GitLab