Skip to content

[pull] main from tldraw:main#499

Merged
pull[bot] merged 3 commits intocode:mainfrom
tldraw:main
Apr 16, 2026
Merged

[pull] main from tldraw:main#499
pull[bot] merged 3 commits intocode:mainfrom
tldraw:main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 16, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

Bump `@rocicorp/zero` from 1.2.0 to 1.3.0-canary.3 across all four
workspaces that depend on it. Also adds a fly log fetching script for
debugging.

### Change type

- [x] `other`

### Test plan

1. Deploy to staging and verify zero-cache starts correctly
2. Verify client can connect and sync

### Release notes

- Bump @rocicorp/zero to 1.3.0-canary.3

### Code changes

| Section        | LOC change   |
| -------------- | ------------ |
| Apps           | +4 / -4     |
| Core code      | +2 / -2     |
| Config/tooling | +93 / -94   |
In order to let Rocicorp pull zero-cache logs without needing fly CLI
auth, this PR improves the fly log fetch script.

Changes:
- Add `--token` flag and `FLY_TOKEN` env var support (token is now
required — no more fly CLI fallback that silently minted new org deploy
tokens on every run)
- Document all zero app names (production, staging, PR previews)
- Remove `child_process` import (no longer needed)

### Change type

- [x] `improvement`

### Test plan

1. Run script with `--token` flag
2. Run script with `FLY_TOKEN` env var
3. Run script without either — should error with helpful message

### Code changes

| Section        | LOC change |
| -------------- | ---------- |
| Config/tooling | +20 / -6   |
In order to let Rocicorp pull zero-cache metrics without needing fly CLI
auth, this PR adds a Prometheus metrics script and extracts shared
utilities.

Changes:
- **`fly-common.ts`** (new): shared org slug (configurable via
`FLY_ORG_SLUG`), token resolution (`--token` / `FLY_TOKEN`), duration
parsing
- **`fetch-fly-logs.ts`**: refactored to use shared module, removed fly
CLI fallback that silently minted new org deploy tokens on every run
- **`fetch-fly-metrics.ts`** (new): fetches CPU and memory time series
from Fly's Prometheus API using the same queries as the Grafana
dashboard (CPU usage, baseline, throttle, memory used/total)

### Change type

- [x] `improvement`

### Test plan

1. Run logs script with `--token` — should fetch logs
2. Run logs script without token — should error with helpful message
3. Run metrics script with `--token` — should show CPU/memory time
series
4. Run metrics script with `FLY_TOKEN` env var — same result

### Code changes

| Section        | LOC change  |
| -------------- | ----------- |
| Config/tooling | +241 / -31  |
@pull pull Bot locked and limited conversation to collaborators Apr 16, 2026
@pull pull Bot added the ⤵️ pull label Apr 16, 2026
@pull pull Bot merged commit 71f3bec into code:main Apr 16, 2026
@pull pull Bot had a problem deploying to deploy-production April 16, 2026 09:13 Failure
@pull pull Bot had a problem deploying to deploy-staging April 16, 2026 09:13 Error
@pull pull Bot had a problem deploying to deploy-staging April 16, 2026 09:13 Error
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant