2.4.35

.env

@@ -45,7 +45,6 @@ MAIL_RECIPIENTS=info@e-tib.com
 # ────────────────────────────────────────────────────────────────────────────
 LOG_LEVEL=info
 GATEKEEPER_PASSWORD=klz2026
-SENTRY_DSN=
 # SENTRY_ENVIRONMENT is set automatically by CI
 
 # ────────────────────────────────────────────────────────────────────────────

.env.example

@@ -45,7 +45,6 @@ MAIL_RECIPIENTS=info@e-tib.com
 # ────────────────────────────────────────────────────────────────────────────
 LOG_LEVEL=info
 GATEKEEPER_PASSWORD=klz2026
-SENTRY_DSN=
 # SENTRY_ENVIRONMENT is set automatically by CI
 
 # ────────────────────────────────────────────────────────────────────────────

.env.production

@@ -16,7 +16,7 @@ UMAMI_WEBSITE_ID=d773ea10-a3b3-4ccf-9024-987e14c4d669
 UMAMI_API_ENDPOINT=https://analytics.infra.mintel.me
 
 # Error Tracking (GlitchTip/Sentry)
-SENTRY_DSN=
+SENTRY_DSN=https://dcb81958-dbf2-4a3d-b422-875f4672c14b@glitchtip.infra.mintel.me/5
 
 # Email Configuration (Mailgun)
 MAIL_HOST=smtp.eu.mailgun.org

app/[locale]/errors/api/relay/route.ts

@@ -1,13 +1,58 @@
 import { NextResponse } from 'next/server';
 
+const ALLOWED_HOSTS = ['glitchtip.infra.mintel.me', 'errors.infra.mintel.me'];
+
 export async function POST(req: Request) {
   try {
     const rawText = await req.text();
-    // Sentry sends NDJSON (Newline Delimited JSON). Split by newline to parse safely.
-    const items = rawText.split('\n').filter(Boolean).map(line => JSON.parse(line));
-    console.log("CLIENT ERROR INTERCEPTED:", JSON.stringify(items[0], null, 2));
+    const items = rawText.split('\n');
+    
+    if (items.length === 0 || !items[0]) {
+      return NextResponse.json({ error: 'Empty payload' }, { status: 400 });
+    }
+
+    const header = JSON.parse(items[0]);
+    // Use the server's configured DSN (if available) to override the client's potentially fake DSN
+    // This allows the client to work without exposing NEXT_PUBLIC_SENTRY_DSN
+    const dsn = process.env.SENTRY_DSN || header.dsn;
+    if (!dsn) {
+      return NextResponse.json({ error: 'No DSN found' }, { status: 400 });
+    }
+
+    const url = new URL(dsn);
+    const projectId = url.pathname.replace('/', '');
+    const host = url.hostname;
+
+    if (!ALLOWED_HOSTS.includes(host)) {
+      return NextResponse.json({ error: 'Invalid Sentry Host' }, { status: 400 });
+    }
+
+    // Rewrite the DSN in the envelope header so Glitchtip doesn't reject the fake client DSN
+    if (process.env.SENTRY_DSN) {
+      header.dsn = process.env.SENTRY_DSN;
+      items[0] = JSON.stringify(header);
+    }
+
+    const sentryIngestUrl = `https://${host}/api/${projectId}/envelope/`;
+    const payloadToForward = items.join('\n');
+
+    const response = await fetch(sentryIngestUrl, {
+      method: 'POST',
+      body: payloadToForward,
+      headers: {
+        'Content-Type': 'application/x-sentry-envelope',
+      },
+    });
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      console.error(`[Sentry Tunnel] Relay rejected (${response.status}):`, errorText);
+      return NextResponse.json({ error: 'Sentry rejection' }, { status: response.status });
+    }
+
+    return NextResponse.json({ success: true });
   } catch (e) {
-    console.log("Failed to parse relay body (NDJSON)", e);
+    console.error("[Sentry Tunnel] Failed to parse or relay body", e);
+    return NextResponse.json({ error: 'Relay failed' }, { status: 500 });
   }
-  return NextResponse.json({ success: true });
 }

components/analytics/AnalyticsShell.tsx

@@ -22,11 +22,18 @@ export default function AnalyticsShell() {
       return;
     }
 
+    const initServices = () => {
+      import('@/lib/services/create-services').then(({ getAppServices }) => {
+        getAppServices();
+        setShouldLoad(true);
+      }).catch(console.error);
+    };
+
     // Wait until browser is completely idle before loading heavy analytics/logger/sentry SDKs
     if (typeof window !== 'undefined' && 'requestIdleCallback' in window) {
-      window.requestIdleCallback(() => setShouldLoad(true), { timeout: 3000 });
+      window.requestIdleCallback(initServices, { timeout: 3000 });
     } else {
-      const timer = setTimeout(() => setShouldLoad(true), 2500);
+      const timer = setTimeout(initServices, 2500);
       return () => clearTimeout(timer);
     }
   }, []);

lib/services/create-services.ts

@@ -2,6 +2,7 @@ import { AppServices } from './app-services';
 import { NoopAnalyticsService } from './analytics/noop-analytics-service';
 import { UmamiAnalyticsService } from './analytics/umami-analytics-service';
 import { MemoryCacheService } from './cache/memory-cache-service';
+import { GlitchtipErrorReportingService } from './errors/glitchtip-error-reporting-service';
 import { NoopErrorReportingService } from './errors/noop-error-reporting-service';
 import { NoopLoggerService } from './logging/noop-logger-service';
 import { PinoLoggerService } from './logging/pino-logger-service';
@@ -67,7 +68,17 @@ export function getAppServices(): AppServices {
   logger.info('Notification service initialized (noop)');
 
   // Create error reporting service (GlitchTip/Sentry or no-op)
-  const errors = new NoopErrorReportingService();
+  const errors = sentryEnabled
+    ? new GlitchtipErrorReportingService(
+        {
+          enabled: true,
+          dsn: config.errors.glitchtip.dsn,
+          tracesSampleRate: 0.1, // Client-side we usually want lower sample rate
+        },
+        logger,
+        notifications,
+      )
+    : new NoopErrorReportingService();
 
   if (sentryEnabled) {
     logger.info(

package.json

@@ -140,7 +140,7 @@
     "prepare": "husky",
     "preinstall": "npx only-allow pnpm"
   },
-  "version": "2.4.28",
+  "version": "2.4.35",
   "pnpm": {
     "onlyBuiltDependencies": [
       "@parcel/watcher",

tests/create-services.test.ts

@@ -0,0 +1,26 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { getAppServices } from '../lib/services/create-services';
+import { GlitchtipErrorReportingService } from '../lib/services/errors/glitchtip-error-reporting-service';
+
+// Mock config to ensure sentry is enabled
+vi.mock('../lib/config', () => ({
+  config: {
+    analytics: { umami: { enabled: false } },
+    errors: { glitchtip: { enabled: true, dsn: 'https://test@glitchtip.infra.mintel.me/5' } },
+    logging: { level: 'info' },
+    notifications: { gotify: { enabled: false } },
+  },
+  getMaskedConfig: () => ({}),
+}));
+
+describe('AppServices (Client)', () => {
+  beforeEach(() => {
+    // Reset singleton
+    globalThis.__appServices = undefined;
+  });
+
+  it('should instantiate GlitchtipErrorReportingService when enabled', () => {
+    const services = getAppServices();
+    expect(services.errors).toBeInstanceOf(GlitchtipErrorReportingService);
+  });
+});

tests/sentry-config.test.ts

@@ -0,0 +1,20 @@
+import { readFileSync } from 'fs';
+import { resolve } from 'path';
+import { describe, it, expect } from 'vitest';
+import * as dotenv from 'dotenv';
+
+describe('Sentry Configuration', () => {
+  it('should have a valid SENTRY_DSN in .env', () => {
+    // Read the .env file as a string
+    const envPath = resolve(process.cwd(), '.env');
+    const envContent = readFileSync(envPath, 'utf8');
+
+    // Parse it using dotenv
+    const envConfig = dotenv.parse(envContent);
+
+    // Assert that SENTRY_DSN is defined and not empty
+    expect(envConfig.SENTRY_DSN).toBeDefined();
+    expect(envConfig.SENTRY_DSN.length).toBeGreaterThan(0);
+    expect(envConfig.SENTRY_DSN).toMatch(/^https:\/\/.+@glitchtip.infra.mintel.me\/\d+$/);
+  });
+});