Skip to content

Commit 0637543

Browse files
Merge branch 'main' into feat/mcp-trim-shorten-reductions
2 parents d16ee64 + b7b4d95 commit 0637543

6 files changed

Lines changed: 29 additions & 10 deletions

File tree

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
'@hyperdx/api': patch
3+
---
4+
5+
fix: update systeminformation to 5.33.19
6+
7+
The root `resolutions` pin let the lockfile keep systeminformation 5.30.7, which
8+
has known command injection advisories, including two high-severity ones in
9+
`networkInterfaces()` on Linux (GHSA-5xpp-75jx-m839, GHSA-hvx9-hwr7-wjj9). The
10+
API installs it through `@opentelemetry/instrumentation-host-metrics`, which
11+
asks for `^5.31.6`, but the old pin held it at 5.30.7. The pin now starts at
12+
5.33.19, the newest 5.x release, which fixes all of them.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# One reviewer is picked round robin by the team's code review settings.
2-
* @ClickHouse/clickstack-app-devs
2+
* @ClickHouse/clickstack

‎.github/workflows/e2e-tests.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,14 @@ jobs:
1010
# over-subscribed the 4-vCPU ubuntu-24.04 runner and caused timeouts.
1111
# RUNNER_E2E is a label or a JSON array of labels. On a smaller
1212
# runner, set the E2E_WORKERS variable to 2 as well.
13+
# Fork PRs can't use the custom runner group and would queue forever, so
14+
# they fall back to the 4-vCPU ubuntu-24.04 runner with 2 workers and a
15+
# longer timeout.
1316
runs-on:
14-
${{ startsWith(vars.RUNNER_E2E, '[') && fromJSON(vars.RUNNER_E2E) ||
17+
${{ github.event.pull_request.head.repo.fork && 'ubuntu-24.04' ||
18+
startsWith(vars.RUNNER_E2E, '[') && fromJSON(vars.RUNNER_E2E) ||
1519
vars.RUNNER_E2E || '8-core-playwright' }}
16-
timeout-minutes: 15
20+
timeout-minutes: ${{ github.event.pull_request.head.repo.fork && 25 || 15 }}
1721
permissions:
1822
contents: read
1923
strategy:
@@ -31,7 +35,9 @@ jobs:
3135
- name: Run Playwright tests (full-stack mode)
3236
env:
3337
# Unset falls back to the default in playwright.config.ts.
34-
E2E_WORKERS: ${{ vars.E2E_WORKERS }}
38+
E2E_WORKERS:
39+
${{ github.event.pull_request.head.repo.fork && '2' ||
40+
vars.E2E_WORKERS }}
3541
run: |
3642
cd packages/app
3743
yarn test:e2e --shard=${{ matrix.shard }}/4

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"diff": "^5.2.2",
8686
"on-headers": "^1.1.0",
8787
"fast-xml-parser": "^4.5.6",
88-
"systeminformation": "^5.24.0",
88+
"systeminformation": "^5.33.19",
8989
"@asyncapi/specs": "6.11.1"
9090
},
9191
"resolutionsNotes": {

‎packages/app/playwright.config.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ const NO_SELF_TELEMETRY = 'HDX_EXPORTER_ENABLED=false';
2020
// Timeout configuration constants (in milliseconds)
2121
const TEST_TIMEOUT_MS = 60 * 1000; // 60 seconds per test
2222
const API_SERVER_STARTUP_TIMEOUT_MS = 120 * 1000; // 2 minutes for API to start
23-
const APP_SERVER_STARTUP_TIMEOUT_MS = 180 * 1000; // 3 minutes for Next.js build + start
23+
// The Next.js build alone exceeds 3 minutes on the 4-vCPU runner fork PRs use.
24+
const APP_SERVER_STARTUP_TIMEOUT_MS = 360 * 1000;
2425

2526
/**
2627
* @see https://playwright.dev/docs/test-configuration

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29282,12 +29282,12 @@ __metadata:
2928229282
languageName: node
2928329283
linkType: hard
2928429284

29285-
"systeminformation@npm:^5.24.0":
29286-
version: 5.30.7
29287-
resolution: "systeminformation@npm:5.30.7"
29285+
"systeminformation@npm:^5.33.19":
29286+
version: 5.33.19
29287+
resolution: "systeminformation@npm:5.33.19"
2928829288
bin:
2928929289
systeminformation: lib/cli.js
29290-
checksum: 10c0/62588fabe62ec258d56055e609a075fe1eb1da2f090adc8c53e025ad8947d6eb9d3d2889646973fafba9528e06958decbb1def2b989af0363a952c5aff65fbae
29290+
checksum: 10c0/cb95464c1ab9b5deabd0141d0ae22db29ced520f321c2b5cbcdea84eff5d0cf65fbb521a9945f8dc98e560bc9fc57cbe06e68dd2d34c53a4c3a59eb61d0535b3
2929129291
conditions: (os=darwin | os=linux | os=win32 | os=freebsd | os=openbsd | os=netbsd | os=sunos | os=android)
2929229292
languageName: node
2929329293
linkType: hard

0 commit comments

Comments
 (0)