Merge branch 'develop' into fix/tracemetrics/buffer-1000

Author: k-fish

.cursor/rules/publishing_release.mdc

@@ -12,13 +12,18 @@ Use these guidelines when publishing a new Sentry JavaScript SDK release.
 
 The release process is outlined in [publishing-a-release.md](mdc:docs/publishing-a-release.md).
 
-1. Make sure you are on the latest version of the `develop` branch. To confirm this, run `git pull origin develop` to get the latest changes from the repo.
+1. Ensure you're on the `develop` branch with the latest changes:
+   - If you have unsaved changes, stash them with `git stash -u`.
+   - If you're on a different branch than `develop`, check out the develop branch using `git checkout develop`.
+   - Pull the latest updates from the remote repository by running `git pull origin develop`.
+
 2. Run `yarn changelog` on the `develop` branch and copy the output. You can use `yarn changelog | pbcopy` to copy the output of `yarn changelog` into your clipboard.
 3. Decide on a version for the release based on [semver](mdc:https://semver.org). The version should be decided based on what is in included in the release. For example, if the release includes a new feature, we should increment the minor version. If it includes only bug fixes, we should increment the patch version. You can find the latest version in [CHANGELOG.md](mdc:CHANGELOG.md) at the very top.
 4. Create a branch `prepare-release/VERSION`, eg. `prepare-release/8.1.0`, off `develop`.
-5. Update [CHANGELOG.md](mdc:CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release from the output of `yarn changelog`. See the `Updating the Changelog` section in [publishing-a-release.md](mdc:docs/publishing-a-release.md) for more details. If you remove changelog entries because they are not applicable, please let the user know.
+5. Update [CHANGELOG.md](mdc:CHANGELOG.md) to add an entry for the next release number and a list of changes since the last release from the output of `yarn changelog`. See the `Updating the Changelog` section in [publishing-a-release.md](mdc:docs/publishing-a-release.md) for more details. Do not remove any changelog entries.
 6. Commit the changes to [CHANGELOG.md](mdc:CHANGELOG.md) with `meta(changelog): Update changelog for VERSION` where `VERSION` is the version of the release, e.g. `meta(changelog): Update changelog for 8.1.0`
 7. Push the `prepare-release/VERSION` branch to origin and remind the user that the release PR needs to be opened from the `master` branch.
+8. In case you were working on a different branch, you can checkout back to the branch you were working on and continue your work by unstashing the changes you stashed earlier with the command `git stash pop` (only if you stashed changes).
 
 ## Key Commands
 

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+Work in this release was contributed by @hanseo0507. Thank you for your contribution!
+
 ## 10.22.0
 
 ### Important Changes

packages/aws-serverless/src/sdk.ts

@@ -108,7 +108,7 @@ function enhanceScopeWithEnvironmentData(scope: Scope, context: Context, startTi
   });
 }
 
-function setupTimeoutWatning(context: Context, options: WrapperOptions): NodeJS.Timeout | undefined {
+function setupTimeoutWarning(context: Context, options: WrapperOptions): NodeJS.Timeout | undefined {
   // In seconds. You cannot go any more granular than this in AWS Lambda.
   const configuredTimeout = Math.ceil(tryGetRemainingTimeInMillis(context) / 1000);
   const configuredTimeoutMinutes = Math.floor(configuredTimeout / 60);
@@ -220,7 +220,7 @@ export function wrapHandler<TEvent, TResult>(
   return async (event: TEvent, context: Context) => {
     context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop;
 
-    timeoutWarningTimer = setupTimeoutWatning(context, options);
+    timeoutWarningTimer = setupTimeoutWarning(context, options);
 
     async function processResult(): Promise<TResult> {
       const scope = getCurrentScope();
@@ -272,7 +272,7 @@ function wrapStreamingHandler<TEvent, TResult>(
   ): Promise<TResult> => {
     context.callbackWaitsForEmptyEventLoop = options.callbackWaitsForEmptyEventLoop;
 
-    timeoutWarningTimer = setupTimeoutWatning(context, options);
+    timeoutWarningTimer = setupTimeoutWarning(context, options);
 
     async function processStreamingResult(): Promise<TResult> {
       const scope = getCurrentScope();

packages/core/src/build-time-plugins/buildTimeOptionsBase.ts

@@ -243,6 +243,37 @@ interface SourceMapsOptions {
   filesToDeleteAfterUpload?: string | Array<string>;
 }
 
+type AutoSetCommitsOptions = {
+  /**
+   * Automatically sets `commit` and `previousCommit`. Sets `commit` to `HEAD`
+   * and `previousCommit` as described in the option's documentation.
+   *
+   * If you set this to `true`, manually specified `commit` and `previousCommit`
+   * options will be overridden. It is best to not specify them at all if you
+   * set this option to `true`.
+   */
+  auto: true;
+  repo?: undefined;
+  commit?: undefined;
+};
+
+type ManualSetCommitsOptions = {
+  auto?: false | undefined;
+  /**
+   * The full repo name as defined in Sentry.
+   *
+   * Required if the `auto` option is not set to `true`.
+   */
+  repo: string;
+
+  /**
+   * The current (last) commit in the release.
+   *
+   * Required if the `auto` option is not set to `true`.
+   */
+  commit: string;
+};
+
 interface ReleaseOptions {
   /**
    * Unique identifier for the release you want to create.
@@ -299,101 +330,81 @@ interface ReleaseOptions {
 
   /**
    * Configuration for associating the release with its commits in Sentry.
+   *
+   * Set to `false` to disable commit association.
+   *
+   * @default { auto: true }
    */
-  setCommits?: (
-    | {
+  setCommits?:
+    | false
+    | ((AutoSetCommitsOptions | ManualSetCommitsOptions) & {
         /**
-         * Automatically sets `commit` and `previousCommit`. Sets `commit` to `HEAD`
-         * and `previousCommit` as described in the option's documentation.
+         * The commit before the beginning of this release (in other words,
+         * the last commit of the previous release).
+         *
+         * Defaults to the last commit of the previous release in Sentry.
          *
-         * If you set this to `true`, manually specified `commit` and `previousCommit`
-         * options will be overridden. It is best to not specify them at all if you
-         * set this option to `true`.
+         * If there was no previous release, the last 10 commits will be used.
          */
-        auto: true;
-        repo?: undefined;
-        commit?: undefined;
-      }
-    | {
-        auto?: false | undefined;
+        previousCommit?: string;
+
         /**
-         * The full repo name as defined in Sentry.
+         * If the flag is to `true` and the previous release commit was not found
+         * in the repository, the plugin creates a release with the default commits
+         * count instead of failing the command.
          *
-         * Required if the `auto` option is not set to `true`.
+         * @default false
          */
-        repo: string;
+        ignoreMissing?: boolean;
 
         /**
-         * The current (last) commit in the release.
+         * If this flag is set, the setCommits step will not fail and just exit
+         * silently if no new commits for a given release have been found.
          *
-         * Required if the `auto` option is not set to `true`.
+         * @default false
          */
-        commit: string;
-      }
-  ) & {
-    /**
-     * The commit before the beginning of this release (in other words,
-     * the last commit of the previous release).
-     *
-     * Defaults to the last commit of the previous release in Sentry.
-     *
-     * If there was no previous release, the last 10 commits will be used.
-     */
-    previousCommit?: string;
-
-    /**
-     * If the flag is to `true` and the previous release commit was not found
-     * in the repository, the plugin creates a release with the default commits
-     * count instead of failing the command.
-     *
-     * @default false
-     */
-    ignoreMissing?: boolean;
-
-    /**
-     * If this flag is set, the setCommits step will not fail and just exit
-     * silently if no new commits for a given release have been found.
-     *
-     * @default false
-     */
-    ignoreEmpty?: boolean;
-  };
+        ignoreEmpty?: boolean;
+      });
 
   /**
    * Configuration for adding deployment information to the release in Sentry.
+   *
+   * Set to `false` to disable automatic deployment detection and creation.
    */
-  deploy?: {
-    /**
-     * Environment for this release. Values that make sense here would
-     * be `production` or `staging`.
-     */
-    env: string;
-
-    /**
-     * Deployment start time in Unix timestamp (in seconds) or ISO 8601 format.
-     */
-    started?: number | string;
-
-    /**
-     * Deployment finish time in Unix timestamp (in seconds) or ISO 8601 format.
-     */
-    finished?: number | string;
-
-    /**
-     * Deployment duration (in seconds). Can be used instead of started and finished.
-     */
-    time?: number;
-
-    /**
-     * Human-readable name for the deployment.
-     */
-    name?: string;
-
-    /**
-     * URL that points to the deployment.
-     */
-    url?: string;
-  };
+  deploy?:
+    | false
+    | {
+        /**
+         * Environment for this release. Values that make sense here would
+         * be `production` or `staging`.
+         */
+        env: string;
+
+        /**
+         * Deployment start time in Unix timestamp (in seconds) or ISO 8601 format.
+         */
+        started?: number | string;
+
+        /**
+         * Deployment finish time in Unix timestamp (in seconds) or ISO 8601 format.
+         */
+        finished?: number | string;
+
+        /**
+         * Deployment duration (in seconds). Can be used instead of started and finished.
+         */
+        time?: number;
+
+        /**
+         * Human-readable name for the deployment.
+         */
+        name?: string;
+
+        /**
+         * URL that points to the deployment.
+         */
+        url?: string;
+      };
 }
 
 interface BundleSizeOptimizationsOptions {

packages/nuxt/src/runtime/hooks/captureErrorHook.ts

@@ -25,6 +25,17 @@ export async function sentryCaptureErrorHook(error: Error, errorContext: Capture
     if (error.statusCode >= 300 && error.statusCode < 500) {
       return;
     }
+
+    // Check if the cause (original error) was already captured by middleware instrumentation
+    // H3 wraps errors, so we need to check the cause property
+    if (
+      'cause' in error &&
+      typeof error.cause === 'object' &&
+      error.cause !== null &&
+      '__sentry_captured__' in error.cause
+    ) {
+      return;
+    }
   }
 
   const { method, path } = {