Merge branch 'develop' into onur/supabase-integration

Author: onurtemizkan

Diff for: CHANGELOG.md

@@ -10,6 +10,11 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.10.1
+
+- fix: Correct @sentry-internal/feedback docs to match the code ([#15874](https://github.com/getsentry/sentry-javascript/pull/15874))
+- deps: Bump bundler plugins to version `3.2.4` ([#15909](https://github.com/getsentry/sentry-javascript/pull/15909))
+
 ## 9.10.0
 
 ### Important Changes

Diff for: dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "main": "index.js",
   "license": "MIT",
   "engines": {

Diff for: dev-packages/bundle-analyzer-scenarios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Scenarios to test bundle analysis with",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

Diff for: dev-packages/clear-cache-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/clear-cache-gh-action",
   "description": "An internal Github Action to clear GitHub caches.",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

Diff for: dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "license": "MIT",
   "private": true,
   "scripts": {

Diff for: dev-packages/external-contributor-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/external-contributor-gh-action",
   "description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

Diff for: dev-packages/node-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -30,9 +30,9 @@
     "@nestjs/common": "10.4.6",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
-    "@sentry/aws-serverless": "9.10.0",
-    "@sentry/core": "9.10.0",
-    "@sentry/node": "9.10.0",
+    "@sentry/aws-serverless": "9.10.1",
+    "@sentry/core": "9.10.1",
+    "@sentry/node": "9.10.1",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",

Diff for: dev-packages/rollup-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",

Diff for: dev-packages/size-limit-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

Diff for: dev-packages/test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "9.10.0",
+  "version": "9.10.1",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.50.0",
-    "@sentry/core": "9.10.0"
+    "@sentry/core": "9.10.1"
   },
   "volta": {
     "extends": "../../package.json"

Diff for: lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "npmClient": "yarn"
 }

Diff for: packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "9.10.0",
-    "@sentry/core": "9.10.0",
+    "@sentry/browser": "9.10.1",
+    "@sentry/core": "9.10.1",
     "tslib": "^2.4.1"
   },
   "devDependencies": {

Diff for: packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "9.10.0",
-    "@sentry/core": "9.10.0",
-    "@sentry/node": "9.10.0",
+    "@sentry/browser": "9.10.1",
+    "@sentry/core": "9.10.1",
+    "@sentry/node": "9.10.1",
     "@sentry/vite-plugin": "^2.22.6"
   },
   "devDependencies": {

Diff for: packages/aws-serverless/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
@@ -68,8 +68,8 @@
     "@opentelemetry/instrumentation": "^0.57.2",
     "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
     "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
-    "@sentry/core": "9.10.0",
-    "@sentry/node": "9.10.0",
+    "@sentry/core": "9.10.1",
+    "@sentry/node": "9.10.1",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {

Diff for: packages/browser-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "9.10.0"
+    "@sentry/core": "9.10.1"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",

Diff for: packages/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/browser",
-  "version": "9.10.0",
+  "version": "9.10.1",
   "description": "Official Sentry SDK for browsers",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser",
@@ -39,14 +39,14 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry-internal/browser-utils": "9.10.0",
-    "@sentry-internal/feedback": "9.10.0",
-    "@sentry-internal/replay": "9.10.0",
-    "@sentry-internal/replay-canvas": "9.10.0",
-    "@sentry/core": "9.10.0"
+    "@sentry-internal/browser-utils": "9.10.1",
+    "@sentry-internal/feedback": "9.10.1",
+    "@sentry-internal/replay": "9.10.1",
+    "@sentry-internal/replay-canvas": "9.10.1",
+    "@sentry/core": "9.10.1"
   },
   "devDependencies": {
-    "@sentry-internal/integration-shims": "9.10.0",
+    "@sentry-internal/integration-shims": "9.10.1",
     "fake-indexeddb": "^4.0.1"
   },
   "scripts": {

Diff for: packages/browser/src/client.ts

@@ -15,11 +15,14 @@ import {
   addAutoIpAddressToUser,
   applySdkMetadata,
   getSDKSource,
+  _INTERNAL_flushLogsBuffer,
 } from '@sentry/core';
 import { eventFromException, eventFromMessage } from './eventbuilder';
 import { WINDOW } from './helpers';
 import type { BrowserTransportOptions } from './transports/types';
 
+const DEFAULT_FLUSH_INTERVAL = 5000;
+
 /**
  * Configuration options for the Sentry Browser SDK.
  * @see @sentry/core Options for more information.
@@ -65,6 +68,7 @@ export type BrowserClientOptions = ClientOptions<BrowserTransportOptions> &
  * @see SentryClient for usage documentation.
  */
 export class BrowserClient extends Client<BrowserClientOptions> {
+  private _logFlushIdleTimeout: ReturnType<typeof setTimeout> | undefined;
   /**
    * Creates a new Browser SDK instance.
    *
@@ -81,17 +85,41 @@ export class BrowserClient extends Client<BrowserClientOptions> {
 
     super(opts);
 
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    const client = this;
+    const { sendDefaultPii, _experiments } = client._options;
+    const enableLogs = _experiments?.enableLogs;
+
     if (opts.sendClientReports && WINDOW.document) {
       WINDOW.document.addEventListener('visibilitychange', () => {
         if (WINDOW.document.visibilityState === 'hidden') {
           this._flushOutcomes();
+          if (enableLogs) {
+            _INTERNAL_flushLogsBuffer(client);
+          }
         }
       });
     }
 
-    if (this._options.sendDefaultPii) {
-      this.on('postprocessEvent', addAutoIpAddressToUser);
-      this.on('beforeSendSession', addAutoIpAddressToSession);
+    if (enableLogs) {
+      client.on('flush', () => {
+        _INTERNAL_flushLogsBuffer(client);
+      });
+
+      client.on('afterCaptureLog', () => {
+        if (client._logFlushIdleTimeout) {
+          clearTimeout(client._logFlushIdleTimeout);
+        }
+
+        client._logFlushIdleTimeout = setTimeout(() => {
+          _INTERNAL_flushLogsBuffer(client);
+        }, DEFAULT_FLUSH_INTERVAL);
+      });
+    }
+
+    if (sendDefaultPii) {
+      client.on('postprocessEvent', addAutoIpAddressToUser);
+      client.on('beforeSendSession', addAutoIpAddressToSession);
     }
   }
 

Diff for: packages/browser/src/log.ts

@@ -1,53 +1,5 @@
-import type { LogSeverityLevel, Log, Client, ParameterizedString } from '@sentry/core';
-import { getClient, _INTERNAL_captureLog, _INTERNAL_flushLogsBuffer } from '@sentry/core';
-
-import { WINDOW } from './helpers';
-
-/**
- * TODO: Make this configurable
- */
-const DEFAULT_FLUSH_INTERVAL = 5000;
-
-let timeout: ReturnType<typeof setTimeout> | undefined;
-
-/**
- * This is a global timeout that is used to flush the logs buffer.
- * It is used to ensure that logs are flushed even if the client is not flushed.
- */
-function startFlushTimeout(client: Client): void {
-  if (timeout) {
-    clearTimeout(timeout);
-  }
-
-  timeout = setTimeout(() => {
-    _INTERNAL_flushLogsBuffer(client);
-  }, DEFAULT_FLUSH_INTERVAL);
-}
-
-let isClientListenerAdded = false;
-/**
- * This is a function that is used to add a flush listener to the client.
- * It is used to ensure that the logger buffer is flushed when the client is flushed.
- */
-function addFlushingListeners(client: Client): void {
-  if (isClientListenerAdded || !client.getOptions()._experiments?.enableLogs) {
-    return;
-  }
-
-  isClientListenerAdded = true;
-
-  if (WINDOW.document) {
-    WINDOW.document.addEventListener('visibilitychange', () => {
-      if (WINDOW.document.visibilityState === 'hidden') {
-        _INTERNAL_flushLogsBuffer(client);
-      }
-    });
-  }
-
-  client.on('flush', () => {
-    _INTERNAL_flushLogsBuffer(client);
-  });
-}
+import type { LogSeverityLevel, Log, ParameterizedString } from '@sentry/core';
+import { _INTERNAL_captureLog } from '@sentry/core';
 
 /**
  * Capture a log with the given level.
@@ -63,14 +15,7 @@ function captureLog(
   attributes?: Log['attributes'],
   severityNumber?: Log['severityNumber'],
 ): void {
-  const client = getClient();
-  if (client) {
-    addFlushingListeners(client);
-
-    startFlushTimeout(client);
-  }
-
-  _INTERNAL_captureLog({ level, message, attributes, severityNumber }, client, undefined);
+  _INTERNAL_captureLog({ level, message, attributes, severityNumber });
 }
 
 /**