@akinon/next 1.82.0-rc.6 → 1.82.0-rc.8

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.82.0-rc.8
+
+### Minor Changes
+
+- 17bfadc: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+
+## 1.82.0-rc.7
+
+### Minor Changes
+
+- c3b2f3f: ZERO-3267: Enable sentry client errors and filter them by log type
+
 ## 1.82.0-rc.6
 
 ### Minor Changes

package/instrumentation/node.ts

@@ -4,17 +4,19 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
+if (process.env.NODE_ENV === 'development') {
+  const sdk = new NodeSDK({
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+    }),
+    spanProcessor: new SimpleSpanProcessor(
+      new OTLPTraceExporter({
+        url: `${
+          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+        }/api/traces`
+      })
+    )
+  });
 
-sdk.start();
+  sdk.start();
+}

package/middlewares/locale.ts

@@ -4,7 +4,6 @@ import { PzNextRequest } from '.';
 import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
-import { getUrlPathWithLocale } from '../utils/localization';
 
 const getMatchedLocale = (pathname: string) => {
   let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
@@ -51,14 +50,8 @@ const withLocale =
         redirectToDefaultLocale &&
         req.method === 'GET'
       ) {
-        // Redirect to existing or default locale
-        url.pathname = getUrlPathWithLocale(
-          url.pathname,
-          req.cookies.get('pz-locale')?.value
-        );
-
-        // Use 303 for POST requests
-        return NextResponse.redirect(url, 303);
+        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
+        return NextResponse.redirect(url);
       }
 
       req.middlewareParams.rewrites.locale = matchedLocale;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.82.0-rc.6",
+  "version": "1.82.0-rc.8",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.6",
+    "@akinon/eslint-plugin-projectzero": "1.82.0-rc.8",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/sentry/index.ts

@@ -1,29 +1,47 @@
 import * as Sentry from '@sentry/nextjs';
 
-const SENTRY_DSN: string =
+const SENTRY_DSN: string | undefined =
   process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
 
+export enum ClientLogType {
+  UNCAUGHT_ERROR_PAGE = 'UNCAUGHT_ERROR_PAGE',
+  CHECKOUT = 'CHECKOUT'
+}
+
+const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
+  ClientLogType.UNCAUGHT_ERROR_PAGE,
+  ClientLogType.CHECKOUT
+];
+
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
   // TODO: Handle options with ESLint rules
 
-  // TODO: Remove Zero Project DSN
+  Sentry.init({
+    dsn:
+      SENTRY_DSN ||
+      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+    initialScope: {
+      tags: {
+        APP_TYPE: 'ProjectZeroNext',
+        TYPE: type
+      }
+    },
+    tracesSampleRate: 1.0,
+    integrations: [],
+    beforeSend: (event, hint) => {
+      if (
+        type === 'Client' &&
+        !ALLOWED_CLIENT_LOG_TYPES.includes(
+          event.tags?.LOG_TYPE as ClientLogType
+        )
+      ) {
+        return null;
+      }
 
-  if (type === 'Server' || type === 'Edge') {
-    Sentry.init({
-      dsn:
-        SENTRY_DSN ||
-        'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
-      initialScope: {
-        tags: {
-          APP_TYPE: 'ProjectZeroNext',
-          TYPE: type
-        }
-      },
-      tracesSampleRate: 1.0,
-      integrations: []
-    });
-  }
+      return event;
+    }
+  });
 };