Skip to content

Conversation

@andreiborza
Copy link
Member

No description provided.

timfish and others added 13 commits January 14, 2026 15:18
[Gitflow] Merge master into develop
…8889)

### Summary

This was introduced by cache components workaround in #18700.

When deploying a Next.js app on Cloudflare Workers and I presume other
serverless environments, you would get this error

```
NextJS request failed. Error: Cannot call this AsyncLocalStorage bound function outside of the request in which it was created.
```

This happens because the snapshot becomes stale in the next request
invocation.

### Solution

This is more of a best-effort workaround. I added a retry logic based on
some criteria, if the first attempt fails due to ALS error then it will
grab a new snapshot and re-run it, if that also fails, then it will run
the callback directly.

 the flow goes like this:

```mermaid
flowchart TD
    A[callback invoked] --> B{Try cached snapshot}
    B -->|Success| C[Return result]
    B -->|Error| D{Is AsyncLocalStorage error?}
    
    D -->|No| E[Rethrow error]
    D -->|Yes| F[Get fresh snapshot]
    
    F --> G{Fresh snapshot available?}
    G -->|No| H[Execute callback directly]
    G -->|Yes| I[Update cached snapshot]
    
    I --> J{Try fresh snapshot}
    J -->|Success| K[Return result]
    J -->|Error| L{Is AsyncLocalStorage error?}
    
    L -->|No| M[Rethrow error]
    L -->|Yes| N[Execute callback directly]
    
    H --> O[Return result]
    N --> O

    style C fill:#90EE90
    style K fill:#90EE90
    style O fill:#90EE90
    style E fill:#FFB6C1
    style M fill:#FFB6C1
```


Closes #18842
… in /packages/remix (#18750)

Bumps
[@remix-run/server-runtime](https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime)
from 2.15.2 to 2.17.3.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/remix-run/remix/releases"><code>@​remix-run/server-runtime</code>'s
releases</a>.</em></p>
<blockquote>
<h2>v2.17.3</h2>
<p>See the changelog for the release notes: <a
href="https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2173">https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2173</a></p>
<h2>v2.17.2</h2>
<p>See the changelog for the release notes: <a
href="https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2172">https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2172</a></p>
<h2>remix v2.17.1</h2>
<p>See the changelog for the release notes: <a
href="https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2171">https://github.com/remix-run/remix/blob/v2/CHANGELOG.md#v2171</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/remix-run/remix/commit/b1d29d9a3092c05fd3ca1d92b91720987bd6b648"><code>b1d29d9</code></a>
Version 2.17.3</li>
<li><a
href="https://github.com/remix-run/remix/commit/161a75bf0a047cc0092f7c38b6d162994287f711"><code>161a75b</code></a>
Validate submission origins (<a
href="https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime/issues/10926">#10926</a>)</li>
<li><a
href="https://github.com/remix-run/remix/commit/4a5ffd112b83abad387d0e682ff292a0741d230d"><code>4a5ffd1</code></a>
Revert &quot;Version 2.17.3&quot;</li>
<li><a
href="https://github.com/remix-run/remix/commit/98c89fa02d3891ff7ba9de0fb59f538b050a8559"><code>98c89fa</code></a>
Version 2.17.3</li>
<li><a
href="https://github.com/remix-run/remix/commit/39203495c6a18f5421d022697906fb2cb9d1d3b8"><code>3920349</code></a>
Version 2.17.2</li>
<li><a
href="https://github.com/remix-run/remix/commit/91ef6fe3a37a5887c7817ca9423607fd3cf89c36"><code>91ef6fe</code></a>
Version 2.17.1</li>
<li><a
href="https://github.com/remix-run/remix/commit/3000859683a4ce4792e2cce64f786f15ee00d97b"><code>3000859</code></a>
chore: Update version for release (<a
href="https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime/issues/10698">#10698</a>)</li>
<li><a
href="https://github.com/remix-run/remix/commit/3004a981c3cb29d68d6069959276e1dbb5086034"><code>3004a98</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime/issues/10692">#10692</a>)</li>
<li><a
href="https://github.com/remix-run/remix/commit/fc5cb1f881ae0f250bc42fc900729ae18c45a999"><code>fc5cb1f</code></a>
chore: Update version for release (pre) (<a
href="https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime/issues/10691">#10691</a>)</li>
<li><a
href="https://github.com/remix-run/remix/commit/3869e0ed1c64a0caf20cd51309e8b14d52e93e77"><code>3869e0e</code></a>
chore: Update version for release (<a
href="https://github.com/remix-run/remix/tree/HEAD/packages/remix-server-runtime/issues/10643">#10643</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/remix-run/remix/commits/remix@2.17.3/packages/remix-server-runtime">compare
view</a></li>
</ul>
</details>
<details>
<summary>Maintainer changes</summary>
<p>This version was pushed to npm by [GitHub Actions](<a
href="https://www.npmjs.com/~GitHub">https://www.npmjs.com/~GitHub</a>
Actions), a new releaser for <code>@​remix-run/server-runtime</code>
since your current version.</p>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@remix-run/server-runtime&package-manager=npm_and_yarn&previous-version=2.15.2&new-version=2.17.3)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
You can disable automated security fix PRs for this repo from the
[Security Alerts
page](https://github.com/getsentry/sentry-javascript/network/alerts).

</details>

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: JPeer264 <jan.peer@sentry.io>
- Bump @opentelemetry/context-async-hooks from 2.2.0 to 2.4.0
- Bump @opentelemetry/core from 2.2.0 to 2.4.0
- Bump @opentelemetry/resources from 2.2.0 to 2.4.0
- Bump @opentelemetry/sdk-trace-base from 2.2.0 to 2.4.0
- Bump @opentelemetry/sdk-trace-node from 2.2.0 to 2.4.0
- Bump @opentelemetry/instrumentation from 0.208.0 to 0.210.0
- Bump @opentelemetry/instrumentation-amqplib from 0.55.0 to 0.57.0
- Bump @opentelemetry/instrumentation-connect from 0.52.0 to 0.53.0
- Bump @opentelemetry/instrumentation-dataloader from 0.26.0 to 0.27.0
- Bump @opentelemetry/instrumentation-express from 0.57.0 to 0.58.0
- Bump @opentelemetry/instrumentation-fs from 0.28.0 to 0.29.0
- Bump @opentelemetry/instrumentation-generic-pool from 0.52.0 to 0.53.0
- Bump @opentelemetry/instrumentation-graphql from 0.56.0 to 0.57.0
- Bump @opentelemetry/instrumentation-hapi from 0.55.0 to 0.56.0
- Bump @opentelemetry/instrumentation-http from 0.208.0 to 0.210.0
- Bump @opentelemetry/instrumentation-ioredis from 0.56.0 to 0.58.0
- Bump @opentelemetry/instrumentation-kafkajs from 0.18.0 to 0.19.0
- Bump @opentelemetry/instrumentation-knex from 0.53.0 to 0.54.0
- Bump @opentelemetry/instrumentation-koa from 0.57.0 to 0.58.0
- Bump @opentelemetry/instrumentation-lru-memoizer from 0.53.0 to 0.54.0
- Bump @opentelemetry/instrumentation-mongodb from 0.61.0 to 0.63.0
- Bump @opentelemetry/instrumentation-mongoose from 0.55.0 to 0.56.0
- Bump @opentelemetry/instrumentation-mysql from 0.54.0 to 0.56.0
- Bump @opentelemetry/instrumentation-mysql2 from 0.55.0 to 0.56.0
- Bump @opentelemetry/instrumentation-nestjs-core from 0.55.0 to 0.56.0
- Bump @opentelemetry/instrumentation-pg from 0.61.0 to 0.62.0
- Bump @opentelemetry/instrumentation-redis from 0.57.0 to 0.58.0
- Bump @opentelemetry/instrumentation-tedious from 0.27.0 to 0.29.0
- Bump @opentelemetry/instrumentation-undici from 0.19.0 to 0.20.0
- Bump @opentelemetry/instrumentation-aws-sdk from 0.64.0 to 0.65.0
- Bump @opentelemetry/sdk-node from 0.208.0 to 0.210.0
- Bump @opentelemetry/exporter-trace-otlp-http from 0.208.0 to 0.210.0

Closes #18874
…spans (#18902)

Supports the now stable `db.system.name` semantic convention attribute
alongside the deprecated `db.system` attribute when identifying database
spans.


Closes #18903 (added automatically)
Our `http.client` span instrumentations currently treat data URLs (blobs
or base64 encoded data) like regular raw URLs. While this is in general
fine, the problem is that this leads to incredibly long span names and
attribute values, especially because the URL is sent in up to three
different attributes per span. This makes Relay reject the the sent
events due to exceeding size limits.

This patch extracts the already existing stack trace URL
sanitization logic for data URLs and apply it to `http.client` spans and
attributes
Upgrades `@prisma/instrumentation` from `6.19.0` to `7.2.0`. The
instrumentation should be backwards compatible with v5 and v6 (we have
integration tests for v5 and v6). I also added integration tests for v7.

Closes: #18876
@andreiborza andreiborza changed the base branch from develop to master January 21, 2026 13:18
@andreiborza andreiborza merged commit d4660db into master Jan 21, 2026
32 checks passed
@andreiborza andreiborza deleted the prepare-release/10.36.0 branch January 21, 2026 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants