Skip to content

Commit 7977ec8

Browse files
jsuerethjsuereth
authored
Merge branch 'main' into copilot/create-docs-multi-registry-file
2 parents d12a4d8 + 8c1dfdb commit 7977ec8

File tree

24 files changed

+3335
-4068
lines changed

24 files changed

+3335
-4068
lines changed

‎.github/build-setup.yml‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,20 @@
33
# github-build-setup option in dist-workspace.toml.
44
# See: https://opensource.axo.dev/cargo-dist/book/ci/customizing.html
55

6+
- name: Setup pnpm
7+
# Installs the pnpm CLI tool
8+
uses: pnpm/action-setup@v4
9+
with:
10+
package_json_file: ui/package.json
611
- name: Setup Node.js
712
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
813
with:
914
node-version-file: '.nvmrc'
10-
cache: 'npm'
15+
cache: 'pnpm'
1116
cache-dependency-path: ui/package-lock.json
17+
- name: Install UI dependencies
18+
run: pnpm install --frozen-lockfile
19+
working-directory: ./ui
20+
- name: Build UI
21+
run: pnpm build
22+
working-directory: ./ui

‎.github/renovate.json5‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// cargo-dist manages this file, so we have to pin *its* dependency here.
99
".github/workflows/release.yml"
1010
],
11+
includePaths: [
12+
"ui/**"
13+
],
1114
packageRules: [
1215
{
1316
groupName: 'all patch versions',
@@ -47,6 +50,7 @@
4750
matchManagers: [
4851
'cargo',
4952
'dockerfile',
53+
'npm',
5054
],
5155
automerge: true,
5256
},

‎.github/workflows/ci.yml‎

Lines changed: 60 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,30 @@ jobs:
3131
steps:
3232
- name: Checkout repository
3333
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
34+
- name: Setup pnpm
35+
# Installs the pnpm CLI tool
36+
uses: pnpm/action-setup@v4
37+
with:
38+
package_json_file: ui/package.json
3439
- name: Setup Node.js
3540
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3641
with:
3742
node-version-file: '.nvmrc'
38-
cache: 'npm'
39-
cache-dependency-path: ui/package-lock.json
40-
- name: Verify npm is available
41-
run: npm --version
43+
cache: 'pnpm'
44+
cache-dependency-path: ui/pnpm-lock.yaml
45+
- name: Verify pnpm is available
46+
run: pnpm --version
4247
- name: Install Rust
4348
uses: dtolnay/rust-toolchain@stable
4449
with:
4550
toolchain: ${{ matrix.rust }}
4651
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
52+
- name: Install UI dependencies
53+
run: pnpm install --frozen-lockfile
54+
working-directory: ./ui
55+
- name: Build UI
56+
run: pnpm build
57+
working-directory: ./ui
4758
- name: Build
4859
# [ToDo LQ] Re-enable --all-features once the issue is resolved in Tantivy (zstd-safe). This is an experimental feature anyway.
4960
run: cargo test --no-run --workspace
@@ -64,14 +75,19 @@ jobs:
6475
steps:
6576
- name: Checkout repository
6677
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
78+
- name: Setup pnpm
79+
# Installs the pnpm CLI tool
80+
uses: pnpm/action-setup@v4
81+
with:
82+
package_json_file: ui/package.json
6783
- name: Setup Node.js
6884
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
6985
with:
7086
node-version-file: '.nvmrc'
71-
cache: 'npm'
72-
cache-dependency-path: ui/package-lock.json
73-
- name: Verify npm is available
74-
run: npm --version
87+
cache: 'pnpm'
88+
cache-dependency-path: ui/pnpm-lock.yaml
89+
- name: Verify pnpm is available
90+
run: pnpm --version
7591
- name: Install Rust
7692
uses: dtolnay/rust-toolchain@stable
7793
with:
@@ -89,6 +105,12 @@ jobs:
89105
else
90106
echo "Correct toolchain $CURRENT_TOOLCHAIN is installed and active"
91107
fi
108+
- name: Install UI dependencies
109+
run: pnpm install --frozen-lockfile
110+
working-directory: ./ui
111+
- name: Build UI
112+
run: pnpm build
113+
working-directory: ./ui
92114
- name: Default features
93115
run: cargo check --workspace --all-targets
94116
# [ToDo LQ] Re-enable --all-features once the issue is resolved in Tantivy (zstd-safe). This is an experimental feature anyway.
@@ -114,19 +136,30 @@ jobs:
114136
steps:
115137
- name: Checkout repository
116138
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
139+
- name: Setup pnpm
140+
# Installs the pnpm CLI tool
141+
uses: pnpm/action-setup@v4
142+
with:
143+
package_json_file: ui/package.json
117144
- name: Setup Node.js
118145
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
119146
with:
120147
node-version-file: '.nvmrc'
121-
cache: 'npm'
122-
cache-dependency-path: ui/package-lock.json
123-
- name: Verify npm is available
124-
run: npm --version
148+
cache: 'pnpm'
149+
cache-dependency-path: ui/pnpm-lock.yaml
150+
- name: Verify pnpm is available
151+
run: pnpm --version
125152
- name: Install Rust
126153
uses: dtolnay/rust-toolchain@stable
127154
with:
128155
toolchain: stable
129156
- uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2.8.2
157+
- name: Install UI dependencies
158+
run: pnpm install --frozen-lockfile
159+
working-directory: ./ui
160+
- name: Build UI
161+
run: pnpm build
162+
working-directory: ./ui
130163
- name: Check documentation
131164
env:
132165
RUSTDOCFLAGS: -D warnings
@@ -185,14 +218,19 @@ jobs:
185218
steps:
186219
- name: Checkout repository
187220
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
221+
- name: Setup pnpm
222+
# Installs the pnpm CLI tool
223+
uses: pnpm/action-setup@v4
224+
with:
225+
package_json_file: ui/package.json
188226
- name: Setup Node.js
189227
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
190228
with:
191229
node-version-file: '.nvmrc'
192-
cache: 'npm'
193-
cache-dependency-path: ui/package-lock.json
194-
- name: Verify npm is available
195-
run: npm --version
230+
cache: 'pnpm'
231+
cache-dependency-path: ui/pnpm-lock.yaml
232+
- name: Verify pnpm is available
233+
run: pnpm --version
196234
- name: Install Rust
197235
uses: dtolnay/rust-toolchain@stable
198236
with:
@@ -205,6 +243,12 @@ jobs:
205243
run: cargo install sarif-fmt --locked
206244
- name: Install protoc
207245
uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0
246+
- name: Install UI dependencies
247+
run: pnpm install --frozen-lockfile
248+
working-directory: ./ui
249+
- name: Build UI
250+
run: pnpm build
251+
working-directory: ./ui
208252
- name: Check
209253
# [workaround] removed --all-features due to an issue in one of the dependency in Tantity (zstd-safe)
210254
# [ToDo LQ] Re-enable --all-features once the issue is resolved

‎.github/workflows/fossa.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1616

17-
- uses: fossas/fossa-action@3ebcea1862c6ffbd5cf1b4d0bd6b3fe7bd6f2cac # v1.7.0
17+
- uses: fossas/fossa-action@c414b9ad82eaad041e47a7cf62a4f02411f427a0 # v1.8.0
1818
with:
1919
api-key: ${{secrets.FOSSA_API_KEY}}
2020
team: OpenTelemetry

‎.github/workflows/publish-docker.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,23 @@ jobs:
2828
runner: ubuntu-24.04-arm
2929
steps:
3030
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
31+
- # Installs the pnpm CLI tool
32+
name: Setup PNPM
33+
uses: pnpm/action-setup@v4
34+
with:
35+
package_json_file: ui/package.json
3136
- name: Setup Node.js
3237
uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6.2.0
3338
with:
3439
node-version-file: '.nvmrc'
35-
cache: 'npm'
36-
cache-dependency-path: ui/package-lock.json
40+
cache: 'pnpm'
41+
cache-dependency-path: ui/pnpm-lock.yaml
42+
- name: Install UI dependencies
43+
run: pnpm install --frozen-lockfile
44+
working-directory: ./ui
45+
- name: Build UI
46+
run: pnpm build
47+
working-directory: ./ui
3748
- name: Set up Docker Buildx
3849
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
3950
- name: Extract metadata (tags, labels) for Docker

‎.github/workflows/release.yml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,20 @@ jobs:
131131
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
132132
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
133133
fi
134+
- name: "Setup pnpm"
135+
uses: "pnpm/action-setup@v4"
136+
with:
137+
"package_json_file": "ui/package.json"
134138
- name: "Setup Node.js"
135139
uses: "actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238"
136140
with:
137-
"cache": "npm"
141+
"cache": "pnpm"
138142
"cache-dependency-path": "ui/package-lock.json"
139143
"node-version-file": ".nvmrc"
144+
- name: "Install UI dependencies"
145+
run: "pnpm install --frozen-lockfile"
146+
- name: "Build UI"
147+
run: "pnpm build"
140148
- name: Install dist
141149
run: ${{ matrix.install_dist.run }}
142150
# Get the dist-manifest

‎.github/workflows/spelling.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ jobs:
1818
- name: Checkout Actions Repository
1919
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020
- name: Spell Check Repo
21-
uses: crate-ci/typos@06d010dfe4c84fdab1a25ea02b57b3585018ba80 # v1.42.3
21+
uses: crate-ci/typos@78bc6fb2c0d734235d57a2d6b9de923cc325ebdd # v1.43.4

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
# Unreleased
6+
7+
- New feature ([#1153](https://github.com/open-telemetry/weaver/issues/1153)) - Live-check now has a `/health` endpoint that can be used in long-running scenarios to confirm readiness and liveness of the live-check server. ([#1193](https://github.com/open-telemetry/weaver/pull/1193) by @jerbly)
8+
- New feature ([#1100](https://github.com/open-telemetry/weaver/issues/1100)) - Set `--output=http` to have live-check send its report as the response to `/stop`. ([#1193](https://github.com/open-telemetry/weaver/pull/1193) by @jerbly)
9+
510
# [0.21.2] - 2026-02-03
611

712
- New Experimental feature: `weaver serve` command to serve a REST API and web UI. ([#1076](https://github.com/open-telemetry/weaver/pull/1076) by @jerbly)

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Run `cargo test --all` to run the tests.
1818

1919
Run `cargo build` to build a local binary for any additional tests. The resulting binary will be placed in the `./output` directory.
2020

21+
NOTE: You will need to run `pnpm build` in the `ui` directory prior to running any `cargo` commands.
22+
2123
**Run `just` before any push to pre-validate all the steps performed by CI.**
2224

2325
### How to send Pull Request

‎Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ portpicker = "=0.1.1"
140140

141141
[build-dependencies]
142142
tonic-prost-build = "0.14.1"
143+
walkdir.workspace = true
143144

144145
[profile.release]
145146
lto = true

0 commit comments

Comments
 (0)